polyphony 0.68 → 0.72

data/lib/polyphony/extensions/io.rb

@@ -76,7 +76,7 @@ end
 
 # IO instance method patches
 class ::IO
-  def __polyphony_read_method__
+  def __parser_read_method__
     :backend_read
   end
 
@@ -103,7 +103,7 @@ class ::IO
   alias_method :orig_getc, :getc
   def getc
     return @read_buffer.slice!(0) if @read_buffer && !@read_buffer.empty?
-    
+
     @read_buffer ||= +''
     Polyphony.backend_read(self, @read_buffer, 8192, false, -1)
     return @read_buffer.slice!(0) if !@read_buffer.empty?
@@ -116,7 +116,7 @@ class ::IO
     if buf
       return Polyphony.backend_read(self, buf, len, true, buf_pos)
     end
-    
+
     @read_buffer ||= +''
     result = Polyphony.backend_read(self, @read_buffer, len, true, -1)
     return nil unless result

data/lib/polyphony/extensions/openssl.rb

@@ -5,7 +5,7 @@ require_relative './socket'
 
 # OpenSSL socket helper methods (to make it compatible with Socket API) and overrides
 class ::OpenSSL::SSL::SSLSocket
-  def __polyphony_read_method__
+  def __parser_read_method__
     :readpartial
   end
 
@@ -130,24 +130,32 @@ class ::OpenSSL::SSL::SSLServer
       end
     end
 
+    # STDOUT.puts 'SSLServer#accept'
     sock, = @svr.accept
+    # STDOUT.puts "- raw sock: #{sock.inspect}"
     begin
       ssl = OpenSSL::SSL::SSLSocket.new(sock, @ctx)
+      # STDOUT.puts "- ssl sock: #{ssl.inspect}"
       ssl.sync_close = true
       if @use_accept_worker
+        # STDOUT.puts "- send to accept worker"
         @accept_worker_fiber << [ssl, Fiber.current]
-        receive
+        # STDOUT.puts "- wait for accept worker"
+        r = receive
+        # STDOUT.puts "- got reply from accept worker: #{r.inspect}"
+        r.invoke if r.is_a?(Exception)
       else
         ssl.accept
       end
       ssl
-    rescue Exception => ex
+    rescue Exception => e
+      # STDOUT.puts "- accept exception: #{e.inspect}"
       if ssl
         ssl.close
       else
         sock.close
       end
-      raise ex
+      raise e
     end
   end
 
@@ -156,11 +164,18 @@ class ::OpenSSL::SSL::SSLServer
     @accept_worker_thread = Thread.new do
       fiber << Fiber.current
       loop do
+        # STDOUT.puts "- accept_worker wait for work"
         socket, peer = receive
+        # STDOUT.puts "- accept_worker got socket from peer #{peer.inspect}"
         socket.accept
+        # STDOUT.puts "- accept_worker accept returned"
         peer << socket
-      rescue => e
-        peer.schedule(e) if fiber
+        # STDOUT.puts "- accept_worker sent socket back to peer"
+      rescue Polyphony::BaseException
+        raise
+      rescue Exception => e
+        # STDOUT.puts "- accept_worker error: #{e}"
+        peer << e if peer
       end
     end
     @accept_worker_fiber = receive

data/lib/polyphony/extensions/socket.rb

@@ -6,7 +6,7 @@ require_relative './io'
 require_relative '../core/thread_pool'
 
 class BasicSocket
-  def __polyphony_read_method__
+  def __parser_read_method__
     :backend_recv
   end
 end
@@ -32,7 +32,7 @@ class ::Socket
   def read(maxlen = nil, buf = nil, buf_pos = 0)
     return Polyphony.backend_recv(self, buf, maxlen, buf_pos) if buf
     return Polyphony.backend_recv(self, buf || +'', maxlen, 0) if maxlen
-    
+
     buf = +''
     len = buf.bytesize
     while true
@@ -168,7 +168,7 @@ class ::TCPSocket
   def read(maxlen = nil, buf = nil, buf_pos = 0)
     return Polyphony.backend_recv(self, buf, maxlen, buf_pos) if buf
     return Polyphony.backend_recv(self, buf || +'', maxlen, 0) if maxlen
-    
+
     buf = +''
     len = buf.bytesize
     while true
@@ -232,7 +232,6 @@ class ::TCPServer
   alias_method :orig_accept, :accept
   def accept
     Polyphony.backend_accept(@io, TCPSocket)
-    # @io.accept
   end
 
   def accept_loop(&block)
@@ -261,7 +260,7 @@ class ::UNIXSocket
   def read(maxlen = nil, buf = nil, buf_pos = 0)
     return Polyphony.backend_recv(self, buf, maxlen, buf_pos) if buf
     return Polyphony.backend_recv(self, buf || +'', maxlen, 0) if maxlen
-    
+
     buf = +''
     len = buf.bytesize
     while true

data/lib/polyphony/net.rb

@@ -67,7 +67,6 @@ module Polyphony
       def setup_alpn(context, protocols)
         context.alpn_protocols = protocols
         context.alpn_select_cb = lambda do |peer_protocols|
-          p alpn_select_cb: peer_protocols
           (protocols & peer_protocols).first
         end
       end

data/lib/polyphony/version.rb

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

data/polyphony.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   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  'httparty',             '0.17.1'
   s.add_development_dependency  'localhost',            '~>1.1.4'

data/test/coverage.rb

@@ -24,10 +24,10 @@ module Coverage
       @result = {}
       trace = TracePoint.new(:line) do |tp|
         next if tp.path =~ /\(/
-      
+
         absolute = File.expand_path(tp.path)
         next unless LIB_FILES.include?(absolute)# =~ /^#{LIB_DIR}/
-        
+
         @result[absolute] ||= relevant_lines_for_filename(absolute)
         @result[absolute][tp.lineno - 1] = 1
       end

data/test/stress.rb

@@ -3,7 +3,7 @@
 count = ARGV[0] ? ARGV[0].to_i : 100
 test_name = ARGV[1]
 
-$test_cmd = +'ruby test/run.rb'
+$test_cmd = +'ruby test/run.rb  --name test_receive_cross_thread_exception'
 if test_name
   $test_cmd << " --name #{test_name}"
 end

data/test/test_backend.rb

@@ -36,7 +36,7 @@ class BackendTest < MiniTest::Test
     f = spin { @backend.read(i, buf, 5, false, 0) }
     @backend.write(o, 'Hello world')
     return_value = f.await
-    
+
     assert_equal 'Hello', buf
     assert_equal return_value, buf
   end
@@ -51,7 +51,7 @@ class BackendTest < MiniTest::Test
     snooze
     o.close
     return_value = f.await
-    
+
     assert_equal 'Hello', buf
     assert_equal return_value, buf
   end
@@ -66,7 +66,7 @@ class BackendTest < MiniTest::Test
     snooze
     o.close
     return_value = f.await
-    
+
     assert_equal 'Hello world', buf
     assert_equal return_value, buf
   end
@@ -77,7 +77,7 @@ class BackendTest < MiniTest::Test
     f = spin { @backend.read(i, buf, 20, false, 0) }
     @backend.write(o, 'blah')
     return_value = f.await
-    
+
     assert_equal 'blah', buf
     assert_equal return_value, buf
 
@@ -85,7 +85,7 @@ class BackendTest < MiniTest::Test
     f = spin { @backend.read(i, buf, 20, false, -1) }
     @backend.write(o, 'klmn')
     return_value = f.await
-    
+
     assert_equal 'abcdefghijklmn', buf
     assert_equal return_value, buf
 
@@ -93,7 +93,7 @@ class BackendTest < MiniTest::Test
     f = spin { @backend.read(i, buf, 20, false, 3) }
     @backend.write(o, 'DEF')
     return_value = f.await
-    
+
     assert_equal 'abcDEF', buf
     assert_equal return_value, buf
   end
@@ -109,12 +109,12 @@ class BackendTest < MiniTest::Test
 
     o << data
     o.close
-    
+
     buf = +''
 
     @backend.read(i, buf, 4096, false, -1)
     assert_equal 4096, buf.bytesize
-    
+
     @backend.read(i, buf, 1, false, -1)
     assert_equal 4097, buf.bytesize
 
@@ -129,7 +129,7 @@ class BackendTest < MiniTest::Test
       @backend.post_fork
       exit(42)
     end
-    
+
     result = @backend.waitpid(pid)
     assert_equal [pid, 42], result
   end
@@ -427,7 +427,7 @@ class BackendTest < MiniTest::Test
     counter = 0
 
     @backend.idle_proc = proc { counter += 1 }
-    
+
     3.times { snooze }
     assert_equal 0, counter
 
@@ -488,7 +488,7 @@ class BackendChainTest < MiniTest::Test
 
     snooze
     client = TCPSocket.new('127.0.0.1', port)
-    
+
     result = Thread.backend.chain(
       [:send, client, 'hello', 0],
       [:send, client, " world\n", 0]
@@ -512,7 +512,7 @@ class BackendChainTest < MiniTest::Test
     while true
       len = o.splice(from, 8192)
       break if len == 0
-      
+
       backend.chain(
         [:write, to, chunk_header(len)],
         [:splice, i, to, len]

data/test/test_event.rb

@@ -25,7 +25,7 @@ class EventTest < MiniTest::Test
   def test_that_event_coalesces_signals
     count = 0
     a = Polyphony::Event.new
-   
+
     coproc = spin {
       loop {
         a.await

data/test/test_ext.rb

@@ -73,7 +73,7 @@ class KernelTest < MiniTest::Test
     data = `>&2 echo "error"`
     $stderr.rewind
     $stderr = prev_stderr
-    
+
     assert_equal '', data
     assert_equal "error\n", err_io.read
   ensure

data/test/test_fiber.rb

@@ -47,7 +47,7 @@ class FiberTest < MiniTest::Test
     f1 = spin { :foo }
     f2 = spin { :bar }
     4.times { snooze }
-    
+
     assert_equal [:foo, :bar], Fiber.await(f1, f2)
   end
 
@@ -67,8 +67,6 @@ class FiberTest < MiniTest::Test
     }
     Fiber.await(f2, f3)
     assert_equal [:foo, :bar, :baz], buffer
-    assert_equal [f1], Fiber.current.children
-    Fiber.current.reap_dead_children
     assert_equal [], Fiber.current.children
   end
 
@@ -93,8 +91,6 @@ class FiberTest < MiniTest::Test
     f1.stop
 
     snooze
-    assert_equal [f1, f2, f3], Fiber.current.children
-    Fiber.current.reap_dead_children
     assert_equal [], Fiber.current.children
   end
 
@@ -602,7 +598,6 @@ class FiberTest < MiniTest::Test
 
     f.stop
     snooze
-    Fiber.current.reap_dead_children
     assert_equal [], Fiber.current.children
   end
 
@@ -744,7 +739,7 @@ class FiberTest < MiniTest::Test
   def test_setup_raw
     buffer = []
     f = Fiber.new { buffer << receive }
-    
+
     assert_nil f.thread
     snooze
     f.setup_raw
@@ -776,10 +771,11 @@ class FiberTest < MiniTest::Test
 
     snooze
     assert_equal parent, child.parent
-    child.detach 
+    result = child.detach
+    assert_equal result, child
     assert_equal Fiber.current, child.parent
     parent.await
-    
+
     child << :bye
     child.await
 
@@ -812,7 +808,7 @@ class FiberTest < MiniTest::Test
     child.attach_to(new_parent)
     assert_equal new_parent, child.parent
     parent.await
-    
+
     child << :bye
     new_parent << :bye_new_parent
     snooze
@@ -825,6 +821,29 @@ class FiberTest < MiniTest::Test
       :bye_new_parent
     ], buf
   end
+
+  def test_attach_all_children_to
+    children = []
+    f1 = spin do
+      3.times {
+        children << spin { receive }
+      }
+      Fiber.current.parent << :ok
+      receive
+    end
+
+    result = receive
+    assert_equal :ok, result
+    assert_equal 3, children.size
+
+    f2 = spin { supervise }
+    f1.attach_all_children_to(f2)
+
+    snooze
+
+    assert_equal [], f1.children
+    assert_equal children, f2.children
+  end
 end
 
 class MailboxTest < MiniTest::Test
@@ -954,6 +973,27 @@ class MailboxTest < MiniTest::Test
     assert_equal ['foo'] * 100, messages
   end
 
+  def test_receive_exception
+    e = RuntimeError.new 'foo'
+    spin { Fiber.current.parent << e }
+    r = receive
+    assert_equal e, r
+
+    spin { Fiber.current.parent.schedule e }
+    assert_raises(RuntimeError) { receive }
+  end
+
+  def test_receive_cross_thread_exception
+    e = RuntimeError.new 'foo'
+    f = Fiber.current
+    Thread.new { f << e }
+    r = receive
+    assert_equal e, r
+
+    Thread.new { f.schedule e }
+    assert_raises(RuntimeError) { receive }
+  end
+
   def test_receive_all_pending
     assert_equal [], receive_all_pending
 
@@ -1110,7 +1150,7 @@ class RestartTest < MiniTest::Test
     assert_equal [1], buffer
     snooze
     assert_equal [1, 1], buffer
-    
+
     f << 'foo'
     sleep 0.1
     assert_equal [1, 1, 2], buffer
@@ -1236,7 +1276,7 @@ class DebugTest < MiniTest::Test
     assert_equal true, f.__parked__?
     10.times { snooze }
     assert_equal [], buf
-    
+
     f.__unpark__
     assert_nil f.__parked__?
     10.times { snooze }

data/test/test_global_api.rb

@@ -280,7 +280,7 @@ class SpinLoopTest < MiniTest::Test
   def test_spin_loop_location
     location = /^#{__FILE__}:#{__LINE__ + 1}/
     f = spin_loop { snooze }
-    
+
     assert_match location, f.location
   end
 
@@ -375,7 +375,6 @@ class SpinScopeTest < MiniTest::Test
       buffer << e.message
     end
     10.times { snooze }
-    Fiber.current.reap_dead_children
     assert_equal 0, Fiber.current.children.size
     assert_equal ['foobar'], buffer
   end
@@ -403,7 +402,7 @@ class ThrottledLoopTest < MiniTest::Test
     f.await
     t1 = Time.now
     assert_in_range 0.075..0.15, t1 - t0 if IS_LINUX
-    assert_equal [1, 2, 3, 4, 5], buffer    
+    assert_equal [1, 2, 3, 4, 5], buffer
   end
 end
 

data/test/test_io.rb

@@ -107,10 +107,10 @@ class IOTest < MiniTest::Test
       sleep 0.01
       o << 'hi'
     }
-    assert_equal 'hi', i.readpartial(2) 
+    assert_equal 'hi', i.readpartial(2)
     o.close
 
-    assert_raises(EOFError) { i.readpartial(1) }    
+    assert_raises(EOFError) { i.readpartial(1) }
   end
 
   def test_gets
@@ -132,7 +132,7 @@ class IOTest < MiniTest::Test
     f << Fiber.current
     sleep 0.05
     assert_equal [], buf
-    
+
     o << "ulous\n"
     receive
     assert_equal ["fabulous\n"], buf

data/test/test_process_supervision.rb

@@ -6,7 +6,7 @@ class ProcessSupervisionTest < MiniTest::Test
   def test_process_supervisor_with_block
     i, o = IO.pipe
 
-    f = spin do
+    watcher = spin do
       Polyphony.watch_process do
         i.close
         sleep 5
@@ -14,31 +14,60 @@ class ProcessSupervisionTest < MiniTest::Test
         o << 'foo'
         o.close
       end
-      supervise(on_error: :restart)
     end
 
+    supervisor = spin { supervise(watcher, restart: :always) }
+
     sleep 0.05
-    f.terminate
-    f.await
+    supervisor.terminate
+    supervisor.await
 
     o.close
     msg = i.read
-    i.close
     assert_equal 'foo', msg
   end
 
+  def test_process_supervisor_restart_with_block
+    i1, o1 = IO.pipe
+    i2, o2 = IO.pipe
+
+    count = 0
+    watcher = spin do
+      count += 1
+      Polyphony.watch_process do
+        i1.gets
+        o2.puts count
+      end
+    end
+
+    supervisor = spin { supervise(watcher, restart: :always) }
+
+    o1.puts
+    l = i2.gets
+    assert_equal "1\n", l
+
+    o1.puts
+    l = i2.gets
+    assert_equal "2\n", l
+
+    o1.puts
+    l = i2.gets
+    assert_equal "3\n", l
+  end
+
   def test_process_supervisor_with_cmd
     fn = '/tmp/test_process_supervisor_with_cmd'
     FileUtils.rm(fn) rescue nil
 
-    f = spin do
+    watcher = spin do
       Polyphony.watch_process("echo foo >> #{fn}")
-      supervise(on_error: :restart)
     end
 
+    supervisor = spin { supervise(watcher) }
+
     sleep 0.05
-    f.terminate
-    f.await
+    supervisor.terminate
+    supervisor.await
 
     assert_equal "foo\n", IO.read(fn)
 

data/test/test_queue.rb

@@ -70,7 +70,7 @@ class QueueTest < MiniTest::Test
 
   def test_empty?
     assert @queue.empty?
-    
+
     @queue << :foo
     assert !@queue.empty?
 
@@ -82,7 +82,7 @@ class QueueTest < MiniTest::Test
     f1 = spin { @queue.shift }
     f2 = spin { @queue.shift }
     f3 = spin { @queue.shift }
-    
+
     # let fibers run
     snooze
 
@@ -99,7 +99,7 @@ class QueueTest < MiniTest::Test
 
   def test_fiber_removal_from_queue_simple
     f1 = spin { @queue.shift }
-    
+
     # let fibers run
     snooze
 
@@ -114,11 +114,11 @@ class QueueTest < MiniTest::Test
     assert_equal 0, @queue.size
 
     @queue.push 1
-    
+
     assert_equal 1, @queue.size
 
     @queue.push 2
-    
+
     assert_equal 2, @queue.size
 
     @queue.shift
@@ -231,7 +231,7 @@ class CappedQueueTest < MiniTest::Test
     i = 0
     spin_loop do
       i += 1
-      snooze 
+      snooze
     end
 
     5.times { snooze }

data/test/test_socket.rb

@@ -9,9 +9,16 @@ class SocketTest < MiniTest::Test
     super
   end
 
-  def test_tcp
-    port = rand(1234..5678)
+  def start_tcp_server_on_random_port
+    port = rand(1100..60000)
     server = TCPServer.new('127.0.0.1', port)
+    [port, server]
+  rescue Errno::EADDRINUSE
+    retry
+  end
+
+  def test_tcp
+    port, server = start_tcp_server_on_random_port
     server_fiber = spin do
       while (socket = server.accept)
         spin do
@@ -34,8 +41,7 @@ class SocketTest < MiniTest::Test
   end
 
   def test_read
-    port = rand(1234..5678)
-    server = TCPServer.new('127.0.0.1', port)
+    port, server = start_tcp_server_on_random_port
     server_fiber = spin do
       while (socket = server.accept)
         spin do
@@ -74,9 +80,7 @@ class SocketTest < MiniTest::Test
 
   # sending multiple strings at once
   def test_sendv
-    port = rand(1234..5678)
-    server = TCPServer.new('127.0.0.1', port)
-
+    port, server = start_tcp_server_on_random_port
     server_fiber = spin do
       while (socket = server.accept)
         spin do
@@ -100,9 +104,7 @@ class SocketTest < MiniTest::Test
 
 
   def test_feed_loop
-    port = rand(1234..5678)
-    server = TCPServer.new('127.0.0.1', port)
-
+    port, server = start_tcp_server_on_random_port
     server_fiber = spin do
       reader = MessagePack::Unpacker.new
       while (socket = server.accept)