polyphony 0.51.0 → 0.54.0

data/lib/polyphony/extensions/core.rb

@@ -55,7 +55,7 @@ module ::Process
   class << self
     alias_method :orig_detach, :detach
     def detach(pid)
-      fiber = spin { Thread.current.backend.waitpid(pid) }
+      fiber = spin { Polyphony.backend_waitpid(pid) }
       fiber.define_singleton_method(:pid) { pid }
       fiber
     end

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,34 +217,21 @@ class ::IO
   end
 
   def read_loop(&block)
-    Thread.current.backend.read_loop(self, &block)
+    Polyphony.backend_read_loop(self, &block)
   end
 
-  def feed_loop(receiver, method, &block)
-    Thread.current.backend.feed_loop(self, receiver, method, &block)
+  def feed_loop(receiver, method = :call, &block)
+    Polyphony.backend_feed_loop(self, receiver, method, &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 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
@@ -252,12 +239,20 @@ 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
+
+  def splice(src, maxlen)
+    Polyphony.backend_splice(src, self, maxlen)
+  end
+
+  def splice_to_eof(src, chunksize = 8192)
+    Polyphony.backend_splice_to_eof(src, self, chunksize)
+  end
 end

data/lib/polyphony/extensions/openssl.rb

@@ -3,7 +3,7 @@
 require 'openssl'
 require_relative './socket'
 
-# Open ssl socket helper methods (to make it compatible with Socket API)
+# OpenSSL socket helper methods (to make it compatible with Socket API) and overrides
 class ::OpenSSL::SSL::SSLSocket
   alias_method :orig_initialize, :initialize
   def initialize(socket, context = nil)
@@ -23,22 +23,12 @@ class ::OpenSSL::SSL::SSLSocket
     io.reuse_addr
   end
 
-  alias_method :orig_accept, :accept
-  def accept
-    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)
-      else
-        return result
-      end
-    end
-  end
-
-  def accept_loop
-    while true
-      yield accept
+  def fill_rbuff
+    data = self.sysread(BLOCK_SIZE)
+    if data
+      @rbuffer << data
+    else
+      @eof = true
     end
   end
 
@@ -46,8 +36,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 +47,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
@@ -84,4 +74,21 @@ class ::OpenSSL::SSL::SSLSocket
       yield data
     end
   end
+  alias_method :recv_loop, :read_loop
+
+  alias_method :orig_peeraddr, :peeraddr
+  def peeraddr(_ = nil)
+    orig_peeraddr
+  end
+end
+
+# OpenSSL socket helper methods (to make it compatible with Socket API) and overrides
+class ::OpenSSL::SSL::SSLServer
+  def accept_loop(ignore_errors = true)
+    loop do
+      yield accept
+    rescue SystemCallError, StandardError => e
+      raise e unless ignore_errors
+    end
+  end
 end

data/lib/polyphony/extensions/socket.rb

@@ -8,31 +8,31 @@ 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, &block)
-    Thread.current.backend.recv_feed_loop(self, receiver, method, &block)
+  def feed_loop(receiver, method = :call, &block)
+    Polyphony.backend_recv_feed_loop(self, receiver, method, &block)
   end
 
   def recvfrom(maxlen, flags = 0)
@@ -41,28 +41,27 @@ class ::Socket
       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)
-  end
+  # 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
-  end
-  alias_method :<<, :write
+  # def write(*args)
+  #   Polyphony.backend_sendv(self, args, 0)
+  # end
+
+  # def <<(mesg)
+  #   Polyphony.backend_send(self, mesg, 0)
+  # end
 
   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
@@ -142,34 +141,33 @@ 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 feed_loop(receiver, method, &block)
-    Thread.current.backend.recv_feed_loop(self, receiver, method, &block)
+  def feed_loop(receiver, method = :call, &block)
+    Polyphony.backend_recv_feed_loop(self, receiver, method, &block)
   end
 
-  def send(mesg, flags = 0)
-    Thread.current.backend.send(self, mesg)
-  end
+  # 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
-  end
-  alias_method :<<, :write
+  # def write(*args)
+  #   Polyphony.backend_sendv(self, args, 0)
+  # end
+
+  # def <<(mesg)
+  #   Polyphony.backend_send(self, mesg, 0)
+  # end
 
   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
@@ -200,12 +198,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
@@ -217,44 +215,43 @@ 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 feed_loop(receiver, method, &block)
-    Thread.current.backend.recv_feed_loop(self, receiver, method, &block)
+  def feed_loop(receiver, method = :call, &block)
+    Polyphony.backend_recv_feed_loop(self, receiver, method, &block)
   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
+
+  def <<(mesg)
+    Polyphony.backend_send(self, mesg, 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/version.rb

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

data/polyphony.gemspec

@@ -22,7 +22,7 @@ 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'
@@ -37,9 +37,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency  'mysql2',               '0.5.3'
   s.add_development_dependency  'sequel',               '5.34.0'
   s.add_development_dependency  'httparty',             '0.17.1'
+  s.add_development_dependency  'localhost',            '~>1.1.4'
 
-  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"