polyphony 0.49.0 → 0.51.0

data/test/test_fiber.rb

@@ -349,6 +349,22 @@ class FiberTest < MiniTest::Test
     assert_equal [:foo, :terminate], buffer
   end
 
+  CMD_TERMINATE_MAIN_FIBER = <<~BASH
+    ruby -rbundler/setup -rpolyphony -e"spin { sleep 0.1; Thread.current.main_fiber.terminate }; begin; sleep; rescue Polyphony::Terminate; STDOUT << 'terminated'; end" 2>&1
+  BASH
+
+  CMD_TERMINATE_CHILD_FIBER = <<~BASH
+    ruby -rbundler/setup -rpolyphony -e"f = spin { sleep }; spin { sleep 0.1; f.terminate }; f.await" 2>&1
+  BASH
+
+  def test_terminate_main_fiber
+    output = `#{CMD_TERMINATE_CHILD_FIBER}`
+    assert_equal '', output
+
+    output = `#{CMD_TERMINATE_MAIN_FIBER}`
+    assert_equal 'terminated', output
+  end
+
   def test_interrupt_timer
     result = []
     f = Fiber.current.spin do
@@ -1038,6 +1054,21 @@ class RestartTest < MiniTest::Test
   end
 end
 
+class ChildrenTerminationTest < MiniTest::Test
+  def test_shutdown_all_children
+    f = spin do
+      1000.times { spin { suspend } }
+      suspend
+    end
+
+    snooze
+    assert_equal 1000, f.children.size
+
+    f.shutdown_all_children
+    assert_equal 0, f.children.size
+  end
+end
+
 class GracefulTerminationTest < MiniTest::Test
   def test_graceful_termination
     buffer = []

data/test/test_io.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'helper'
+require 'msgpack'
 
 class IOTest < MiniTest::Test
   def setup
@@ -110,7 +111,7 @@ class IOTest < MiniTest::Test
     assert_equal [], buf
     
     o << "ulous\n"
-    10.times { snooze }
+    sleep 0.01
     assert_equal ["fabulous\n"], buf
 
     o.close
@@ -173,6 +174,57 @@ class IOTest < MiniTest::Test
 
     assert_equal 'hello: world', buf
   end
+
+  def test_feed_loop_with_block
+    i, o = IO.pipe
+    unpacker = MessagePack::Unpacker.new
+    buffer = []
+    reader = spin do
+      i.feed_loop(unpacker, :feed_each) { |msg| buffer << msg }
+    end
+    o << 'foo'.to_msgpack
+    sleep 0.01
+    assert_equal ['foo'], buffer
+
+    o << 'bar'.to_msgpack
+    sleep 0.01
+    assert_equal ['foo', 'bar'], buffer
+
+    o << 'baz'.to_msgpack
+    sleep 0.01
+    assert_equal ['foo', 'bar', 'baz'], buffer
+  end
+
+  class Receiver
+    attr_reader :buffer
+
+    def initialize
+      @buffer = []
+    end
+
+    def recv(obj)
+      @buffer << obj
+    end
+  end
+
+  def test_feed_loop_without_block
+    i, o = IO.pipe
+    receiver = Receiver.new
+    reader = spin do
+      i.feed_loop(receiver, :recv)
+    end
+    o << 'foo'
+    sleep 0.01
+    assert_equal ['foo'], receiver.buffer
+
+    o << 'bar'
+    sleep 0.01
+    assert_equal ['foo', 'bar'], receiver.buffer
+
+    o << 'baz'
+    sleep 0.01
+    assert_equal ['foo', 'bar', 'baz'], receiver.buffer
+  end
 end
 
 class IOClassMethodsTest < MiniTest::Test

data/test/test_signal.rb

@@ -46,8 +46,7 @@ class SignalTrapTest < Minitest::Test
       end.await
     rescue Interrupt
       o.puts "3 - interrupted"
-      Fiber.current.terminate_all_children
-      Fiber.current.await_all_children
+      Fiber.current.shutdown_all_children
     ensure
       o.close
     end

data/test/test_socket.rb

@@ -2,6 +2,7 @@
 
 require_relative 'helper'
 require 'fileutils'
+require 'msgpack'
 
 class SocketTest < MiniTest::Test
   def setup
@@ -33,6 +34,39 @@ class SocketTest < MiniTest::Test
     server&.close
   end
 
+  def test_feed_loop
+    port = rand(1234..5678)
+    server = TCPServer.new('127.0.0.1', port)
+
+    server_fiber = spin do
+      reader = MessagePack::Unpacker.new
+      while (socket = server.accept)
+        spin do
+          socket.feed_loop(reader, :feed_each) do |msg|
+            msg = { 'result' => msg['x'] + msg['y'] }
+            socket << msg.to_msgpack
+          end
+        end
+      end
+    end
+
+    snooze
+    client = TCPSocket.new('127.0.0.1', port)
+    reader = MessagePack::Unpacker.new
+    client << { 'x' => 13, 'y' => 14 }.to_msgpack
+    result = nil
+    client.feed_loop(reader, :feed_each) do |msg|
+      result = msg
+      break
+    end
+    assert_equal({ 'result' => 27}, result)
+    client.close
+  ensure
+    server_fiber&.stop
+    server_fiber&.await
+    server&.close
+  end
+
   def test_unix_socket
     path = '/tmp/test_unix_socket'
     FileUtils.rm(path) rescue nil

data/test/test_timer.rb

@@ -11,7 +11,7 @@ class TimerMoveOnAfterTest < MiniTest::Test
     @timer.stop
   end
 
-  def test_move_on_after
+  def test_timer_move_on_after
     t0 = Time.now
     v = @timer.move_on_after(0.1) do
       sleep 1
@@ -23,7 +23,7 @@ class TimerMoveOnAfterTest < MiniTest::Test
     assert_nil v
   end
 
-  def test_move_on_after_with_value
+  def test_timer_move_on_after_with_value
     t0 = Time.now
     v = @timer.move_on_after(0.01, with_value: :bar) do
       sleep 1
@@ -31,13 +31,15 @@ class TimerMoveOnAfterTest < MiniTest::Test
     end
     t1 = Time.now
 
-    assert_in_range 0.01..0.02, t1 - t0
+    assert_in_range 0.01..0.025, t1 - t0
     assert_equal :bar, v
   end
 
-  def test_move_on_after_with_reset
+  def test_timer_move_on_after_with_reset
     t0 = Time.now
     v = @timer.move_on_after(0.01, with_value: :moved_on) do
+      sleep 0.007
+      @timer.reset
       sleep 0.007
       @timer.reset
       sleep 0.007
@@ -46,11 +48,11 @@ class TimerMoveOnAfterTest < MiniTest::Test
     t1 = Time.now
 
     assert_nil v
-    assert_in_range 0.014..0.02, t1 - t0
+    assert_in_range 0.015..0.03, t1 - t0
   end
 end
 
-class CancelAfterTest < MiniTest::Test
+class TimerCancelAfterTest < MiniTest::Test
   def setup
     @timer = Polyphony::Timer.new(resolution: 0.01)
   end
@@ -59,7 +61,7 @@ class CancelAfterTest < MiniTest::Test
     @timer.stop
   end
 
-  def test_cancel_after
+  def test_timer_cancel_after
     t0 = Time.now
 
     assert_raises Polyphony::Cancel do
@@ -69,10 +71,10 @@ class CancelAfterTest < MiniTest::Test
       end
     end
     t1 = Time.now
-    assert_in_range 0.01..0.02, t1 - t0
+    assert_in_range 0.01..0.03, t1 - t0
   end
 
-  def test_cancel_after_with_reset
+  def test_timer_cancel_after_with_reset
     t0 = Time.now
     @timer.cancel_after(0.01) do
       sleep 0.007
@@ -80,13 +82,13 @@ class CancelAfterTest < MiniTest::Test
       sleep 0.007
     end
     t1 = Time.now
-    assert_in_range 0.014..0.024, t1 - t0
+    assert_in_range 0.013..0.024, t1 - t0
   end
 
   class CustomException < Exception
   end
 
-  def test_cancel_after_with_custom_exception
+  def test_timer_cancel_after_with_custom_exception
     assert_raises CustomException do
       @timer.cancel_after(0.01, with_exception: CustomException) do
         sleep 1
@@ -120,3 +122,36 @@ class CancelAfterTest < MiniTest::Test
     end
   end
 end
+
+class TimerMiscTest < MiniTest::Test
+  def setup
+    @timer = Polyphony::Timer.new(resolution: 0.001)
+    sleep 0
+  end
+  
+  def teardown
+    @timer.stop
+  end
+    
+  def test_timer_after
+    buffer = []
+    f = @timer.after(0.01) { buffer << 2 }
+    assert_kind_of Fiber, f
+    snooze
+    assert_equal [], buffer
+    sleep 0.1
+    p :post_sleep
+    assert_equal [2], buffer
+  end
+
+  def test_timer_every
+    buffer = []
+    t0 = Time.now
+    f = spin do
+      @timer.every(0.01) { buffer << 1 }
+    end
+    sleep 0.05
+    f.stop
+    assert_in_range 4..6, buffer.size
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: 0.49.0
+  version: 0.51.0
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-11 00:00:00.000000000 Z
+date: 2021-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -94,6 +94,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.13.1
+- !ruby/object:Gem::Dependency
+  name: msgpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.4.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -353,6 +367,7 @@ files:
 - examples/core/forking.rb
 - examples/core/handling-signals.rb
 - examples/core/interrupt.rb
+- examples/core/nested.rb
 - examples/core/pingpong.rb
 - examples/core/recurrent-timer.rb
 - examples/core/resource_delegate.rb
@@ -360,6 +375,8 @@ files:
 - examples/core/spin_error_backtrace.rb
 - examples/core/supervise-process.rb
 - examples/core/supervisor.rb
+- examples/core/suspend.rb
+- examples/core/terminate_main_fiber.rb
 - examples/core/thread-sleep.rb
 - examples/core/thread_pool.rb
 - examples/core/throttling.rb