polyphony 0.49.1 → 0.52.0

data/lib/polyphony/extensions/fiber.rb

@@ -245,8 +245,12 @@ module Polyphony
     end
 
     def shutdown_all_children(graceful = false)
-      terminate_all_children(graceful)
-      await_all_children
+      return unless @children
+
+      @children.keys.each do |c|
+        c.terminate(graceful)
+        c.await
+      end
     end
   end
 
@@ -312,6 +316,8 @@ module Polyphony
       @running = false
       inform_dependants(result, uncaught_exception)
     ensure
+      # Prevent fiber from being resumed after terminating
+      @thread.fiber_unschedule(self)
       Thread.current.switch_fiber
     end
 
@@ -319,13 +325,10 @@ module Polyphony
     # the children are shut down, it is returned along with the uncaught_exception
     # flag set. Otherwise, it returns the given arguments.
     def finalize_children(result, uncaught_exception)
-      begin
-        shutdown_all_children
-      rescue Exception => e
-        result = e
-        uncaught_exception = true
-      end
+      shutdown_all_children
       [result, uncaught_exception]
+    rescue Exception => e
+      [e, true]
     end
 
     def inform_dependants(result, uncaught_exception)

data/lib/polyphony/extensions/io.rb

@@ -101,7 +101,7 @@ class ::IO
     return @read_buffer.slice!(0) if @read_buffer && !@read_buffer.empty?
     
     @read_buffer ||= +''
-    Thread.current.backend.read(self, @read_buffer, 8192, false)
+    Polyphony.backend_read(self, @read_buffer, 8192, false)
     return @read_buffer.slice!(0) if !@read_buffer.empty?
 
     nil
@@ -110,7 +110,7 @@ class ::IO
   alias_method :orig_read, :read
   def read(len = nil)
     @read_buffer ||= +''
-    result = Thread.current.backend.read(self, @read_buffer, len, true)
+    result = Polyphony.backend_read(self, @read_buffer, len, true)
     return nil unless result
 
     already_read = @read_buffer
@@ -120,7 +120,7 @@ class ::IO
 
   alias_method :orig_readpartial, :read
   def readpartial(len, str = +'')
-    result = Thread.current.backend.read(self, str, len, false)
+    result = Polyphony.backend_read(self, str, len, false)
     raise EOFError unless result
 
     result
@@ -128,12 +128,12 @@ class ::IO
 
   alias_method :orig_write, :write
   def write(str, *args)
-    Thread.current.backend.write(self, str, *args)
+    Polyphony.backend_write(self, str, *args)
   end
 
   alias_method :orig_write_chevron, :<<
   def <<(str)
-    Thread.current.backend.write(self, str)
+    Polyphony.backend_write(self, str)
     self
   end
 
@@ -217,30 +217,21 @@ class ::IO
   end
 
   def read_loop(&block)
-    Thread.current.backend.read_loop(self, &block)
+    Polyphony.backend_read_loop(self, &block)
   end
 
-  # alias_method :orig_read, :read
-  # def read(length = nil, outbuf = nil)
-  #   if length
-  #     return outbuf ? readpartial(length) : readpartial(length, outbuf)
-  #   end
-
-  #   until eof?
-  #     outbuf ||= +''
-  #     outbuf << readpartial(8192)
-  #   end
-  #   outbuf
-  # end
+  def feed_loop(receiver, method = :call, &block)
+    Polyphony.backend_feed_loop(self, receiver, method, &block)
+  end
 
   def wait_readable(timeout = nil)
     if timeout
       move_on_after(timeout) do
-        Thread.current.backend.wait_io(self, false)
+        Polyphony.backend_wait_io(self, false)
         self
       end
     else
-      Thread.current.backend.wait_io(self, false)
+      Polyphony.backend_wait_io(self, false)
       self
     end
   end
@@ -248,11 +239,11 @@ class ::IO
   def wait_writable(timeout = nil)
     if timeout
       move_on_after(timeout) do
-        Thread.current.backend.wait_io(self, true)
+        Polyphony.backend_wait_io(self, true)
         self
       end
     else
-      Thread.current.backend.wait_io(self, true)
+      Polyphony.backend_wait_io(self, true)
       self
     end
   end

data/lib/polyphony/extensions/openssl.rb

@@ -28,8 +28,8 @@ class ::OpenSSL::SSL::SSLSocket
     while true
       result = accept_nonblock(exception: false)
       case result
-      when :wait_readable then Thread.current.backend.wait_io(io, false)
-      when :wait_writable then Thread.current.backend.wait_io(io, true)
+      when :wait_readable then Polyphony.backend_wait_io(io, false)
+      when :wait_writable then Polyphony.backend_wait_io(io, true)
       else
         return result
       end
@@ -46,8 +46,8 @@ class ::OpenSSL::SSL::SSLSocket
   def sysread(maxlen, buf = +'')
     while true
       case (result = read_nonblock(maxlen, buf, exception: false))
-      when :wait_readable then Thread.current.backend.wait_io(io, false)
-      when :wait_writable then Thread.current.backend.wait_io(io, true)
+      when :wait_readable then Polyphony.backend_wait_io(io, false)
+      when :wait_writable then Polyphony.backend_wait_io(io, true)
       else return result
       end
     end
@@ -57,8 +57,8 @@ class ::OpenSSL::SSL::SSLSocket
   def syswrite(buf)
     while true
       case (result = write_nonblock(buf, exception: false))
-      when :wait_readable then Thread.current.backend.wait_io(io, false)
-      when :wait_writable then Thread.current.backend.wait_io(io, true)
+      when :wait_readable then Polyphony.backend_wait_io(io, false)
+      when :wait_writable then Polyphony.backend_wait_io(io, true)
       else
         return result
       end

data/lib/polyphony/extensions/socket.rb

@@ -8,57 +8,57 @@ require_relative '../core/thread_pool'
 # Socket overrides (eventually rewritten in C)
 class ::Socket
   def accept
-    Thread.current.backend.accept(self, TCPSocket)
+    Polyphony.backend_accept(self, TCPSocket)
   end
 
   def accept_loop(&block)
-    Thread.current.backend.accept_loop(self, TCPSocket, &block)
+    Polyphony.backend_accept_loop(self, TCPSocket, &block)
   end
 
   NO_EXCEPTION = { exception: false }.freeze
 
   def connect(addr)
     addr = Addrinfo.new(addr) if addr.is_a?(String)
-    Thread.current.backend.connect(self, addr.ip_address, addr.ip_port)
+    Polyphony.backend_connect(self, addr.ip_address, addr.ip_port)
   end
 
   def recv(maxlen, flags = 0, outbuf = nil)
-    Thread.current.backend.recv(self, outbuf || +'', maxlen)
+    Polyphony.backend_recv(self, outbuf || +'', maxlen)
   end
 
   def recv_loop(&block)
-    Thread.current.backend.recv_loop(self, &block)
+    Polyphony.backend_recv_loop(self, &block)
   end
   alias_method :read_loop, :recv_loop
 
+  def feed_loop(receiver, method = :call, &block)
+    Polyphony.backend_recv_feed_loop(self, receiver, method, &block)
+  end
+
   def recvfrom(maxlen, flags = 0)
     @read_buffer ||= +''
     while true
       result = recvfrom_nonblock(maxlen, flags, @read_buffer, **NO_EXCEPTION)
       case result
       when nil then raise IOError
-      when :wait_readable then Thread.current.backend.wait_io(self, false)
+      when :wait_readable then Polyphony.backend_wait_io(self, false)
       else
         return result
       end
     end
   end
 
-  def send(mesg, flags = 0)
-    Thread.current.backend.send(self, mesg)
+  def send(mesg, flags)
+    Polyphony.backend_send(self, mesg, flags)
   end
 
-  def write(str, *args)
-    if args.empty?
-      Thread.current.backend.send(self, str)
-    else
-      Thread.current.backend.send(self, str + args.join)
-    end
+  def write(*args)
+    Polyphony.backend_sendv(self, args, 0)
   end
   alias_method :<<, :write
 
   def readpartial(maxlen, str = +'')
-    Thread.current.backend.recv(self, str, maxlen)
+    Polyphony.backend_recv(self, str, maxlen)
   end
 
   ZERO_LINGER = [0, 0].pack('ii').freeze
@@ -138,30 +138,30 @@ class ::TCPSocket
   end
 
   def recv(maxlen, flags = 0, outbuf = nil)
-    Thread.current.backend.recv(self, outbuf || +'', maxlen)
+    Polyphony.backend_recv(self, outbuf || +'', maxlen)
   end
 
   def recv_loop(&block)
-    Thread.current.backend.recv_loop(self, &block)
+    Polyphony.backend_recv_loop(self, &block)
   end
   alias_method :read_loop, :recv_loop
 
-  def send(mesg, flags = 0)
-    Thread.current.backend.send(self, mesg)
+  def feed_loop(receiver, method = :call, &block)
+    Polyphony.backend_recv_feed_loop(self, receiver, method, &block)
   end
 
-  def write(str, *args)
-    if args.empty?
-      Thread.current.backend.send(self, str)
-    else
-      Thread.current.backend.send(self, str + args.join)
-    end
+  def send(mesg, flags)
+    Polyphony.backend_send(self, mesg, flags)
+  end
+
+  def write(*args)
+    Polyphony.backend_sendv(self, args, 0)
   end
   alias_method :<<, :write
 
   def readpartial(maxlen, str = nil)
     @read_buffer ||= +''
-    result = Thread.current.backend.recv(self, @read_buffer, maxlen)
+    result = Polyphony.backend_recv(self, @read_buffer, maxlen)
     raise EOFError unless result
 
     if str
@@ -192,12 +192,12 @@ class ::TCPServer
 
   alias_method :orig_accept, :accept
   def accept
-    Thread.current.backend.accept(@io, TCPSocket)
+    Polyphony.backend_accept(@io, TCPSocket)
     # @io.accept
   end
 
   def accept_loop(&block)
-    Thread.current.backend.accept_loop(@io, TCPSocket, &block)
+    Polyphony.backend_accept_loop(@io, TCPSocket, &block)
   end
 
   alias_method :orig_close, :close
@@ -209,40 +209,40 @@ end
 class ::UNIXServer
   alias_method :orig_accept, :accept
  def accept
-    Thread.current.backend.accept(self, UNIXSocket)
+    Polyphony.backend_accept(self, UNIXSocket)
   end
 
   def accept_loop(&block)
-    Thread.current.backend.accept_loop(self, UNIXSocket, &block)
+    Polyphony.backend_accept_loop(self, UNIXSocket, &block)
   end
 end
 
 class ::UNIXSocket
   def recv(maxlen, flags = 0, outbuf = nil)
-    Thread.current.backend.recv(self, outbuf || +'', maxlen)
+    Polyphony.backend_recv(self, outbuf || +'', maxlen)
   end
 
   def recv_loop(&block)
-    Thread.current.backend.recv_loop(self, &block)
+    Polyphony.backend_recv_loop(self, &block)
   end
   alias_method :read_loop, :recv_loop
 
-  def send(mesg, flags = 0)
-    Thread.current.backend.send(self, mesg)
+  def feed_loop(receiver, method = :call, &block)
+    Polyphony.backend_recv_feed_loop(self, receiver, method, &block)
   end
 
-  def write(str, *args)
-    if args.empty?
-      Thread.current.backend.send(self, str)
-    else
-      Thread.current.backend.send(self, str + args.join)
-    end
+  def send(mesg, flags)
+    Polyphony.backend_send(self, mesg, flags)
+  end
+
+  def write(*args)
+    Polyphony.backend_sendv(self, args, 0)
   end
   alias_method :<<, :write
 
   def readpartial(maxlen, str = nil)
     @read_buffer ||= +''
-    result = Thread.current.backend.recv(self, @read_buffer, maxlen)
+    result = Polyphony.backend_recv(self, @read_buffer, maxlen)
     raise EOFError unless result
 
     if str

data/lib/polyphony/extensions/thread.rb

@@ -41,8 +41,7 @@ class ::Thread
 
   def finalize(result)
     unless Fiber.current.children.empty?
-      Fiber.current.terminate_all_children
-      Fiber.current.await_all_children
+      Fiber.current.shutdown_all_children
     end
     @finalization_mutex.synchronize do
       @terminated = true

data/lib/polyphony/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Polyphony
-  VERSION = '0.49.1'
+  VERSION = '0.52.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,13 +52,12 @@ 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
     # trace "* teardown #{self.name}"
-    Fiber.current.terminate_all_children
-    Fiber.current.await_all_children
+    Fiber.current.shutdown_all_children
     Fiber.current.instance_variable_set(:@auto_watcher, nil)
   rescue => e
     puts e

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

@@ -100,12 +100,40 @@ class BackendTest < MiniTest::Test
     assert_equal [:ready, 'foo', 'bar', :done], buf
   end
 
-  def test_accept_loop
-    server = TCPServer.new('127.0.0.1', 1234)
+  def test_read_loop_terminate
+    i, o = IO.pipe
+
+    buf = []
+    parent = spin do
+      f = spin do
+        buf << :ready
+        @backend.read_loop(i) { |d| buf << d }
+        buf << :done
+      end
+      suspend
+    end
+
+    # writing always causes snoozing
+    o << 'foo'
+    sleep 0.01
+    o << 'bar'
+    sleep 0.01
+
+    parent.stop
+
+    parent.await
+    assert_equal [:ready, 'foo', 'bar'], buf
+  end
+
+  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)
@@ -121,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