polyphony 0.43.9 → 0.45.1

data/lib/polyphony/extensions/fiber.rb

@@ -67,6 +67,10 @@ module Polyphony
       else RuntimeError.new
       end
     end
+
+    def interject(&block)
+      raise Polyphony::Interjection.new(block)
+    end
   end
 
   # Fiber supervision
@@ -224,7 +228,7 @@ module Polyphony
       @results = @children.dup
       @on_child_done = proc do |c, r|
         @results[c] = r
-        self.schedule if @children.empty?
+        schedule if @children.empty?
       end
       suspend
       @on_child_done = nil

data/lib/polyphony/extensions/io.rb

@@ -99,7 +99,7 @@ class ::IO
   alias_method :orig_read, :read
   def read(len = nil)
     @read_buffer ||= +''
-    result = Thread.current.agent.read(self, @read_buffer, len, true)
+    result = Thread.current.backend.read(self, @read_buffer, len, true)
     return nil unless result
 
     already_read = @read_buffer
@@ -110,7 +110,7 @@ class ::IO
   alias_method :orig_readpartial, :read
   def readpartial(len, str = nil)
     @read_buffer ||= +''
-    result = Thread.current.agent.read(self, @read_buffer, len, false)
+    result = Thread.current.backend.read(self, @read_buffer, len, false)
     raise EOFError unless result
 
     if str
@@ -124,12 +124,12 @@ class ::IO
 
   alias_method :orig_write, :write
   def write(str, *args)
-    Thread.current.agent.write(self, str, *args)
+    Thread.current.backend.write(self, str, *args)
   end
 
   alias_method :orig_write_chevron, :<<
   def <<(str)
-    Thread.current.agent.write(self, str)
+    Thread.current.backend.write(self, str)
     self
   end
 
@@ -163,20 +163,29 @@ class ::IO
   # def putc(obj)
   # end
 
+  LINEFEED = "\n"
+  LINEFEED_RE = /\n$/.freeze
+
   alias_method :orig_puts, :puts
   def puts(*args)
     if args.empty?
-      write "\n"
+      write LINEFEED
       return
     end
 
-    strs = args.inject([]) do |m, a|
-      a = a.to_s
-      m << a
-      m << "\n" unless a =~ /\n$/
-      m
+    idx = 0
+    while idx < args.size
+      arg = args[idx]
+      args[idx] = arg = arg.to_s unless arg.is_a?(String)
+      if arg =~ LINEFEED_RE
+        idx += 1
+      else
+        args.insert(idx + 1, LINEFEED)
+        idx += 2
+      end
     end
-    write *strs
+
+    write(*args)
     nil
   end
 
@@ -203,7 +212,7 @@ class ::IO
   end
 
   def read_loop(&block)
-    Thread.current.agent.read_loop(self, &block)
+    Thread.current.backend.read_loop(self, &block)
   end
 
   # alias_method :orig_read, :read
@@ -218,4 +227,28 @@ class ::IO
   #   end
   #   outbuf
   # end
+
+  def wait_readable(timeout = nil)
+    if timeout
+      move_on_after(timeout) do
+        Thread.current.backend.wait_io(self, false)
+        self
+      end
+    else
+      Thread.current.backend.wait_io(self, false)
+      self
+    end
+  end
+
+  def wait_writable(timeout = nil)
+    if timeout
+      move_on_after(timeout) do
+        Thread.current.backend.wait_io(self, true)
+        self
+      end
+    else
+      Thread.current.backend.wait_io(self, true)
+      self
+    end
+  end
 end

data/lib/polyphony/extensions/openssl.rb

@@ -28,8 +28,8 @@ class ::OpenSSL::SSL::SSLSocket
     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)
+      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
@@ -40,8 +40,8 @@ class ::OpenSSL::SSL::SSLSocket
   def sysread(maxlen, buf = +'')
     loop do
       case (result = read_nonblock(maxlen, buf, exception: false))
-      when :wait_readable then Thread.current.agent.wait_io(io, false)
-      when :wait_writable then Thread.current.agent.wait_io(io, true)
+      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
@@ -51,8 +51,8 @@ class ::OpenSSL::SSL::SSLSocket
   def syswrite(buf)
     loop do
       case (result = write_nonblock(buf, exception: false))
-      when :wait_readable then Thread.current.agent.wait_io(io, false)
-      when :wait_writable then Thread.current.agent.wait_io(io, true)
+      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

data/lib/polyphony/extensions/socket.rb

@@ -5,34 +5,17 @@ require 'socket'
 require_relative './io'
 require_relative '../core/thread_pool'
 
-class ::BasicSocket
-  def write_nonblock(string, _options = {})
-    write(string)
-  end
-
-  def read_nonblock(maxlen, str = nil, _options = {})
-    readpartial(maxlen, str)
-  end
-end
-
 # Socket overrides (eventually rewritten in C)
 class ::Socket
   def accept
-    Thread.current.agent.accept(self)
+    Thread.current.backend.accept(self)
   end
 
   NO_EXCEPTION = { exception: false }.freeze
 
-  def connect(remotesockaddr)
-    loop do
-      result = connect_nonblock(remotesockaddr, **NO_EXCEPTION)
-      case result
-      when 0 then return
-      when :wait_writable then Thread.current.agent.wait_io(self, true)
-      else
-        raise IOError
-      end
-    end
+  def connect(addr)
+    addr = Addrinfo.new(addr) if addr.is_a?(String)
+    Thread.current.backend.connect(self, addr.ip_address, addr.ip_port)
   end
 
   def recv(maxlen, flags = 0, outbuf = nil)
@@ -41,7 +24,7 @@ class ::Socket
       result = recv_nonblock(maxlen, flags, outbuf, **NO_EXCEPTION)
       case result
       when nil then raise IOError
-      when :wait_readable then Thread.current.agent.wait_io(self, false)
+      when :wait_readable then Thread.current.backend.wait_io(self, false)
       else
         return result
       end
@@ -54,7 +37,7 @@ class ::Socket
       result = recvfrom_nonblock(maxlen, flags, @read_buffer, **NO_EXCEPTION)
       case result
       when nil then raise IOError
-      when :wait_readable then Thread.current.agent.wait_io(self, false)
+      when :wait_readable then Thread.current.backend.wait_io(self, false)
       else
         return result
       end
@@ -75,6 +58,10 @@ class ::Socket
     setsockopt(Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1)
   end
 
+  def reuse_port
+    setsockopt(::Socket::SOL_SOCKET, ::Socket::SO_REUSEPORT, 1)
+  end
+
   class << self
     alias_method :orig_getaddrinfo, :getaddrinfo
     def getaddrinfo(*args)
@@ -128,6 +115,18 @@ class ::TCPSocket
   def reuse_addr
     setsockopt(::Socket::SOL_SOCKET, ::Socket::SO_REUSEADDR, 1)
   end
+
+  def reuse_port
+    setsockopt(::Socket::SOL_SOCKET, ::Socket::SO_REUSEPORT, 1)
+  end
+
+  def read_nonblock(len, str = nil, exception: true)
+    @io.read_nonblock(len, str, exception: exception)
+  end
+
+  def write_nonblock(buf, exception: true)
+    @io.write_nonblock(buf, exception: exception)
+  end
 end
 
 # Override stock TCPServer code by encapsulating a Socket instance.

data/lib/polyphony/extensions/thread.rb

@@ -16,21 +16,22 @@ class ::Thread
   end
 
   def execute
-    # agent must be created in the context of the new thread, therefore it
+    # backend must be created in the context of the new thread, therefore it
     # cannot be created in Thread#initialize
-    @agent = Polyphony::LibevAgent.new
+    @backend = Polyphony::Backend.new
     setup
     @ready = true
     result = @block.(*@args)
   rescue Polyphony::MoveOn, Polyphony::Terminate => e
     result = e.value
-  rescue Exception => result
+  rescue Exception => e
+    result = e
   ensure
     @ready = true
     finalize(result)
   end
 
-  attr_accessor :agent
+  attr_accessor :backend
 
   def setup
     @main_fiber = Fiber.current
@@ -48,7 +49,7 @@ class ::Thread
       @result = result
       signal_waiters(result)
     end
-    @agent.finalize
+    @backend.finalize
   end
 
   def signal_waiters(result)

data/lib/polyphony/net.rb

@@ -35,9 +35,10 @@ module Polyphony
         ::Socket.new(:INET, :STREAM).tap do |s|
           s.reuse_addr if opts[:reuse_addr]
           s.dont_linger if opts[:dont_linger]
+          s.reuse_port if opts[:reuse_port]
           addr = ::Socket.sockaddr_in(port, host)
           s.bind(addr)
-          s.listen(0)
+          s.listen(opts[:backlog] || Socket::SOMAXCONN)
         end
       end
 

data/lib/polyphony/version.rb

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

data/polyphony.gemspec

@@ -21,17 +21,21 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.required_ruby_version = '>= 2.6'
 
-  s.add_development_dependency  'httparty',             '0.17.0'
-  s.add_development_dependency  'localhost',            '1.1.4'
+  s.add_development_dependency  'rake-compiler',        '1.0.5'
   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.85.1'
+  s.add_development_dependency  'pry',                  '0.13.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'
   s.add_development_dependency  'http_parser.rb',       '~>0.6.0'
+  s.add_development_dependency  'rack',                 '>=2.0.8', '<2.3.0'
+  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  'jekyll',               '~>3.8.6'
   s.add_development_dependency  'jekyll-remote-theme',  '~>0.4.1'

data/test/helper.rb

@@ -31,7 +31,7 @@ class MiniTest::Test
     end
     Fiber.current.setup_main_fiber
     Fiber.current.instance_variable_set(:@auto_watcher, nil)
-    Thread.current.agent = Polyphony::LibevAgent.new
+    Thread.current.backend = Polyphony::Backend.new
     sleep 0 # apparently this helps with timer accuracy
   end
 

data/test/{test_agent.rb → test_backend.rb}

@@ -2,39 +2,39 @@
 
 require_relative 'helper'
 
-class AgentTest < MiniTest::Test
+class BackendTest < MiniTest::Test
   def setup
     super
-    @prev_agent = Thread.current.agent
-    @agent = Polyphony::LibevAgent.new
-    Thread.current.agent = @agent
+    @prev_backend = Thread.current.backend
+    @backend = Polyphony::Backend.new
+    Thread.current.backend = @backend
   end
 
   def teardown
-    @agent.finalize
-    Thread.current.agent = @prev_agent
+    @backend.finalize
+    Thread.current.backend = @prev_backend
   end
 
   def test_sleep
     count = 0
     t0 = Time.now
     spin {
-      @agent.sleep 0.01
+      @backend.sleep 0.01
       count += 1
-      @agent.sleep 0.01
+      @backend.sleep 0.01
       count += 1
-      @agent.sleep 0.01
+      @backend.sleep 0.01
       count += 1
     }.await
-    assert Time.now - t0 >= 0.03
+    assert_in_delta 0.03, Time.now - t0, 0.005
     assert_equal 3, 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')
+    f = spin { @backend.read(i, buf, 5, false) }
+    @backend.write(o, 'Hello world')
     return_value = f.await
     
     assert_equal 'Hello', buf
@@ -44,10 +44,10 @@ class AgentTest < MiniTest::Test
   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')
+    f = spin { @backend.read(i, buf, 5, true) }
+    @backend.write(o, 'Hello')
     snooze
-    @agent.write(o, ' world')
+    @backend.write(o, ' world')
     snooze
     o.close
     return_value = f.await
@@ -59,10 +59,10 @@ class AgentTest < MiniTest::Test
   def test_write_read_to_eof
     i, o = IO.pipe
     buf = +''
-    f = spin { @agent.read(i, buf, 10**6, true) }
-    @agent.write(o, 'Hello')
+    f = spin { @backend.read(i, buf, 10**6, true) }
+    @backend.write(o, 'Hello')
     snooze
-    @agent.write(o, ' world')
+    @backend.write(o, ' world')
     snooze
     o.close
     return_value = f.await
@@ -73,11 +73,11 @@ class AgentTest < MiniTest::Test
 
   def test_waitpid
     pid = fork do
-      @agent.post_fork
+      @backend.post_fork
       exit(42)
     end
     
-    result = @agent.waitpid(pid)
+    result = @backend.waitpid(pid)
     assert_equal [pid, 42], result
   end
 
@@ -87,7 +87,7 @@ class AgentTest < MiniTest::Test
     buf = []
     spin do
       buf << :ready
-      @agent.read_loop(i) { |d| buf << d }
+      @backend.read_loop(i) { |d| buf << d }
       buf << :done
     end
 
@@ -107,7 +107,7 @@ class AgentTest < MiniTest::Test
 
     clients = []
     server_fiber = spin do
-      @agent.accept_loop(server) { |c| clients << c }
+      @backend.accept_loop(server) { |c| clients << c }
     end
 
     c1 = TCPSocket.new('127.0.0.1', 1234)

data/test/test_fiber.rb

@@ -352,7 +352,7 @@ class FiberTest < MiniTest::Test
     result = []
     f = Fiber.current.spin do
       result << :start
-      result << Thread.current.agent.sleep(1)
+      result << Thread.current.backend.sleep(1)
     end
     snooze
     f.interrupt
@@ -413,6 +413,22 @@ class FiberTest < MiniTest::Test
     f2&.stop
   end
 
+  def test_interject
+    buf = []
+    f = spin_loop { sleep }
+    snooze
+    f.interject { buf << Fiber.current }
+    snooze
+    assert_equal [f], buf
+    assert_equal :waiting, f.state
+
+    f.interject { buf << :foo; raise Polyphony::MoveOn }
+    snooze
+
+    assert_equal [f, :foo], buf
+    assert_equal :dead, f.state
+  end
+
   def test_state
     counter = 0
     f = spin do
@@ -625,7 +641,7 @@ class FiberTest < MiniTest::Test
       end
     end
     sleep 0.1
-    f = spin { Thread.current.agent.waitpid(pid) }
+    f = spin { Thread.current.backend.waitpid(pid) }
     o.close
     Process.kill('INT', pid)
     f.await
@@ -647,7 +663,7 @@ class FiberTest < MiniTest::Test
       end
     end
     sleep 0.2
-    f = spin { Thread.current.agent.waitpid(pid) }
+    f = spin { Thread.current.backend.waitpid(pid) }
     o.close
     Process.kill('TERM', pid)
     f.await
@@ -674,7 +690,7 @@ class FiberTest < MiniTest::Test
       sleep 0.2
       Process.kill('TERM', pid)
     end
-    Thread.current.agent.waitpid(pid)
+    Thread.current.backend.waitpid(pid)
     klass = i.read
     i.close
     assert_equal 'Polyphony::Terminate', klass
@@ -692,7 +708,7 @@ class FiberTest < MiniTest::Test
 
     f.schedule
     f << 'bar'
-    snooze
+    2.times { snooze }
     assert_equal ['bar'], buffer
   end
 end