polyphony 0.38 → 0.43

data/lib/polyphony/extensions/openssl.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'openssl'
-
 require_relative './socket'
 
 # Open ssl socket helper methods (to make it compatible with Socket API)
@@ -18,14 +17,36 @@ class ::OpenSSL::SSL::SSLSocket
     io.reuse_addr
   end
 
-  def sysread(maxlen, buf)
-    read_watcher = nil
-    write_watcher = nil
+  alias_method :orig_accept, :accept
+  def accept
+    loop do
+      result = accept_nonblock(exception: false)
+      case result
+      when :wait_readable then Thread.current.agent.wait_io(io, false)
+      when :wait_writable then Thread.current.agent.wait_io(io, true)
+      else
+        return result
+      end
+    end
+  end
+
+  alias_method :orig_sysread, :sysread
+  def sysread(maxlen, buf = +'')
     loop do
       case (result = read_nonblock(maxlen, buf, exception: false))
-      when :wait_readable then (read_watcher ||= io.read_watcher).await
-      when :wait_writable then (write_watcher ||= io.write_watcher).await
-      else result
+      when :wait_readable then Thread.current.agent.wait_io(io, false)
+      else return result
+      end
+    end
+  end
+
+  alias_method :orig_syswrite, :syswrite
+  def syswrite(buf)
+    loop do
+      case (result = write_nonblock(buf, exception: false))
+      when :wait_writable then Thread.current.agent.wait_io(io, true)
+      else
+        return result
       end
     end
   end
@@ -39,15 +60,14 @@ class ::OpenSSL::SSL::SSLSocket
     # @sync = osync
   end
 
-  def syswrite(buf)
-    read_watcher = nil
-    write_watcher = nil
-    loop do
-      case (result = write_nonblock(buf, exception: false))
-      when :wait_readable then (read_watcher ||= io.read_watcher).await
-      when :wait_writable then (write_watcher ||= io.write_watcher).await
-      else result
-      end
+  def readpartial(maxlen, buf = +'')
+    result = sysread(maxlen, buf)
+    result || (raise EOFError)
+  end
+
+  def read_loop
+    while (data = sysread(8192))
+      yield data
     end
   end
 end

data/lib/polyphony/extensions/socket.rb

@@ -7,14 +7,21 @@ require_relative '../core/thread_pool'
 
 # Socket overrides (eventually rewritten in C)
 class ::Socket
+  def accept
+    Thread.current.agent.accept(self)
+  end
+
   NO_EXCEPTION = { exception: false }.freeze
 
   def connect(remotesockaddr)
     loop do
       result = connect_nonblock(remotesockaddr, **NO_EXCEPTION)
-      return if result == 0
-
-      result == :wait_writable ? write_watcher.await : (raise IOError)
+      case result
+      when 0 then return
+      when :wait_writable then Thread.current.agent.wait_io(self, true)
+      else
+        raise IOError
+      end
     end
   end
 
@@ -22,9 +29,12 @@ class ::Socket
     outbuf ||= +''
     loop do
       result = recv_nonblock(maxlen, flags, outbuf, **NO_EXCEPTION)
-      raise IOError unless result
-
-      result == :wait_readable ? read_watcher.await : (return result)
+      case result
+      when nil then raise IOError
+      when :wait_readable then Thread.current.agent.wait_io(self, false)
+      else
+        return result
+      end
     end
   end
 
@@ -32,9 +42,12 @@ class ::Socket
     @read_buffer ||= +''
     loop do
       result = recvfrom_nonblock(maxlen, flags, @read_buffer, **NO_EXCEPTION)
-      raise IOError unless result
-
-      result == :wait_readable ? read_watcher.await : (return result)
+      case result
+      when nil then raise IOError
+      when :wait_readable then Thread.current.agent.wait_io(self, false)
+      else
+        return result
+      end
     end
   end
 
@@ -117,4 +130,9 @@ class ::TCPServer
   def accept
     @io ? @io.accept : orig_accept
   end
+
+  alias_method :orig_close, :close
+  def close
+    @io ? @io.close : orig_close
+  end
 end

data/lib/polyphony/extensions/thread.rb

@@ -8,26 +8,30 @@ class ::Thread
 
   alias_method :orig_initialize, :initialize
   def initialize(*args, &block)
-    @join_wait_queue = Gyro::Queue.new
+    @join_wait_queue = []
+    @finalization_mutex = Mutex.new
     @args = args
     @block = block
-    @finalization_mutex = Mutex.new
     orig_initialize { execute }
   end
 
   def execute
+    # agent must be created in the context of the new thread, therefore it
+    # cannot be created in Thread#initialize
+    @agent = Polyphony::LibevAgent.new
     setup
     @ready = true
     result = @block.(*@args)
   rescue Polyphony::MoveOn, Polyphony::Terminate => e
     result = e.value
-  rescue Exception => e
-    result = e
+  rescue Exception => result
   ensure
     @ready = true
     finalize(result)
   end
 
+  attr_accessor :agent
+
   def setup
     @main_fiber = Fiber.current
     @main_fiber.setup_main_fiber
@@ -44,24 +48,25 @@ class ::Thread
       @result = result
       signal_waiters(result)
     end
-    stop_event_selector
+    @agent.finalize
   end
 
   def signal_waiters(result)
-    @join_wait_queue.shift_each { |w| w.signal(result) }
+    @join_wait_queue.each { |w| w.signal(result) }
   end
 
   alias_method :orig_join, :join
   def join(timeout = nil)
-    async = Fiber.current.auto_async
+    watcher = Fiber.current.auto_watcher
+
     @finalization_mutex.synchronize do
       if @terminated
         @result.is_a?(Exception) ? (raise @result) : (return @result)
       else
-        @join_wait_queue.push(async)
+        @join_wait_queue << watcher
       end
     end
-    timeout ? move_on_after(timeout) { async.await } : async.await
+    timeout ? move_on_after(timeout) { watcher.await } : watcher.await
   end
   alias_method :await, :join
 
@@ -78,6 +83,8 @@ class ::Thread
 
   alias_method :orig_kill, :kill
   def kill
+    return if @terminated
+
     raise Polyphony::Terminate
   end
 

data/lib/polyphony/net.rb

@@ -4,6 +4,7 @@ require_relative './extensions/socket'
 require_relative './extensions/openssl'
 
 module Polyphony
+  # A more elegant networking API
   module Net
     class << self
       def tcp_connect(host, port, opts = {})
@@ -17,11 +18,11 @@ module Polyphony
           socket
         end
       end
-      
+
       def tcp_listen(host = nil, port = nil, opts = {})
         host ||= '0.0.0.0'
         raise 'Port number not specified' unless port
-      
+
         socket = socket_from_options(host, port, opts)
         if opts[:secure_context] || opts[:secure]
           secure_server(socket, opts[:secure_context], opts)
@@ -29,7 +30,7 @@ module Polyphony
           socket
         end
       end
-      
+
       def socket_from_options(host, port, opts)
         ::Socket.new(:INET, :STREAM).tap do |s|
           s.reuse_addr if opts[:reuse_addr]
@@ -39,19 +40,19 @@ module Polyphony
           s.listen(0)
         end
       end
-      
+
       def secure_socket(socket, context, opts)
         context ||= OpenSSL::SSL::SSLContext.new
         setup_alpn(context, opts[:alpn_protocols]) if opts[:alpn_protocols]
         socket = secure_socket_wrapper(socket, context)
-      
+
         socket.tap do |s|
           s.hostname = opts[:host] if opts[:host]
           s.connect
           s.post_connection_check(opts[:host]) if opts[:host]
         end
       end
-      
+
       def secure_socket_wrapper(socket, context)
         if context
           OpenSSL::SSL::SSLSocket.new(socket, context)
@@ -59,12 +60,12 @@ module Polyphony
           OpenSSL::SSL::SSLSocket.new(socket)
         end
       end
-      
+
       def secure_server(socket, context, opts)
         setup_alpn(context, opts[:alpn_protocols]) if opts[:alpn_protocols]
         OpenSSL::SSL::SSLServer.new(socket, context)
       end
-      
+
       def setup_alpn(context, protocols)
         context.alpn_protocols = protocols
         context.alpn_select_cb = lambda do |peer_protocols|
@@ -74,4 +75,3 @@ module Polyphony
     end
   end
 end
-

data/lib/polyphony/version.rb

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

data/polyphony.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   }
   s.rdoc_options = ["--title", "polyphony", "--main", "README.md"]
   s.extra_rdoc_files = ["README.md"]
-  s.extensions = ["ext/gyro/extconf.rb"]
+  s.extensions = ["ext/polyphony/extconf.rb"]
   s.require_paths = ["lib"]
   s.required_ruby_version = '>= 2.6'
 
@@ -26,8 +26,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency  'minitest',             '5.13.0'
   s.add_development_dependency  'minitest-reporters',   '1.4.2'
   s.add_development_dependency  'simplecov',            '0.17.1'
-  s.add_development_dependency  'rubocop',              '0.80.0'
-  s.add_development_dependency  'pg',                   '1.1.3'
+  s.add_development_dependency  'rubocop',              '0.85.1'
+  s.add_development_dependency  'pg',                   '1.1.4'
   s.add_development_dependency  'rake-compiler',        '1.0.5'
   s.add_development_dependency  'redis',                '4.1.0'
   s.add_development_dependency  'hiredis',              '0.6.3'
@@ -36,5 +36,5 @@ Gem::Specification.new do |s|
   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.2.7'
+  s.add_development_dependency  'just-the-docs',        '~>0.3.0'
 end

data/test/helper.rb

@@ -18,19 +18,32 @@ Minitest::Reporters.use! [
   Minitest::Reporters::SpecReporter.new
 ]
 
+class ::Fiber
+  attr_writer :auto_watcher
+end
+
 class MiniTest::Test
   def setup
+    # puts "* 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.agent = Polyphony::LibevAgent.new
     sleep 0
   end
 
   def teardown
+    # puts "* teardown #{self.name.inspect} Fiber.current: #{Fiber.current.inspect}"
     Fiber.current.terminate_all_children
     Fiber.current.await_all_children
+    Fiber.current.auto_watcher = nil
+  rescue => e
+    puts e
+    puts e.backtrace.join("\n")
+    exit!
   end
 end
 
@@ -40,4 +53,4 @@ module Kernel
   rescue Exception => e
     e
   end
-end
+end

data/test/test_agent.rb

@@ -0,0 +1,124 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+
+class AgentTest < MiniTest::Test
+  def setup
+    super
+    @prev_agent = Thread.current.agent
+    @agent = Polyphony::LibevAgent.new
+    Thread.current.agent = @agent
+  end
+
+  def teardown
+    @agent.finalize
+    Thread.current.agent = @prev_agent
+  end
+
+  def test_sleep
+    count = 0
+    t0 = Time.now
+    spin {
+      @agent.sleep 0.01
+      count += 1
+    }
+    suspend
+    assert Time.now - t0 >= 0.01
+    assert_equal 1, count
+  end
+
+  def test_write_read_partial
+    i, o = IO.pipe
+    buf = +''
+    f = spin { @agent.read(i, buf, 5, false) }
+    @agent.write(o, 'Hello world')
+    return_value = f.await
+    
+    assert_equal 'Hello', buf
+    assert_equal return_value, buf
+  end
+
+  def test_write_read_to_eof_limited_buffer
+    i, o = IO.pipe
+    buf = +''
+    f = spin { @agent.read(i, buf, 5, true) }
+    @agent.write(o, 'Hello')
+    snooze
+    @agent.write(o, ' world')
+    snooze
+    o.close
+    return_value = f.await
+    
+    assert_equal 'Hello', buf
+    assert_equal return_value, buf
+  end
+
+  def test_write_read_to_eof
+    i, o = IO.pipe
+    buf = +''
+    f = spin { @agent.read(i, buf, 10**6, true) }
+    @agent.write(o, 'Hello')
+    snooze
+    @agent.write(o, ' world')
+    snooze
+    o.close
+    return_value = f.await
+    
+    assert_equal 'Hello world', buf
+    assert_equal return_value, buf
+  end
+
+  def test_waitpid
+    pid = fork do
+      @agent.post_fork
+      exit(42)
+    end
+    
+    result = @agent.waitpid(pid)
+    assert_equal [pid, 42], result
+  end
+
+  def test_read_loop
+    i, o = IO.pipe
+
+    buf = []
+    spin do
+      buf << :ready
+      @agent.read_loop(i) { |d| buf << d }
+      buf << :done
+    end
+
+    o << 'foo'
+    o << 'bar'
+    o.close
+    snooze
+
+    assert_equal [:ready, 'foo', 'bar', :done], buf
+  end
+
+  def test_accept_loop
+    server = TCPServer.new('127.0.0.1', 1234)
+
+    clients = []
+    server_fiber = spin do
+      @agent.accept_loop(server) { |c| clients << c }
+    end
+
+    c1 = TCPSocket.new('127.0.0.1', 1234)
+    snooze
+
+    assert_equal 1, clients.size
+
+    c2 = TCPSocket.new('127.0.0.1', 1234)
+    snooze
+
+    assert_equal 2, clients.size
+
+  ensure
+    c1&.close
+    c2&.close
+    server_fiber.stop
+    snooze
+    server&.close
+  end
+end