polyphony 0.38 → 0.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b952f96f313866e5b61e200093fcb1eb8111b2d48bb2a736e36b62f06772786c
-  data.tar.gz: 03ffbc7481d3e20cfd5d50cc0c7e1e28749da15a6c9d65c89e83a0370b61b2d2
+  metadata.gz: e3be3a6ec277c0c06e1d4b071f7fcee1229bbdde20d6b78b5b585ca9ac5624cd
+  data.tar.gz: 27f3e920372dc8ab8e40f07b72444ba08813533e2912c8400fe28ad50ed756c2
 SHA512:
-  metadata.gz: 8fb34d135a0ab50a3e3ae722dd3f9ae70ba8ee83534c199f98611f5fa273b424fcedab548929a2dedcdaddec73a9aa6b652fa97a924dd5400155cf57a1cdcaf0
-  data.tar.gz: caacb6a006f52abf888a9f4a3f1ef2c917a73422abaf1cba7d1ae1b0c7db07a3bc62a5a6b6abbe22e46fd6e679e82d7a048ec2d9ac7ec7dee54453600c688597
+  metadata.gz: 6d4267e177eda276b2d643e0262d1475c9f9f0ebaed2dd8573c245127b618dab11b00c05e0ef58ba2f5b8fd88b127feb1cc0f94390e27c66ae8857d0a5eb1a65
+  data.tar.gz: 1006b8aa742a9c38bd39512c7f9bfbe3c33b0f07ee1b2e262d8f5f140114066599b9444726c3e9c8cb998326a779da8d14d159ebcf5df226f02eedaa78530f98

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.39 2020-04-13
+
+* Prevent timer scheduling a nil fiber
+
 ## 0.38 2020-04-13
 
 * Fix post-fork segfault if parent process has multiple threads with active watchers

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    polyphony (0.38)
+    polyphony (0.39)
 
 GEM
   remote: https://rubygems.org/

data/ext/gyro/timer.c

@@ -66,26 +66,28 @@ inline void timer_activate(struct Gyro_Timer *timer) {
   ev_timer_start(timer->ev_loop, &timer->ev_timer);
 }
 
-inline void timer_deactivate(struct Gyro_Timer *timer, int non_recurring_only) {
+inline void timer_deactivate(struct Gyro_Timer *timer, int force_deactivate) {
   if (!timer->active) return;
 
-  if (!timer->repeat || !non_recurring_only) {
-    ev_timer_stop(timer->ev_loop, &timer->ev_timer);
-    if (RTEST(timer->selector)) {
-      Gyro_Selector_remove_active_watcher(timer->selector, timer->self);
-      timer->selector = Qnil;
-    }
-    timer->ev_loop = 0;
-    timer->active = 0;
-  }
-
   timer->fiber = Qnil;
+
+  // timer should not be deactivated if 
+  if (timer->repeat && !force_deactivate) return;
+
+  ev_timer_stop(timer->ev_loop, &timer->ev_timer);
+  if (RTEST(timer->selector)) {
+    Gyro_Selector_remove_active_watcher(timer->selector, timer->self);
+    timer->selector = Qnil;
+  }
+  timer->ev_loop = 0;
+  timer->active = 0;
 }
 
 void Gyro_Timer_callback(struct ev_loop *ev_loop, struct ev_timer *ev_timer, int revents) {
   struct Gyro_Timer *timer = (struct Gyro_Timer*)ev_timer;
 
-  Fiber_make_runnable(timer->fiber, DBL2NUM(timer->after));
+  if (timer->fiber != Qnil)
+    Fiber_make_runnable(timer->fiber, DBL2NUM(timer->after));
   timer_deactivate(timer, 1);
 }
 

data/lib/polyphony/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Polyphony
-  VERSION = '0.38'
+  VERSION = '0.39'
 end

data/test/helper.rb

@@ -18,6 +18,15 @@ Minitest::Reporters.use! [
   Minitest::Reporters::SpecReporter.new
 ]
 
+module MiniTest::Assertions
+  def assert_in_range(range, act)
+    msg = message(msg) {
+      "Expected #{act.inspect} to be in range #{range.inspect}"
+    }
+    assert range.include?(act), msg
+  end
+end
+
 class MiniTest::Test
   def setup
     if Fiber.current.children.size > 0

data/test/test_global_api.rb

@@ -106,7 +106,7 @@ class MoveOnAfterTest < MiniTest::Test
     end
     t1 = Time.now
 
-    assert t1 - t0 < 0.03
+    assert_in_range 0..0.03, t1 - t0
     assert_nil v
   end
 
@@ -118,7 +118,7 @@ class MoveOnAfterTest < MiniTest::Test
     end
     t1 = Time.now
 
-    assert t1 - t0 < 0.02
+    assert_in_range 0..0.02, t1 - t0
     assert_equal :bar, v
   end
 
@@ -129,7 +129,7 @@ class MoveOnAfterTest < MiniTest::Test
     assert_equal Fiber.current, f.parent
     v = sleep 1
     t1 = Time.now
-    assert t1 - t0 < 0.02
+    assert_in_range 0..0.02, t1 - t0
     assert_equal 'foo', v
   end
 end
@@ -145,7 +145,7 @@ class CancelAfterTest < MiniTest::Test
       end
     end
     t1 = Time.now
-    assert t1 - t0 < 0.02
+    assert_in_range 0..0.02, t1 - t0
   end
 
   def test_cancel_after_without_block
@@ -157,7 +157,7 @@ class CancelAfterTest < MiniTest::Test
       sleep 1
     end
     t1 = Time.now
-    assert t1 - t0 < 0.02
+    assert_in_range 0..0.02, t1 - t0
   end
 end
 
@@ -204,7 +204,7 @@ class SpinLoopTest < MiniTest::Test
     f = spin_loop(rate: 50) { buffer << (counter += 1) }
     sleep 0.1
     f.stop
-    assert counter >= 5 && counter <= 6
+    assert_in_range 5..6, counter
   end
 end
 
@@ -217,7 +217,7 @@ class ThrottledLoopTest < MiniTest::Test
     end
     sleep 0.1
     f.stop
-    assert counter >= 5 && counter <= 6
+    assert_in_range 5..6, counter
   end
 
   def test_throttled_loop_with_count
@@ -248,14 +248,14 @@ class GlobalAPIEtcTest < MiniTest::Test
     end
     sleep 0.05
     f.stop
-    assert (4..5).include?(buffer.size)
+    assert_in_range 4..5, buffer.size
   end
 
   def test_sleep
     t0 = Time.now
     sleep 0.05
     elapsed = Time.now - t0
-    assert (0.045..0.08).include? elapsed
+    assert_in_range 0.045..0.08, elapsed
 
     f = spin { sleep }
     snooze

data/test/test_io.rb

@@ -61,6 +61,13 @@ class IOTest < MiniTest::Test
     @o.close
     assert_equal 'foobarbaz', @i.read
   end
+
+  def test_big_write
+    chunk = '*' * 60000
+    @o << chunk
+    @o.close
+    assert_equal chunk, @i.read
+  end
 end
 
 class IOClassMethodsTest < MiniTest::Test

data/test/test_thread.rb

@@ -38,7 +38,7 @@ class ThreadTest < MiniTest::Test
     t0 = Time.now
     r = t.join(0.01)
 
-    assert Time.now - t0 < 0.2
+    assert_in_range 0..0.2, Time.now - t0
     assert_equal [1, 2, 3], buffer
     assert_nil r
   ensure

data/test/test_thread_pool.rb

@@ -65,8 +65,8 @@ class ThreadPoolTest < MiniTest::Test
     end
     elapsed = Time.now - t0
 
-    assert elapsed < 0.007
-    assert buffer.size < 2
+    assert_in_range 0..0.007, elapsed
+    assert_in_range 0..1, buffer.size
     
     sleep 0.1 # allow time for threads to spawn
     assert_equal @pool.size, threads.uniq.size

data/test/test_throttler.rb

@@ -10,8 +10,7 @@ class ThrottlerTest < MiniTest::Test
     sleep 0.02
     f.stop
     snooze
-    assert buffer.size >= 2
-    assert buffer.size <= 3
+    assert_in_range 2..3, buffer.size
   ensure
     t.stop
   end
@@ -24,7 +23,7 @@ class ThrottlerTest < MiniTest::Test
     end
     sleep 0.25
     f.stop
-    assert (2..6).include?(buffer.size)
+    assert_in_range 2..6, buffer.size
   ensure
     t.stop
   end
@@ -35,8 +34,7 @@ class ThrottlerTest < MiniTest::Test
     f = spin { loop { t.process { buffer << 1 } } }
     sleep 0.02
     f.stop
-    assert buffer.size >= 2
-    assert buffer.size <= 3
+    assert_in_range 2..3, buffer.size
   ensure
     t.stop
   end

data/test/test_timer.rb

@@ -29,28 +29,4 @@ class TimerTest < MiniTest::Test
   ensure
     t.stop
   end
-
-  def test_that_repeating_timer_compensates_for_drift
-    count = 0
-    t = Gyro::Timer.new(0.1, 0.1)
-    deltas = []
-    last = nil
-    spin {
-      last = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
-      loop {
-        t.await
-        now = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
-        elapsed = (now - last)
-        deltas << elapsed
-        last = now
-        count += 1
-        sleep 0.05
-        break if count >= 3
-      }
-    }
-    suspend
-    assert_equal 0, deltas[1..-1].filter { |d| (d - 0.1).abs >= 0.05 }.size
-  ensure
-    t.stop
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: '0.38'
+  version: '0.39'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-13 00:00:00.000000000 Z
+date: 2020-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty