polyphony 0.65 → 0.69

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
 
@@ -160,8 +160,6 @@ class ::IO
       return @read_buffer.slice!(0, idx + sep_size) if idx
 
       result = readpartial(8192, @read_buffer, -1)
-        
-      #Polyphony.backend_read(self, @read_buffer, 8192, false, -1)
       return nil unless result
     end
   rescue EOFError

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
 
@@ -114,6 +114,68 @@ end
 
 # OpenSSL socket helper methods (to make it compatible with Socket API) and overrides
 class ::OpenSSL::SSL::SSLServer
+  attr_reader :ctx
+
+  alias_method :orig_accept, :accept
+  def accept
+    # when @ctx.servername_cb is set, we use a worker thread to run the
+    # ssl.accept call. We need to do this because:
+    # - We cannot switch fibers inside of the servername_cb proc (see
+    #   https://github.com/ruby/openssl/issues/415)
+    # - We don't want to stop the world while we're busy provisioning an ACME
+    #   certificate
+    if @use_accept_worker.nil?
+      if (@use_accept_worker = use_accept_worker_thread?)
+        start_accept_worker_thread
+      end
+    end
+
+    sock, = @svr.accept
+    begin
+      ssl = OpenSSL::SSL::SSLSocket.new(sock, @ctx)
+      ssl.sync_close = true
+      if @use_accept_worker
+        @accept_worker_fiber << [ssl, Fiber.current]
+        receive
+      else
+        ssl.accept
+      end
+      ssl
+    rescue Exception => ex
+      if ssl
+        ssl.close
+      else
+        sock.close
+      end
+      raise ex
+    end
+  end
+
+  def start_accept_worker_thread
+    fiber = Fiber.current
+    @accept_worker_thread = Thread.new do
+      fiber << Fiber.current
+      loop do
+        socket, peer = receive
+        socket.accept
+        peer << socket
+      rescue => e
+        peer.schedule(e) if fiber
+      end
+    end
+    @accept_worker_fiber = receive
+  end
+
+  def use_accept_worker_thread?
+    !!@ctx.servername_cb
+  end
+
+  alias_method :orig_close, :close
+  def close
+    @accept_worker_thread&.kill
+    orig_close
+  end
+
   def accept_loop(ignore_errors = true)
     loop do
       yield accept

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
@@ -206,7 +206,7 @@ class ::TCPSocket
   #   Polyphony.backend_send(self, mesg, 0)
   # end
 
-  def readpartial(maxlen, str = +'', buffer_pos = 0, raise_on_eof)
+  def readpartial(maxlen, str = +'', buffer_pos = 0, raise_on_eof = true)
     result = Polyphony.backend_recv(self, str, maxlen, buffer_pos)
     raise EOFError if !result && raise_on_eof
     result
@@ -299,7 +299,7 @@ class ::UNIXSocket
     Polyphony.backend_send(self, mesg, 0)
   end
 
-  def readpartial(maxlen, str = +'', buffer_pos = 0, raise_on_eof)
+  def readpartial(maxlen, str = +'', buffer_pos = 0, raise_on_eof = true)
     result = Polyphony.backend_recv(self, str, maxlen, buffer_pos)
     raise EOFError if !result && raise_on_eof
     result

data/lib/polyphony/net.rb

@@ -67,6 +67,7 @@ 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.65'
+  VERSION = '0.69'
 end

data/test/helper.rb

@@ -15,6 +15,8 @@ require 'minitest/reporters'
 
 ::Exception.__disable_sanitized_backtrace__ = true
 
+IS_LINUX = RUBY_PLATFORM =~ /linux/
+
 # Minitest::Reporters.use! [
 #   Minitest::Reporters::SpecReporter.new
 # ]
@@ -44,12 +46,7 @@ end
 class MiniTest::Test
   def setup
     # trace "* setup #{self.name}"
-    if Fiber.current.children.size > 0
-      puts "Children left: #{Fiber.current.children.inspect}"
-      exit!
-    end
     Fiber.current.setup_main_fiber
-    Fiber.current.instance_variable_set(:@auto_watcher, nil)
     Thread.current.backend.finalize
     Thread.current.backend = Polyphony::Backend.new
     sleep 0.001
@@ -58,6 +55,10 @@ class MiniTest::Test
   def teardown
     # trace "* teardown #{self.name}"
     Fiber.current.shutdown_all_children
+    if Fiber.current.children.size > 0
+      puts "Children left after #{self.name}: #{Fiber.current.children.inspect}"
+      exit!
+    end
     Fiber.current.instance_variable_set(:@auto_watcher, nil)
   rescue => e
     puts e

data/test/stress.rb

@@ -1,13 +1,17 @@
 # frozen_string_literal: true
 
 count = ARGV[0] ? ARGV[0].to_i : 100
+test_name = ARGV[1]
 
-TEST_CMD = 'ruby test/run.rb'
+$test_cmd = +'ruby test/run.rb'
+if test_name
+  $test_cmd << " --name #{test_name}"
+end
 
 def run_test(count)
   puts "#{count}: running tests..."
   # sleep 1
-  system(TEST_CMD)
+  system($test_cmd)
   puts
 
   return if $?.exitstatus == 0

data/test/test_backend.rb

@@ -26,7 +26,7 @@ class BackendTest < MiniTest::Test
       @backend.sleep 0.01
       count += 1
     }.await
-    assert_in_range 0.02..0.04, Time.now - t0
+    assert_in_range 0.02..0.06, Time.now - t0 if IS_LINUX
     assert_equal 3, count
   end
 
@@ -243,6 +243,8 @@ class BackendTest < MiniTest::Test
   end
 
   def test_timer_loop
+    skip unless IS_LINUX
+
     i = 0
     f = spin do
       @backend.timer_loop(0.01) { i += 1 }
@@ -257,6 +259,8 @@ class BackendTest < MiniTest::Test
   end
 
   def test_timeout
+    skip unless IS_LINUX
+
     buffer = []
     assert_raises(Polyphony::TimeoutException) do
       @backend.timeout(0.01, Polyphony::TimeoutException) do
@@ -288,6 +292,8 @@ class BackendTest < MiniTest::Test
   end
 
   def test_nested_timeout
+    skip unless IS_LINUX
+
     buffer = []
     assert_raises(MyTimeoutException) do
       @backend.timeout(0.01, MyTimeoutException) do
@@ -347,8 +353,8 @@ class BackendTest < MiniTest::Test
 
 
   def test_splice_chunks
-    body = 'abcd' * 250
-    chunk_size = 750
+    body = 'abcd' * 4
+    chunk_size = 12
 
     buf = +''
     r, w = IO.pipe
@@ -373,7 +379,7 @@ class BackendTest < MiniTest::Test
     w.close
     reader.await
 
-    expected = "Content-Type: foo\r\n\r\n#{750.to_s(16)}\r\n#{body[0..749]}\r\n#{250.to_s(16)}\r\n#{body[750..999]}\r\n0\r\n\r\n"
+    expected = "Content-Type: foo\r\n\r\n#{12.to_s(16)}\r\n#{body[0..11]}\r\n#{4.to_s(16)}\r\n#{body[12..15]}\r\n0\r\n\r\n"
     assert_equal expected, buf
   ensure
     o.close
@@ -394,6 +400,9 @@ class BackendTest < MiniTest::Test
     assert_equal count, GC.count
     sleep 0.05
     assert_equal count, GC.count
+
+    return unless IS_LINUX
+
     # The idle tasks are ran at most once per fiber switch, before the backend
     # is polled. Therefore, the second sleep will not have triggered a GC, since
     # only 0.05s have passed since the gc period was set.

data/test/test_fiber.rb

@@ -46,7 +46,7 @@ class FiberTest < MiniTest::Test
   def test_await_dead_children
     f1 = spin { :foo }
     f2 = spin { :bar }
-    2.times { snooze }
+    4.times { snooze }
     
     assert_equal [:foo, :bar], Fiber.await(f1, f2)
   end
@@ -67,10 +67,12 @@ class FiberTest < MiniTest::Test
     }
     Fiber.await(f2, f3)
     assert_equal [:foo, :bar, :baz], buffer
-    assert_equal 0, Fiber.current.children.size
+    assert_equal [f1], Fiber.current.children
+    Fiber.current.reap_dead_children
+    assert_equal [], Fiber.current.children
   end
 
-  def test_await_from_multiple_fibers_with_interruption=
+  def test_await_from_multiple_fibers_with_interruption
     buffer = []
     f1 = spin {
       sleep 0.02
@@ -91,6 +93,8 @@ 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
 
@@ -563,10 +567,10 @@ class FiberTest < MiniTest::Test
     end
 
     snooze
-    child.monitor
+    child.monitor(Fiber.current)
     spin { child << :foo }
 
-    msg = receive
+    msg = Fiber.current.monitor_mailbox.shift
     assert_equal [child, :foo], msg
   end
 
@@ -578,14 +582,14 @@ class FiberTest < MiniTest::Test
     end
 
     snooze
-    child.monitor
+    child.monitor(Fiber.current)
     spin { child << :foo }
     snooze
 
-    child.unmonitor
+    child.unmonitor(Fiber.current)
 
-    Fiber.current << :bar
-    msg = receive
+    Fiber.current.monitor_mailbox << :bar
+    msg = Fiber.current.monitor_mailbox.shift
     assert_equal :bar, msg
   end
 
@@ -598,6 +602,7 @@ class FiberTest < MiniTest::Test
 
     f.stop
     snooze
+    Fiber.current.reap_dead_children
     assert_equal [], Fiber.current.children
   end
 
@@ -786,7 +791,7 @@ class FiberTest < MiniTest::Test
     ], buf
   end
 
-  def test_attach
+  def test_attach_to
     buf = []
     child = nil
     parent = spin(:parent) do
@@ -804,7 +809,7 @@ class FiberTest < MiniTest::Test
 
     snooze
     assert_equal parent, child.parent
-    child.attach(new_parent)
+    child.attach_to(new_parent)
     assert_equal new_parent, child.parent
     parent.await
     
@@ -1218,4 +1223,23 @@ class GracefulTerminationTest < MiniTest::Test
 
     assert_equal [1, 2], buffer
   end
+end
+
+class DebugTest < MiniTest::Test
+  def test_parking
+    buf = []
+    f = spin do
+      3.times { |i| snooze; buf << i }
+    end
+    assert_nil f.__parked__?
+    f.__park__
+    assert_equal true, f.__parked__?
+    10.times { snooze }
+    assert_equal [], buf
+    
+    f.__unpark__
+    assert_nil f.__parked__?
+    10.times { snooze }
+    assert_equal [0, 1, 2], buf
+  end
 end

data/test/test_global_api.rb

@@ -137,7 +137,7 @@ class MoveOnAfterTest < MiniTest::Test
     t1 = Time.now
 
     assert_nil v
-    assert_in_range 0.014..0.02, t1 - t0
+    assert_in_range 0.014..0.02, t1 - t0 if IS_LINUX
   end
 
   def test_move_on_after_without_block
@@ -152,6 +152,8 @@ class MoveOnAfterTest < MiniTest::Test
   end
 
   def test_nested_move_on_after
+    skip unless IS_LINUX
+
     t0 = Time.now
     o = move_on_after(0.01, with_value: 1) do
       move_on_after(0.02, with_value: 2) do
@@ -210,7 +212,7 @@ class CancelAfterTest < MiniTest::Test
       sleep 0.007
     end
     t1 = Time.now
-    assert_in_range 0.014..0.024, t1 - t0
+    assert_in_range 0.014..0.024, t1 - t0 if IS_LINUX
   end
 
   class CustomException < Exception
@@ -373,6 +375,7 @@ 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
@@ -399,7 +402,7 @@ class ThrottledLoopTest < MiniTest::Test
     end
     f.await
     t1 = Time.now
-    assert_in_range 0.075..0.15, t1 - t0
+    assert_in_range 0.075..0.15, t1 - t0 if IS_LINUX
     assert_equal [1, 2, 3, 4, 5], buffer    
   end
 end
@@ -415,6 +418,8 @@ class GlobalAPIEtcTest < MiniTest::Test
   end
 
   def test_every
+    skip unless IS_LINUX
+
     buffer = []
     t0 = Time.now
     f = spin do
@@ -429,7 +434,7 @@ class GlobalAPIEtcTest < MiniTest::Test
     t0 = Time.now
     sleep 0.1
     elapsed = Time.now - t0
-    assert (0.05..0.15).include? elapsed
+    assert (0.05..0.15).include? elapsed if IS_LINUX
 
     f = spin { sleep }
     snooze

data/test/test_io.rb

@@ -351,6 +351,8 @@ class IOClassMethodsTest < MiniTest::Test
   end
 
   def test_popen
+    skip unless IS_LINUX
+
     counter = 0
     timer = spin { throttled_loop(200) { counter += 1 } }
 

data/test/test_socket.rb

@@ -158,19 +158,22 @@ class SocketTest < MiniTest::Test
   end
 end
 
-class HTTPClientTest < MiniTest::Test
-  require 'json'
+if IS_LINUX
+  class HTTPClientTest < MiniTest::Test
 
-  def test_http
-    res = HTTParty.get('http://ipinfo.io/')
+    require 'json'
 
-    response = JSON.load(res.body)
-    assert_equal 'https://ipinfo.io/missingauth', response['readme']
-  end
+    def test_http
+      res = HTTParty.get('http://ipinfo.io/')
+
+      response = JSON.load(res.body)
+      assert_equal 'https://ipinfo.io/missingauth', response['readme']
+    end
 
-  def test_https
-    res = HTTParty.get('https://ipinfo.io/')
-    response = JSON.load(res.body)
-    assert_equal 'https://ipinfo.io/missingauth', response['readme']
+    def test_https
+      res = HTTParty.get('https://ipinfo.io/')
+      response = JSON.load(res.body)
+      assert_equal 'https://ipinfo.io/missingauth', response['readme']
+    end
   end
 end