uv-rays 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62df253a515b6fc5dc5168365ffaccc6341e9432
-  data.tar.gz: 34ece239ae56c171c8a125656ba701b3fc66a9c6
+  metadata.gz: 11a2e081253e15248cae96c1f6ddeff70c72898e
+  data.tar.gz: d8eb1fec708fcdc68a2fb2d4a09a08e2a5e77c9b
 SHA512:
-  metadata.gz: 714f784bf6f21ad6b8098c451564d775e9328bb0a21dc196dfdb9321b50ea31212ea2be292f20515540d5db5a38c93cbfe2ef993345dc4fbdece3a68a6f6ff03
-  data.tar.gz: c9f9ab7c2fef8a1c0ec1b948f1292f001fd1d2c03727d497ba013423e3dfa6d70bf7e6226a04ff3d9eb3467e3cb2ffcae727e3c9ac1886d745739176bc23fb18
+  metadata.gz: 0cb78756f4aa14503eed42df13a0a0cf0b2c1ff69e44ebb6d2104924fdeabb8184937e68b84cb68b85d789ba51bec1088c8e43e40ab22c783f885a23fd0940d7
+  data.tar.gz: e0a26a535f56e79edc480624c41a64d251b6ff92d206d6ded3ce9fdac412886785bbc32dfd1b441547dc94f184e26a9af7303b850c41a843edb61c9abda1a94c

data/lib/uv-rays/scheduler.rb

@@ -2,6 +2,8 @@
 module UV
 
     class ScheduledEvent < ::Libuv::Q::DeferredPromise
+        # Note:: Comparable should not effect Hashes
+        # it will however effect arrays
         include Comparable
 
         attr_reader :created
@@ -26,8 +28,15 @@ module UV
 
         # Provide relevant inspect information
         def inspect
-            "#<#{self.class}:0x#{self.__id__.to_s(16)} next_scheduled=#{@next_scheduled} trigger_count=#{@trigger_count} last_scheduled=#{@last_scheduled} created=#{@created}>"
+            insp = "#<#{self.class}:0x#{self.__id__.to_s(16)} "
+            insp << "trigger_count=#{@trigger_count} "
+            insp << "config=#{info} " if self.respond_to?(:info, true)
+            insp << "next_scheduled=#{@next_scheduled} "
+            insp << "last_scheduled=#{@last_scheduled} created=#{@created}>"
+            insp
         end
+        alias_method :to_s, :inspect
+
 
         # required for comparable
         def <=>(anOther)
@@ -56,7 +65,6 @@ module UV
         # Updates the scheduled time
         def update(time)
             @last_scheduled = @loop.now
-
             
             parsed_time = Scheduler.parse_in(time, :quiet)
             if parsed_time.nil?
@@ -106,6 +114,7 @@ module UV
         # can be used to reset a repeating timer
         def resume
             @paused = false
+            @last_scheduled = @loop.now
             reschedule
         end
 
@@ -134,11 +143,15 @@ module UV
         end
 
         def reschedule
-            if not @paused
+            unless @paused
                 next_time
                 @scheduler.reschedule(self)
             end
         end
+
+        def info
+            "repeat:#{@every}"
+        end
     end
 
 
@@ -156,6 +169,9 @@ module UV
             @timer = nil    # Reference to the timer
             @timer_callback = method(:on_timer)
 
+            # Not really required when used correctly
+            @critical = Mutex.new
+
             # as the libuv time is taken from an arbitrary point in time we
             # need to roughly synchronize between it and ruby's Time.now
             @loop.update_time
@@ -238,41 +254,60 @@ module UV
             # Check promise is not resolved
             return if event.resolved?
 
-            # Remove the event from the scheduled list and ensure it is in the schedules set
-            if @schedules.include?(event)
-                @scheduled.delete(event)
-            else
-                @schedules << event
-            end
-            @next = nil if @next == event
+            @critical.synchronize {
+                # Remove the event from the scheduled list and ensure it is in the schedules set
+                if @schedules.include?(event)
+                    remove(event)
+                else
+                    @schedules << event
+                end
+                @next = nil if @next == event
 
-            # optimal algorithm for inserting into an already sorted list
-            Bisect.insort(@scheduled, event)
+                # optimal algorithm for inserting into an already sorted list
+                Bisect.insort(@scheduled, event)
 
-            # Update the timer
-            check_timer
+                # Update the timer
+                check_timer
+            }
         end
 
         # Removes an event from the schedule
         #
         # @param event [ScheduledEvent]
         def unschedule(event)
-            # Only call delete and update the timer when required
-            if @schedules.include?(event)
-                @schedules.delete(event)
-                @scheduled.delete(event)
-                check_timer
-            end
+            @critical.synchronize {
+                # Only call delete and update the timer when required
+                if @schedules.include?(event)
+                    @schedules.delete(event)
+                    remove(event)
+                    check_timer
+                end
+            }
         end
 
 
         private
 
 
+        # Remove an element from the array
+        def remove(obj)
+            position = nil
+
+            @scheduled.each_index do |i|
+                # object level comparison
+                if obj.equal? @scheduled[i]
+                    position = i
+                    break
+                end
+            end
+
+            @scheduled.slice!(position) unless position.nil?
+        end
+
         # First time schedule we want to bind to the promise
         def schedule(event)
             reschedule(event)
-
+            
             event.finally do
                 unschedule event
             end
@@ -288,7 +323,7 @@ module UV
             if existing != @next
                 # lazy load the timer
                 if @timer.nil?
-                    @timer = @loop.timer @timer_callback
+                    new_timer
                 else
                     @timer.stop
                 end
@@ -309,19 +344,32 @@ module UV
 
         # Is called when the libuv timer fires
         def on_timer
-            schedule = @scheduled.shift
-            @schedules.delete(schedule)
-            schedule.trigger
-
-            # execute schedules that are within 30ms of this event
-            # Basic timer coalescing..
-            now = @loop.now + 30
-            while @scheduled.first && @scheduled.first.next_scheduled <= now
+            @critical.synchronize {
                 schedule = @scheduled.shift
                 @schedules.delete(schedule)
                 schedule.trigger
+
+                # execute schedules that are within 30ms of this event
+                # Basic timer coalescing..
+                now = @loop.now + 30
+                while @scheduled.first && @scheduled.first.next_scheduled <= now
+                    schedule = @scheduled.shift
+                    @schedules.delete(schedule)
+                    schedule.trigger
+                end
+                check_timer
+            }
+        end
+
+        # Provide some assurances on timer failure
+        def new_timer
+            @timer = @loop.timer @timer_callback
+            @timer.finally do
+                new_timer
+                unless @next.nil?
+                    @timer.start(@next)
+                end
             end
-            check_timer
         end
     end
 end

data/lib/uv-rays/version.rb

@@ -1,3 +1,3 @@
 module UV
-    VERSION = '0.2.5'
+    VERSION = '0.2.6'
 end

data/spec/scheduler_spec.rb

@@ -32,7 +32,8 @@ describe UV::Scheduler do
         expect(@general_failure).to eq([])
         expect(@event).to eq(@result)
         @diff = @triggered_at - @event.last_scheduled
-        expect((@diff >= 500 && @diff < 750)).to eq(true)
+        expect(@diff).to be >= 500
+        expect(@diff).to be < 750
     end
 
     it "should be able to schedule a one shot event using 'at'" do
@@ -55,7 +56,8 @@ describe UV::Scheduler do
         expect(@general_failure).to eq([])
         expect(@event).to eq(@result)
         @diff = @triggered_at - @event.last_scheduled
-        expect((@diff >= 1000 && @diff < 1250)).to eq(true)
+        expect(@diff).to be >= 1000
+        expect(@diff).to be < 1250
     end
 
     it "should be able to schedule a repeat event" do
@@ -73,6 +75,10 @@ describe UV::Scheduler do
                 @triggered_at = triggered
                 @result = event
 
+                diff = triggered - event.last_scheduled
+                expect(diff).to be >= 250
+                expect(diff).to be < 500
+
                 @run += 1
                 if @run == 2
                     @event.pause
@@ -84,7 +90,53 @@ describe UV::Scheduler do
         expect(@general_failure).to eq([])
         expect(@run).to eq(2)
         expect(@event).to eq(@result)
-        @diff = @triggered_at - @event.last_scheduled
-        expect((@diff >= 250 && @diff < 500)).to eq(true)
+    end
+
+    it "should be able to cancel an event" do
+        # Also tests events run in order of scheduled
+        # Also tests events are not inadvertently canceled by other test
+        @loop.run { |logger|
+            logger.progress do |level, errorid, error|
+                begin
+                    @general_failure << "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
+                rescue Exception
+                    @general_failure << 'error in logger'
+                end
+            end
+
+            @triggered = []
+
+            @event1 = @scheduler.in('0.5s') do |triggered, event|
+                @triggered << 1
+            end
+
+            @event2 = @scheduler.in('0.5s') do |triggered, event|
+                @triggered << 2
+            end
+
+            @event3 = @scheduler.in('0.5s') do |triggered, event|
+                @triggered << 3
+                @loop.stop
+            end
+
+            @scheduled, @schedules = @scheduler.instance_eval { 
+                [@scheduled, @schedules]
+            }
+
+            expect(@scheduled.size).to eq(3)
+            expect(@schedules.size).to eq(3)
+
+            @event2.cancel
+
+            @loop.next_tick do
+                expect(@scheduled.size).to eq(2)
+                expect(@schedules.size).to eq(2)
+            end
+        }
+
+        expect(@general_failure).to eq([])
+        expect(@triggered).to eq([1, 3])
+        expect(@scheduled.size).to eq(0)
+        expect(@schedules.size).to eq(0)
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uv-rays
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2014-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libuv