fsevent 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a29fe94eaba408b87373eb438cb5586bc0d97906
-  data.tar.gz: 837f02c21999e8b41e86e22066d0f198111cbb0c
+  metadata.gz: c80e06a6aa6324c5a9d77f57fea9c837d34c335c
+  data.tar.gz: 0522ec2031f9b54b06719c7c97dc7d6fb7d5a31c
 SHA512:
-  metadata.gz: 2e163903a427283fa54b05c675a5aa806f872c750e8da21f3e084061efdc3457e552cc5eeda138cef43f2671c04a703cec9b6143e13106c4ccfdc6d9cbfd7981
-  data.tar.gz: 902f766db3e5148e76c60bfd25f245bbd738b423a6d15a89545ff98c19a650ee05fdb1479ca6f59ed966a9276682e1189e13c25dfbd3b0f4377852d6525e5300
+  metadata.gz: 655e1f86025488fa852eadb61f5df04c604d062e7aa2e7019e9b12c2b2919b92489c4f3d132b923fd10d9eacdde7815fa7b443842c89f38e3686cd63cfe04dba
+  data.tar.gz: b1f09c8e4526f7c1c0550a2d623d72469312ce0ce916098b20a7f13ba4f4de38a9f7d963ef6f13f58d69d911cacb36eb8ef1199172ce03760ce6a9b0dff233b1

data/fsevent.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'fsevent'
-  s.version = '0.2'
+  s.version = '0.3'
   s.date = '2013-06-30'
   s.author = 'Tanaka Akira'
   s.email = 'tanaka-akira@aist.go.jp'

data/lib/fsevent/framework.rb

@@ -51,8 +51,7 @@ class FSEvent
       raise ArgumentError, "invalid device name: #{device_name.inspect}"
     end
     if !Thread.current[:fsevent_buffer]
-      value = [:register_start, device_name, device]
-      @schedule_locator[device_name] = @q.insert value, @current_time
+      internal_register_device(device_name, device)
     else
       value = [:register_device, device_name, device]
       Thread.current[:fsevent_buffer] << value
@@ -185,7 +184,7 @@ class FSEvent
   private :at_register_end
 
   def at_run_start(loc, device_name)
-    time = loc.priority
+    time = @current_time
     device = @devices[device_name]
 
     watched_status, changed_status = notifications(device_name, @device_last_run_count[device_name])
@@ -224,7 +223,7 @@ class FSEvent
 
   def at_run_end(loc, device_name, run_start_count, buffer)
     @device_last_run_count[device_name] = run_start_count
-    run_end_time = loc.priority
+    run_end_time = @current_time
 
     wakeup_immediate = false
     unregister_self = false
@@ -242,7 +241,7 @@ class FSEvent
       when :del_watch
         internal_del_watch(device_name, *rest)
       when :register_device
-        internal_register_device(device_name, *rest)
+        internal_register_device(*rest)
       when :unregister_device
         unregister_self |= internal_unregister_device(device_name, *rest)
       else
@@ -257,10 +256,11 @@ class FSEvent
   end
   private :at_run_end
 
-  def internal_register_device(device_name, target_device_name, device)
+  def internal_register_device(target_device_name, device)
     value = [:register_start, target_device_name, device]
     @schedule_locator[target_device_name] = @q.insert value, @current_time
   end
+  private :internal_register_device
 
   def internal_define_status(device_name, run_end_time, status_name, value)
     internal_define_status2(device_name, run_end_time, status_name, value)
@@ -293,7 +293,11 @@ class FSEvent
     @status_time[device_name][status_name] = @current_time
     @status_count[device_name][status_name] = @current_count
     lookup_watchers(device_name, status_name).each {|watcher_device_name, reaction|
-      set_wakeup_if_possible(watcher_device_name, run_end_time) if reaction_immediate_at_beginning? reaction
+      if reaction_immediate_at_beginning? reaction
+        if watcher_device_name != device_name
+          set_wakeup_if_possible(watcher_device_name, run_end_time)
+        end
+      end
     }
   end
   private :internal_define_status2
@@ -314,7 +318,11 @@ class FSEvent
     @status_time[device_name][status_name] = @current_time
     @status_count[device_name][status_name] = @current_count
     lookup_watchers(device_name, status_name).each {|watcher_device_name, reaction|
-      set_wakeup_if_possible(watcher_device_name, run_end_time) if reaction_immediate_at_subsequent? reaction
+      if watcher_device_name != device_name
+        if reaction_immediate_at_subsequent? reaction
+          set_wakeup_if_possible(watcher_device_name, run_end_time)
+        end
+      end
     }
   end
   private :internal_modify_status2
@@ -330,7 +338,11 @@ class FSEvent
     @status_time[device_name][status_name] = @current_time
     @status_count[device_name][status_name] = @current_count
     lookup_watchers(device_name, status_name).each {|watcher_device_name, reaction|
-      set_wakeup_if_possible(watcher_device_name, run_end_time) if reaction_immediate_at_subsequent? reaction
+      if watcher_device_name != device_name
+        if reaction_immediate_at_subsequent? reaction
+          set_wakeup_if_possible(watcher_device_name, run_end_time)
+        end
+      end
     }
     internal_update_status(device_name, run_end_time, "_status_undefined_#{status_name}", run_end_time)
   end
@@ -407,8 +419,13 @@ class FSEvent
     end
     case event_type = loc.value.first
     when :run_start # The device is sleeping now.
-      if time < loc.priority
-        loc.update_priority time
+      if time != loc.priority
+        if time < loc.priority
+          @devices[device_name].schedule.merge_schedule([loc.priority])
+          loc.update_priority time
+        else
+          @devices[device_name].schedule.merge_schedule([time])
+        end
       end
     when :run_end # The device is working now.
       # Nothing to do. at_run_end itself checks arrived events at last.
@@ -424,10 +441,10 @@ class FSEvent
     if wakeup_immediate
       run_start_time = run_end_time
     elsif run_start_time = device.schedule.shift
-      if run_start_time < run_end_time
+      if run_start_time <= run_end_time
         run_start_time = run_end_time
       end
-      while device.schedule.first && device.schedule.first < run_end_time
+      while device.schedule.first && device.schedule.first <= run_end_time
         device.schedule.shift
       end
     end

data/lib/fsevent/schedulemerger.rb

@@ -44,5 +44,11 @@ class FSEvent::ScheduleMerger
     end
     t
   end
+
+  def clear
+    until @q.empty?
+      @q.delete_min
+    end
+  end
 end
 

data/test/test_failsafedevice.rb

@@ -24,7 +24,7 @@ class TestFSEventFailSafeDevice < Test::Unit::TestCase
       super device_name
       @init = init
       @elapsed = 1
-      @schedule = pairs.map {|t, v| t-@elapsed }
+      @schedule.merge_schedule pairs.map {|t, v| t-@elapsed }
       @values = pairs.map {|t, v| v }
       @test_result = []
     end

data/test/test_framework.rb

@@ -80,7 +80,7 @@ class TestFSEventFramework < Test::Unit::TestCase
     device.schedule.merge_schedule(schedule)
     def device.run(watched_status, changed_status)
       @test_result << @framework.current_time
-      @schedule = [] if 2 < @test_result.length
+      @schedule.clear if 2 < @test_result.length
     end
     fsevent.register_device(device)
     assert_nothing_raised { fsevent.start }
@@ -340,4 +340,66 @@ class TestFSEventFramework < Test::Unit::TestCase
     assert_equal([t+20], result)
   end
 
+  def test_too_long_run
+    t = Time.utc(2000)
+    fse = FSEvent.new(t)
+    result = []
+    d1 = FSEvent::SimpleDevice.new("d2", {}, [], 1, [t+10, t+20, t+30]) {|watched_status, changed_status|
+      fse.set_elapsed_time(15)
+      result << fse.current_time
+    }
+    fse.register_device d1
+    fse.start
+    assert_equal([t+10, t+25, t+40], result)
+  end
+
+  def test_too_long_run_2
+    t = Time.utc(2000)
+    fse = FSEvent.new(t)
+    result = []
+    d1 = FSEvent::SimpleDevice.new("d2", {}, [], 1, [t+10, t+20, t+30]) {|watched_status, changed_status|
+      fse.set_elapsed_time(25)
+      result << fse.current_time
+    }
+    fse.register_device d1
+    fse.start
+    assert_equal([t+10, t+35], result)
+  end
+
+  def test_immediate_and_scheduled_event
+    t = Time.utc(2000)
+    fse = FSEvent.new(t)
+    d1 = FSEvent::SimpleDevice.new("d1", {"s"=>0}, [], 0, [t+10]) {|watched_status, changed_status|
+      fse.modify_status("s", 1)
+      fse.set_elapsed_time(10)
+    }
+    result = []
+    d2 = FSEvent::SimpleDevice.new("d2", {}, [["d1", "s", :immediate]], 0, [t+300]) {|watched_status, changed_status|
+      fse.set_elapsed_time(0)
+      result << fse.current_time
+    }
+    fse.register_device d1
+    fse.register_device d2
+    fse.start
+    assert_equal([t, t+20, t+300], result)
+  end
+
+  def test_self_watch
+    t = Time.utc(2000)
+    fse = FSEvent.new(t)
+    result = []
+    n = 0
+    d1 = FSEvent::SimpleDevice.new("d1", {"s"=>n}, [["d1", "s", :immediate]], 0, []) {|watched_status, changed_status|
+      result << fse.current_time
+      if n < 4
+        n += 1
+        fse.modify_status("s", n)
+      end
+      fse.set_elapsed_time(4)
+    }
+    fse.register_device d1
+    fse.start
+    assert_equal([t, t+4, t+8, t+12, t+16], result)
+  end
+
 end

data/test/test_watch.rb

@@ -89,7 +89,8 @@ class TestFSEventWatch < Test::Unit::TestCase
     fsevent.start
     assert_equal(
       [[t + 1, {"src"=>{"s"=>0}}],
-       [t + 15, {"src"=>{"s"=>100}}]],
+       [t + 15, {"src"=>{"s"=>100}}],
+       [t + 20, {"src"=>{"s"=>100}}]],
       test_result)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fsevent
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Tanaka Akira