polyphony 0.46.1 → 0.47.0

data/lib/polyphony/extensions/fiber.rb

@@ -328,14 +328,18 @@ class ::Fiber
   extend Polyphony::FiberControlClassMethods
 
   attr_accessor :tag, :thread, :parent
-  attr_reader :result, :mailbox
+  attr_reader :result
 
   def running?
     @running
   end
 
   def inspect
-    "#<Fiber:#{object_id} #{location} (#{state})>"
+    if @tag
+      "#<Fiber #{tag}:#{object_id} #{location} (#{state})>"
+    else
+      "#<Fiber:#{object_id} #{location} (#{state})>"
+    end
   end
   alias_method :to_s, :inspect
 

data/lib/polyphony/version.rb

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

data/test/test_backend.rb

@@ -136,4 +136,52 @@ class BackendTest < MiniTest::Test
     f.await # TODO: check why this test sometimes segfaults if we don't a<wait fiber
     assert_in_range 4..6, i
   end
+
+  class MyTimeoutException < Exception
+  end
+
+  def test_timeout
+    buffer = []
+    assert_raises(Polyphony::TimeoutException) do
+      @backend.timeout(0.01, Polyphony::TimeoutException) do
+        buffer << 1
+        sleep 0.02
+        buffer << 2
+      end
+    end
+    assert_equal [1], buffer
+
+    buffer = []
+    assert_raises(MyTimeoutException) do
+      @backend.timeout(0.01, MyTimeoutException) do
+        buffer << 1
+        sleep 1
+        buffer << 2
+      end
+    end
+    assert_equal [1], buffer
+
+    buffer = []
+    result = @backend.timeout(0.01, nil, 42) do
+      buffer << 1
+      sleep 1
+      buffer << 2
+    end
+    assert_equal 42, result
+    assert_equal [1], buffer
+  end
+
+  def test_nested_timeout
+    buffer = []
+    assert_raises(MyTimeoutException) do
+      @backend.timeout(0.01, MyTimeoutException) do
+        @backend.timeout(0.02, nil) do
+          buffer << 1
+          sleep 1
+          buffer << 2
+        end
+      end
+    end
+    assert_equal [1], buffer
+  end
 end

data/test/test_fiber.rb

@@ -565,14 +565,14 @@ class FiberTest < MiniTest::Test
   end
 
   def test_inspect
-    expected = format('#<Fiber:%s (root) (running)>', Fiber.current.object_id)
+    expected = format('#<Fiber main:%s (root) (running)>', Fiber.current.object_id)
     assert_equal expected, Fiber.current.inspect
 
     spin_line_no = __LINE__ + 1
-    f = spin { :foo }
+    f = spin(:baz) { :foo }
 
     expected = format(
-      '#<Fiber:%s %s:%d:in `test_inspect\' (runnable)>',
+      '#<Fiber baz:%s %s:%d:in `test_inspect\' (runnable)>',
       f.object_id,
       __FILE__,
       spin_line_no
@@ -581,7 +581,7 @@ class FiberTest < MiniTest::Test
 
     f.await
     expected = format(
-      '#<Fiber:%s %s:%d:in `test_inspect\' (dead)>',
+      '#<Fiber baz:%s %s:%d:in `test_inspect\' (dead)>',
       f.object_id,
       __FILE__,
       spin_line_no
@@ -738,6 +738,35 @@ class MailboxTest < MiniTest::Test
     f&.stop
   end
 
+  def test_capped_fiber_mailbox
+    buffer = []
+    a = spin_loop do
+      3.times { snooze }
+      buffer << [:receive, receive]
+    end
+    a.mailbox.cap(1)
+
+    b = spin do
+      (1..3).each do |i|
+        a << i
+        buffer << [:send, i]
+      end
+    end
+
+    (1..10).each do |i|
+      snooze
+      buffer << [:snooze, i]
+    end
+
+    b.join
+
+    assert_equal [
+      [:snooze, 1], [:send, 1], [:snooze, 2], [:snooze, 3], [:snooze, 4],
+      [:receive, 1], [:snooze, 5], [:send, 2], [:snooze, 6], [:snooze, 7],
+      [:snooze, 8], [:receive, 2], [:snooze, 9], [:send, 3], [:snooze, 10]
+    ], buffer
+  end
+
   def test_that_multiple_messages_sent_at_once_arrive_in_order
     msgs = []
     f = spin { loop { msgs << receive } }

data/test/test_global_api.rb

@@ -150,6 +150,28 @@ class MoveOnAfterTest < MiniTest::Test
     assert t1 - t0 < 0.1
     assert_equal 'foo', v
   end
+
+  def test_nested_move_on_after
+    t0 = Time.now
+    o = move_on_after(0.01, with_value: 1) do
+      move_on_after(0.02, with_value: 2) do
+        sleep 1
+      end
+    end
+    t1 = Time.now
+    assert_equal 1, o
+    assert_in_range 0.008..0.013, t1 - t0
+
+    t0 = Time.now
+    o = move_on_after(0.02, with_value: 1) do
+      move_on_after(0.01, with_value: 2) do
+        sleep 1
+      end
+    end
+    t1 = Time.now
+    assert_equal 2, o
+    assert_in_range 0.008..0.013, t1 - t0
+  end
 end
 
 class CancelAfterTest < MiniTest::Test
@@ -277,6 +299,45 @@ class SpinLoopTest < MiniTest::Test
   end
 end
 
+class SpinScopeTest < MiniTest::Test
+  def test_spin_scope
+    queue = Queue.new
+    buffer = {}
+    spin do
+      queue << 1
+      snooze
+      queue << 2
+    end
+    f = nil
+    result = spin_scope do
+      f = Fiber.current
+      spin { buffer[:a] = queue.shift }
+      spin { buffer[:b] = queue.shift }
+      :foo
+    end
+    assert_equal :foo, result
+    assert_kind_of Fiber, f
+    assert_equal :dead, f.state
+    assert_equal ({a: 1, b: 2}), buffer
+  end
+
+  def test_spin_scope_with_exception
+    queue = Queue.new
+    buffer = []
+    spin do
+      spin_scope do
+        spin { buffer << queue.shift }
+        spin { raise 'foobar' }
+      end
+    rescue => e
+      buffer << e.message
+    end
+    6.times { snooze }
+    assert_equal 0, Fiber.current.children.size
+    assert_equal ['foobar'], buffer
+  end
+end
+
 class ThrottledLoopTest < MiniTest::Test
   def test_throttled_loop
     buffer = []

data/test/test_queue.rb

@@ -130,3 +130,120 @@ class QueueTest < MiniTest::Test
     assert_equal 0, @queue.size
   end
 end
+
+class CappedQueueTest < MiniTest::Test
+  def setup
+    super
+    @queue = Polyphony::Queue.new
+    @queue.cap(3)
+  end
+
+  def test_capped?
+    q = Polyphony::Queue.new
+    assert_nil q.capped?
+
+    q.cap(3)
+    assert_equal 3, q.capped?
+  end
+
+  def test_initalize_with_cap
+    q = Polyphony::Queue.new(42)
+    assert_equal 42, q.capped?
+  end
+
+  def test_capped_push
+    buffer = []
+    a = spin do
+      (1..5).each do |i|
+        @queue.push(i)
+        buffer << :"p#{i}"
+      end
+      @queue.push :stop
+    end
+
+    snooze
+
+    b = spin_loop do
+      i = @queue.shift
+      raise Polyphony::Terminate if i == :stop
+      buffer << :"s#{i}"
+    end
+
+    Fiber.join(a, b)
+    assert_equal [:p1, :p2, :s1, :p3, :s2, :p4, :s3, :p5, :s4, :s5], buffer
+  end
+
+  def test_capped_multi_push
+    buffer = []
+    a = spin(:a) do
+      (1..3).each do |i|
+        @queue.push(i)
+        buffer << :"p#{i}"
+      end
+    end
+
+    buffer = []
+    b = spin(:b) do
+      (4..6).each do |i|
+        @queue.push(i)
+        buffer << :"p#{i}"
+      end
+      @queue.push :stop
+    end
+
+    c = spin_loop do
+      i = @queue.shift
+      raise Polyphony::Terminate if i == :stop
+      buffer << :"s#{i}"
+      snooze
+    end
+
+    Fiber.join(a, b, c)
+    assert_equal [:p1, :p4, :s1, :p5, :p2, :s4, :p3, :s5, :p6, :s2, :s3, :s6], buffer
+  end
+
+  def test_capped_clear
+    buffer = []
+    a = spin(:a) do
+      (1..5).each do |i|
+        @queue.push(i)
+        buffer << i
+      end
+    end
+
+    snooze while buffer.size < 3
+    @queue.clear
+    buffer << :clear
+
+    a.join
+    assert_equal [1, 2, 3, :clear, 4, 5], buffer
+  end
+
+  def test_capped_delete
+    buffer = []
+    a = spin(:a) do
+      (1..5).each do |i|
+        @queue.push(i)
+        buffer << i
+      end
+    end
+
+    i = 0
+    spin_loop do
+      i += 1
+      snooze 
+    end
+
+    5.times { snooze }
+    assert_equal 5, i
+    @queue.delete 1
+    buffer << :"d#{i}"
+    3.times { snooze }
+    assert_equal 8, i
+    @queue.delete 2
+    buffer << :"d#{i}"
+
+    a.join
+    assert_equal [1, 2, 3, :d5, 4, :d8, 5], buffer
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: 0.46.1
+  version: 0.47.0
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-04 00:00:00.000000000 Z
+date: 2020-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -348,6 +348,7 @@ files:
 - examples/core/await.rb
 - examples/core/channels.rb
 - examples/core/deferring-an-operation.rb
+- examples/core/enumerable.rb
 - examples/core/erlang-style-genserver.rb
 - examples/core/forking.rb
 - examples/core/handling-signals.rb
@@ -386,6 +387,7 @@ files:
 - examples/io/tcpsocket.rb
 - examples/io/tunnel.rb
 - examples/io/zip.rb
+- examples/performance/fiber_resume.rb
 - examples/performance/fiber_transfer.rb
 - examples/performance/fs_read.rb
 - examples/performance/mem-usage.rb
@@ -394,6 +396,8 @@ files:
 - examples/performance/snooze.rb
 - examples/performance/snooze_raw.rb
 - examples/performance/switch.rb
+- examples/performance/thread-vs-fiber/compare.rb
+- examples/performance/thread-vs-fiber/em_server.rb
 - examples/performance/thread-vs-fiber/httparty_multi.rb
 - examples/performance/thread-vs-fiber/httparty_threaded.rb
 - examples/performance/thread-vs-fiber/polyphony_mt_server.rb
@@ -401,6 +405,7 @@ files:
 - examples/performance/thread-vs-fiber/polyphony_server_read_loop.rb
 - examples/performance/thread-vs-fiber/threaded_server.rb
 - examples/performance/thread_pool_perf.rb
+- examples/performance/thread_switch.rb
 - ext/libev/Changes
 - ext/libev/LICENSE
 - ext/libev/README