polyphony 0.40 → 0.41

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.40'
+  VERSION = '0.41'
 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,7 +26,7 @@ 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  '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'

data/test/helper.rb

@@ -18,6 +18,10 @@ Minitest::Reporters.use! [
   Minitest::Reporters::SpecReporter.new
 ]
 
+class ::Fiber
+  attr_writer :auto_watcher
+end
+
 class MiniTest::Test
   def setup
     # puts "* setup #{self.name}"
@@ -26,13 +30,20 @@ class MiniTest::Test
       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}"
+    # 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
 

data/test/test_agent.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+
+class AgentTest < MiniTest::Test
+  def setup
+    super
+    @agent = Polyphony::LibevAgent.new
+  end
+
+  def teardown
+    @agent.finalize
+  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
+      Thread.current.agent.post_fork
+      exit(42)
+    end
+    
+    result = Thread.current.agent.waitpid(pid)
+    assert_equal [pid, 42], result
+  end
+end

data/test/{test_async.rb → test_event.rb}

@@ -2,26 +2,29 @@
 
 require_relative 'helper'
 
-class AsyncTest < MiniTest::Test
-  def test_that_async_watcher_receives_signal_across_threads
+class EventTest < MiniTest::Test
+  def test_that_event_receives_signal_across_threads
     count = 0
-    a = Gyro::Async.new
+    a = Polyphony::Event.new
     spin {
       a.await
       count += 1
     }
     snooze
-    Thread.new do
+    t = Thread.new do
       orig_sleep 0.001
       a.signal
     end
     suspend
     assert_equal 1, count
+  ensure
+    t&.kill
+    t&.join
   end
 
-  def test_that_async_watcher_coalesces_signals
+  def test_that_event_coalesces_signals
     count = 0
-    a = Gyro::Async.new
+    a = Polyphony::Event.new
    
     coproc = spin {
       loop {
@@ -31,12 +34,15 @@ class AsyncTest < MiniTest::Test
       }
     }
     snooze
-    Thread.new do
+    t = Thread.new do
       orig_sleep 0.001
       3.times { a.signal }
     end
 
     coproc.await
     assert_equal 1, count
+  ensure
+    t&.kill
+    t&.join
   end
 end

data/test/test_ext.rb

@@ -74,7 +74,7 @@ class KernelTest < MiniTest::Test
     $stderr.rewind
     $stderr = prev_stderr
     
-    assert_nil data
+    assert_equal '', data
     assert_equal "error\n", err_io.read
   ensure
     $stderr = prev_stderr
@@ -93,6 +93,28 @@ class KernelTest < MiniTest::Test
     $stdin = prev_stdin
   end
 
+  def test_multiline_gets
+    prev_stdin = $stdin
+    i, o = IO.pipe
+    $stdin = i
+
+    spin do
+      o << "hello\n"
+      o << "world\n"
+      o << "nice\n"
+      o << "to\n"
+      o << "meet\n"
+      o << "you\n"
+    end
+
+    s = +''
+    6.times { s << gets }
+
+    assert_equal "hello\nworld\nnice\nto\nmeet\nyou\n", s
+  ensure
+    $stdin = prev_stdin
+  end
+
   def test_gets_from_argv
     prev_stdin = $stdin
 
@@ -103,8 +125,7 @@ class KernelTest < MiniTest::Test
     count = contents.size
 
     buffer = []
-
-    (count * 2).times { buffer << gets }
+    (count * 2).times { |i| s = gets; buffer << s }
     assert_equal contents * 2, buffer
 
     i, o = IO.pipe
@@ -172,4 +193,4 @@ class TimeoutTest < MiniTest::Test
     assert_kind_of MyTimeout, e
     assert_equal 'foo', e.message
   end
-end
+end