polyphony 0.49.2 → 0.53.0

data/lib/polyphony/version.rb

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

data/polyphony.gemspec

@@ -22,12 +22,13 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.6'
 
   s.add_development_dependency  'rake-compiler',        '1.1.1'
-  s.add_development_dependency  'minitest',             '5.13.0'
+  s.add_development_dependency  'minitest',             '5.14.4'
   s.add_development_dependency  'minitest-reporters',   '1.4.2'
   s.add_development_dependency  'simplecov',            '0.17.1'
   s.add_development_dependency  'rubocop',              '0.85.1'
   s.add_development_dependency  'pry',                  '0.13.1'
   
+  s.add_development_dependency  'msgpack',              '1.4.2'
   s.add_development_dependency  'pg',                   '1.1.4'
   s.add_development_dependency  'redis',                '4.1.0'
   s.add_development_dependency  'hiredis',              '0.6.3'
@@ -37,8 +38,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency  'sequel',               '5.34.0'
   s.add_development_dependency  'httparty',             '0.17.1'
 
-  s.add_development_dependency  'jekyll',               '~>3.8.6'
-  s.add_development_dependency  'jekyll-remote-theme',  '~>0.4.1'
-  s.add_development_dependency  'jekyll-seo-tag',       '~>2.6.1'
-  s.add_development_dependency  'just-the-docs',        '~>0.3.0'
+  # s.add_development_dependency  'jekyll',               '~>3.8.6'
+  # s.add_development_dependency  'jekyll-remote-theme',  '~>0.4.1'
+  # s.add_development_dependency  'jekyll-seo-tag',       '~>2.6.1'
+  # s.add_development_dependency  'just-the-docs',        '~>0.3.0'
 end

data/test/helper.rb

@@ -52,7 +52,7 @@ class MiniTest::Test
     Fiber.current.instance_variable_set(:@auto_watcher, nil)
     Thread.current.backend.finalize
     Thread.current.backend = Polyphony::Backend.new
-    sleep 0
+    sleep 0.001
   end
 
   def teardown

data/test/stress.rb

@@ -8,6 +8,8 @@ def run_test(count)
   puts "#{count}: running tests..."
   # sleep 1
   system(TEST_CMD)
+  puts
+
   return if $?.exitstatus == 0
 
   puts "Failure after #{count} tests"

data/test/test_backend.rb

@@ -125,12 +125,15 @@ class BackendTest < MiniTest::Test
     assert_equal [:ready, 'foo', 'bar'], buf
   end
 
-  def test_accept_loop
-    server = TCPServer.new('127.0.0.1', 1234)
+  Net = Polyphony::Net
+
+  def test_accept
+    server = Net.listening_socket_from_options('127.0.0.1', 1234, reuse_addr: true)
 
     clients = []
-    server_fiber = spin do
-      @backend.accept_loop(server, TCPSocket) { |c| clients << c }
+    server_fiber = spin_loop do
+      c = @backend.accept(server, TCPSocket)
+      clients << c
     end
 
     c1 = TCPSocket.new('127.0.0.1', 1234)
@@ -146,7 +149,32 @@ class BackendTest < MiniTest::Test
   ensure
     c1&.close
     c2&.close
-    server_fiber.stop
+    server_fiber&.stop
+    snooze
+    server&.close
+  end
+
+  def test_accept_loop
+    server = Net.listening_socket_from_options('127.0.0.1', 1235, reuse_addr: true)
+
+    clients = []
+    server_fiber = spin do
+      @backend.accept_loop(server, TCPSocket) { |c| clients << c }
+    end
+
+    c1 = TCPSocket.new('127.0.0.1', 1235)
+    sleep 0.01
+
+    assert_equal 1, clients.size
+
+    c2 = TCPSocket.new('127.0.0.1', 1235)
+    sleep 0.01
+
+    assert_equal 2, clients.size
+  ensure
+    c1&.close
+    c2&.close
+    server_fiber&.stop
     snooze
     server&.close
   end
@@ -209,4 +237,40 @@ class BackendTest < MiniTest::Test
     end
     assert_equal [1], buffer
   end
+
+  def test_splice
+    i1, o1 = IO.pipe
+    i2, o2 = IO.pipe
+
+    spin {
+      o2.splice(i1, 1000)
+      o2.close
+    }
+
+    o1.write('foobar')
+    result = i2.read
+
+    assert_equal 'foobar', result
+  end
+
+  def test_splice_to_eof
+    i1, o1 = IO.pipe
+    i2, o2 = IO.pipe
+
+    f = spin {
+      o2.splice_to_eof(i1, 1000)
+      o2.close
+    }
+
+    o1.write('foo')
+    result = i2.readpartial(1000)
+    assert_equal 'foo', result
+
+    o1.write('bar')
+    result = i2.readpartial(1000)
+    assert_equal 'bar', result
+  ensure
+    f.interrupt
+    f.await
+  end
 end

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

data/test/test_global_api.rb

@@ -160,10 +160,10 @@ class MoveOnAfterTest < MiniTest::Test
     end
     t1 = Time.now
     assert_equal 1, o
-    assert_in_range 0.008..0.013, t1 - t0
+    assert_in_range 0.008..0.015, t1 - t0
 
     t0 = Time.now
-    o = move_on_after(0.02, with_value: 1) do
+    o = move_on_after(0.05, with_value: 1) do
       move_on_after(0.01, with_value: 2) do
         sleep 1
       end

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,88 @@ 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 Receiver1
+    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 = Receiver1.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
+
+  class Receiver2
+    attr_reader :buffer
+
+    def initialize
+      @buffer = []
+    end
+
+    def call(obj)
+      @buffer << obj
+    end
+  end
+
+  def test_feed_loop_without_method
+    i, o = IO.pipe
+    receiver = Receiver2.new
+    reader = spin do
+      i.feed_loop(receiver)
+    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_kernel.rb

@@ -21,7 +21,7 @@ class KernelTest < MiniTest::Test
 
   def test_Kernel_system_singleton_method
     assert_equal true, Kernel.system("which ruby > /dev/null 2>&1")
-    assert_equal false, Kernel.system("which rruubbyy > /dev/null 2>&1")
+    assert_equal false, Kernel.system("azertyuiop > /dev/null 2>&1")
   end
 
   def patch_open3

data/test/test_signal.rb

@@ -23,7 +23,7 @@ class SignalTrapTest < Minitest::Test
     ensure
       o.close
     end
-    sleep 0.01
+    sleep 0.1
     o.close
     Process.kill('INT', pid)
     Thread.current.backend.waitpid(pid)

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,66 @@ class SocketTest < MiniTest::Test
     server&.close
   end
 
+  # sending multiple strings at once
+  def test_sendv
+    port = rand(1234..5678)
+    server = TCPServer.new('127.0.0.1', port)
+
+    server_fiber = spin do
+      while (socket = server.accept)
+        spin do
+          while (data = socket.gets(8192))
+            socket.write("you said ", data)
+          end
+        end
+      end
+    end
+
+    snooze
+    client = TCPSocket.new('127.0.0.1', port)
+    client.write("1234\n")
+    assert_equal "you said 1234\n", client.recv(8192)
+    client.close
+  ensure
+    server_fiber&.stop
+    server_fiber&.await
+    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
@@ -35,7 +35,7 @@ class TimerMoveOnAfterTest < MiniTest::Test
     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
@@ -48,7 +48,7 @@ class TimerMoveOnAfterTest < MiniTest::Test
     t1 = Time.now
 
     assert_nil v
-    assert_in_range 0.02..0.03, t1 - t0
+    assert_in_range 0.015..0.03, t1 - t0
   end
 end
 
@@ -61,7 +61,7 @@ class TimerCancelAfterTest < MiniTest::Test
     @timer.stop
   end
 
-  def test_cancel_after
+  def test_timer_cancel_after
     t0 = Time.now
 
     assert_raises Polyphony::Cancel do
@@ -74,7 +74,7 @@ class TimerCancelAfterTest < MiniTest::Test
     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
@@ -82,13 +82,13 @@ class TimerCancelAfterTest < MiniTest::Test
       sleep 0.007
     end
     t1 = Time.now
-    assert_in_range 0.014..0.024, t1 - t0
+    assert_in_range 0.012..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
@@ -122,3 +122,36 @@ class TimerCancelAfterTest < 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