polyphony 0.43.2 → 0.43.8

data/test/test_event.rb

@@ -45,4 +45,15 @@ class EventTest < MiniTest::Test
     t&.kill
     t&.join
   end
+
+  def test_exception_while_waiting_for_event
+    e = Polyphony::Event.new
+
+    f = spin { e.await }
+    g = spin { f.raise 'foo' }
+
+    assert_raises(RuntimeError) do
+      f.await
+    end
+  end
 end

data/test/test_fiber.rb

@@ -482,9 +482,9 @@ class FiberTest < MiniTest::Test
   def test_select_from_multiple_fibers
     sleep 0
     buffer = []
-    f1 = spin { sleep 0.01; buffer << :foo; :foo }
-    f2 = spin { sleep 0.03; buffer << :bar; :bar }
-    f3 = spin { sleep 0.05; buffer << :baz; :baz }
+    f1 = spin { sleep 0.1; buffer << :foo; :foo }
+    f2 = spin { sleep 0.3; buffer << :bar; :bar }
+    f3 = spin { sleep 0.5; buffer << :baz; :baz }
 
     selected, result = Fiber.select(f1, f2, f3)
     assert_equal :foo, result

data/test/test_global_api.rb

@@ -106,7 +106,7 @@ class MoveOnAfterTest < MiniTest::Test
     end
     t1 = Time.now
 
-    assert t1 - t0 < 0.03
+    assert t1 - t0 < 0.1
     assert_nil v
   end
 
@@ -118,7 +118,7 @@ class MoveOnAfterTest < MiniTest::Test
     end
     t1 = Time.now
 
-    assert t1 - t0 < 0.02
+    assert t1 - t0 < 0.1
     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 t1 - t0 < 0.1
     assert_equal 'foo', v
   end
 end
@@ -159,6 +159,30 @@ class CancelAfterTest < MiniTest::Test
     t1 = Time.now
     assert t1 - t0 < 0.1
   end
+
+  class CustomException < Exception
+  end
+
+  def test_cancel_after_with_custom_exception
+    assert_raises CustomException do
+      cancel_after(0.01, with_exception: CustomException) do
+        sleep 1
+        :foo
+      end
+    end
+
+    begin
+      e = nil
+      cancel_after(0.01, with_exception: 'foo') do
+        sleep 1
+        :foo
+      end
+    rescue => e
+    ensure
+      assert_kind_of RuntimeError, e
+      assert_equal 'foo', e.message
+    end
+  end
 end
 
 
@@ -187,13 +211,13 @@ class SpinLoopTest < MiniTest::Test
 
   def test_spin_loop_location
     location = /^#{__FILE__}:#{__LINE__ + 1}/
-    f = spin_loop {}
+    f = spin_loop { snooze }
     
     assert_match location, f.location
   end
 
   def test_spin_loop_tag
-    f = spin_loop(:my_loop) {}
+    f = spin_loop(:my_loop) { snooze }
 
     assert_equal :my_loop, f.tag
   end
@@ -201,10 +225,13 @@ class SpinLoopTest < MiniTest::Test
   def test_spin_loop_with_rate
     buffer = []
     counter = 0
-    f = spin_loop(rate: 50) { buffer << (counter += 1) }
+    t0 = Time.now
+    f = spin_loop(rate: 10) { buffer << (counter += 1) }
     sleep 0.2
     f.stop
-    assert counter >= 9 && counter <= 11
+    elapsed = Time.now - t0
+    expected = (elapsed * 10).to_i
+    assert counter >= expected - 1 && counter <= expected + 1
   end
 end
 
@@ -212,12 +239,15 @@ class ThrottledLoopTest < MiniTest::Test
   def test_throttled_loop
     buffer = []
     counter = 0
+    t0 = Time.now
     f = spin do
-      throttled_loop(50) { buffer << (counter += 1) }
+      throttled_loop(10) { buffer << (counter += 1) }
     end
-    sleep 0.2
+    sleep 0.3
     f.stop
-    assert counter >= 9 && counter <= 11
+    elapsed = Time.now - t0
+    expected = (elapsed * 10).to_i
+    assert counter >= expected - 1 && counter <= expected + 1
   end
 
   def test_throttled_loop_with_count
@@ -243,19 +273,22 @@ class GlobalAPIEtcTest < MiniTest::Test
 
   def test_every
     buffer = []
+    t0 = Time.now
     f = spin do
-      every(0.01) { buffer << 1 }
+      every(0.1) { buffer << 1 }
     end
-    sleep 0.05
+    sleep 0.5
     f.stop
-    assert (4..5).include?(buffer.size)
+    elapsed = Time.now - t0
+    expected = (elapsed / 0.1).to_i
+    assert buffer.size >= expected - 2 && buffer.size <= expected + 2
   end
 
   def test_sleep
     t0 = Time.now
-    sleep 0.05
+    sleep 0.1
     elapsed = Time.now - t0
-    assert (0.045..0.08).include? elapsed
+    assert (0.05..0.15).include? elapsed
 
     f = spin { sleep }
     snooze

data/test/test_io.rb

@@ -30,6 +30,14 @@ class IOTest < MiniTest::Test
     assert_equal 'hello', msg
   end
 
+  def test_write_multiple_arguments
+    i, o = IO.pipe
+    count = o.write('a', 'b', "\n", 'c')
+    assert_equal 4, count
+    o.close
+    assert_equal "ab\nc", i.read
+  end
+
   def test_that_double_chevron_method_returns_io
     assert_equal @o, @o << 'foo'
 
@@ -83,6 +91,20 @@ class IOTest < MiniTest::Test
 
     assert_raises(EOFError) { i.readpartial(1) }    
   end
+
+  # see https://github.com/digital-fabric/polyphony/issues/30
+  def test_reopened_tempfile
+    file = Tempfile.new
+    file << 'hello: world'
+    file.close
+
+    buf = nil
+    File.open(file, 'r:bom|utf-8') do |f|
+      buf = f.read(16384)
+    end
+
+    assert_equal 'hello: world', buf
+  end
 end
 
 class IOClassMethodsTest < MiniTest::Test
@@ -121,7 +143,7 @@ class IOClassMethodsTest < MiniTest::Test
     assert_equal "end\n", lines[-1]
   end
 
-  def test_read
+  def test_read_class_method
     s = IO.read(__FILE__)
     assert_kind_of String, s
     assert(!s.empty?)
@@ -144,7 +166,7 @@ class IOClassMethodsTest < MiniTest::Test
 
   WRITE_DATA = "foo\nbar קוקו"
 
-  def test_write
+  def test_write_class_method
     fn = '/tmp/test_write'
     FileUtils.rm(fn) rescue nil
 

data/test/test_queue.rb

@@ -8,7 +8,7 @@ class QueueTest < MiniTest::Test
     @queue = Polyphony::Queue.new
   end
 
-  def test_pop
+  def test_push_shift
     spin {
       @queue << 42
     }
@@ -21,6 +21,18 @@ class QueueTest < MiniTest::Test
     assert_equal [1, 2, 3, 4], buf
   end
 
+  def test_unshift
+    @queue.push 1
+    @queue.push 2
+    @queue.push 3
+    @queue.unshift 4
+
+    buf = []
+    buf << @queue.shift while !@queue.empty?
+
+    assert_equal [4, 1, 2, 3], buf
+  end
+
   def test_multiple_waiters
     a = spin { @queue.shift }
     b = spin { @queue.shift }
@@ -41,6 +53,19 @@ class QueueTest < MiniTest::Test
     buf = []
     @queue.shift_each { |i| buf << i }
     assert_equal [1, 2, 3, 4], buf
+
+    buf = []
+    @queue.shift_each { |i| buf << i }
+    assert_equal [], buf
+  end
+
+  def test_shift_all
+    (1..4).each { |i| @queue << i }
+    buf = @queue.shift_all
+    assert_equal [1, 2, 3, 4], buf
+
+    buf = @queue.shift_all
+    assert_equal [], buf
   end
 
   def test_empty?
@@ -71,4 +96,17 @@ class QueueTest < MiniTest::Test
     assert_nil f2.await
     assert_equal :bar, f3.await
   end
+
+  def test_fiber_removal_from_queue_simple
+    f1 = spin { @queue.shift }
+    
+    # let fibers run
+    snooze
+
+    f1.stop
+    snooze
+
+    @queue << :foo
+    assert_nil f1.await
+  end
 end

data/test/test_resource_pool.rb

@@ -123,4 +123,16 @@ class ResourcePoolTest < MiniTest::Test
     pool.preheat!
     assert_equal 2, pool.size
   end
+
+  def test_reentrant_resource_pool
+    resources = [+'a', +'b']
+    pool = Polyphony::ResourcePool.new(limit: 1) { resources.shift }
+
+    pool.acquire do |r|
+      assert_equal 'a', r
+      pool.acquire do |r|
+        assert_equal 'a', r
+      end
+    end
+  end
 end

data/test/test_throttler.rb

@@ -4,14 +4,15 @@ require_relative 'helper'
 
 class ThrottlerTest < MiniTest::Test
   def test_throttler_with_rate
-    t = Polyphony::Throttler.new(100)
+    t = Polyphony::Throttler.new(10)
     buffer = []
+    t0 = Time.now
     f = spin { loop { t.process { buffer << 1 } } }
-    sleep 0.02
+    sleep 0.2
     f.stop
-    snooze
-    assert buffer.size >= 2
-    assert buffer.size <= 3
+    elapsed = Time.now - t0
+    expected = (elapsed * 10).to_i
+    assert buffer.size >= expected - 1 && buffer.size <= expected + 1
   ensure
     t.stop
   end

data/test/test_trace.rb

@@ -34,7 +34,8 @@ class TraceTest < MiniTest::Test
 
   def test_2_fiber_trace
     records = []
-    t = Polyphony::Trace.new(:fiber_all) { |r| records << r if r[:event] =~ /^fiber_/ }
+    thread = Thread.current
+    t = Polyphony::Trace.new(:fiber_all) { |r| records << r if Thread.current == thread && r[:event] =~ /^fiber_/ }
     t.enable
     Polyphony.trace(true)
 
@@ -42,23 +43,23 @@ class TraceTest < MiniTest::Test
     suspend
     sleep 0
 
-    events = records.map { |r| [r[:fiber], r[:event]] }
+    events = records.map { |r| [r[:fiber] == f ? :f : :current, r[:event]] }
     assert_equal [
-      [f, :fiber_create],
-      [f, :fiber_schedule],
-      [Fiber.current, :fiber_switchpoint],
-      [f, :fiber_run],
-      [f, :fiber_switchpoint],
-      [f, :fiber_ev_loop_enter],
-      [f, :fiber_schedule],
-      [f, :fiber_ev_loop_leave],
-      [f, :fiber_run],
-      [f, :fiber_terminate],
-      [Fiber.current, :fiber_switchpoint],
-      [Fiber.current, :fiber_ev_loop_enter],
-      [Fiber.current, :fiber_schedule],
-      [Fiber.current, :fiber_ev_loop_leave],
-      [Fiber.current, :fiber_run]
+      [:f, :fiber_create],
+      [:f, :fiber_schedule],
+      [:current, :fiber_switchpoint],
+      [:f, :fiber_run],
+      [:f, :fiber_switchpoint],
+      [:f, :fiber_ev_loop_enter],
+      [:f, :fiber_schedule],
+      [:f, :fiber_ev_loop_leave],
+      [:f, :fiber_run],
+      [:f, :fiber_terminate],
+      [:current, :fiber_switchpoint],
+      [:current, :fiber_ev_loop_enter],
+      [:current, :fiber_schedule],
+      [:current, :fiber_ev_loop_leave],
+      [:current, :fiber_run]
     ], events
   ensure
     t&.disable

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: 0.43.2
+  version: 0.43.8
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-07 00:00:00.000000000 Z
+date: 2020-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -242,6 +242,8 @@ files:
 - TODO.md
 - bin/polyphony-debug
 - docs/_config.yml
+- docs/_includes/head.html
+- docs/_includes/title.html
 - docs/_sass/custom/custom.scss
 - docs/_sass/overrides.scss
 - docs/_user-guide/all-about-timers.md
@@ -280,6 +282,7 @@ files:
 - docs/main-concepts/fiber-scheduling.md
 - docs/main-concepts/index.md
 - docs/polyphony-logo.png
+- examples/adapters/concurrent-ruby.rb
 - examples/adapters/pg_client.rb
 - examples/adapters/pg_notify.rb
 - examples/adapters/pg_pool.rb
@@ -297,6 +300,7 @@ files:
 - examples/core/xx-at_exit.rb
 - examples/core/xx-caller.rb
 - examples/core/xx-channels.rb
+- examples/core/xx-daemon.rb
 - examples/core/xx-deadlock.rb
 - examples/core/xx-deferring-an-operation.rb
 - examples/core/xx-erlang-style-genserver.rb
@@ -349,8 +353,11 @@ files:
 - examples/io/xx-system.rb
 - examples/io/xx-tcpserver.rb
 - examples/io/xx-tcpsocket.rb
+- examples/io/xx-zip.rb
+- examples/performance/fiber_transfer.rb
 - examples/performance/fs_read.rb
 - examples/performance/mem-usage.rb
+- examples/performance/messaging.rb
 - examples/performance/multi_snooze.rb
 - examples/performance/snooze.rb
 - examples/performance/snooze_raw.rb
@@ -364,6 +371,7 @@ files:
 - examples/performance/xx-array.rb
 - examples/performance/xx-fiber-switch.rb
 - examples/performance/xx-snooze.rb
+- examples/xx-spin.rb
 - ext/libev/Changes
 - ext/libev/LICENSE
 - ext/libev/README
@@ -385,10 +393,12 @@ files:
 - ext/polyphony/libev.c
 - ext/polyphony/libev.h
 - ext/polyphony/libev_agent.c
-- ext/polyphony/libev_queue.c
 - ext/polyphony/polyphony.c
 - ext/polyphony/polyphony.h
 - ext/polyphony/polyphony_ext.c
+- ext/polyphony/queue.c
+- ext/polyphony/ring_buffer.c
+- ext/polyphony/ring_buffer.h
 - ext/polyphony/thread.c
 - ext/polyphony/tracing.c
 - lib/polyphony.rb
@@ -418,6 +428,7 @@ files:
 - test/coverage.rb
 - test/eg.rb
 - test/helper.rb
+- test/q.rb
 - test/run.rb
 - test/stress.rb
 - test/test_agent.rb
@@ -464,7 +475,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Fine grained concurrency for Ruby