polyphony 0.43.2 → 0.43.8

data/lib/polyphony.rb

@@ -4,8 +4,11 @@ require 'fiber'
 require_relative './polyphony_ext'
 
 module Polyphony
-  # Map Queue to Libev queue implementation
-  Queue = LibevQueue
+  # replace core Queue class with our own
+  verbose = $VERBOSE
+  $VERBOSE = nil
+  Object.const_set(:Queue, Polyphony::Queue)
+  $VERBOSE = verbose
 end
 
 require_relative './polyphony/extensions/core'
@@ -94,17 +97,12 @@ module Polyphony
       Polyphony::Process.watch(cmd, &block)
     end
 
-    def emit_signal_exception(exception, fiber = Thread.main.main_fiber)
-      Thread.current.break_out_of_ev_loop(fiber, exception)
-    end
-
-    def install_terminating_signal_handler(signal, exception_class)
-      trap(signal) { emit_signal_exception(exception_class.new) }
-    end
-
     def install_terminating_signal_handlers
-      install_terminating_signal_handler('SIGTERM', ::SystemExit)
-      install_terminating_signal_handler('SIGINT', ::Interrupt)
+      trap('SIGTERM', SystemExit)
+      orig_trap('SIGINT') do
+        orig_trap('SIGINT') { exit! }
+        Thread.current.break_out_of_ev_loop(Thread.main.main_fiber, Interrupt.new)
+      end
     end
 
     def terminate_threads
@@ -114,7 +112,25 @@ module Polyphony
       threads.each(&:kill)
       threads.each(&:join)
     end
+
+    attr_accessor :original_pid
+
+    def install_at_exit_handler
+      @original_pid = ::Process.pid
+
+      # This at_exit handler is needed only when the original process exits. Due to
+      # the behaviour of fibers on fork (and especially on exit from forked
+      # processes,) we use a separate mechanism to terminate fibers in forked
+      # processes (see Polyphony.fork).
+      at_exit do
+        next unless @original_pid == ::Process.pid
+      
+        Polyphony.terminate_threads
+        Fiber.current.shutdown_all_children
+      end
+    end
   end
 end
 
 Polyphony.install_terminating_signal_handlers
+Polyphony.install_at_exit_handler

data/lib/polyphony/core/global_api.rb

@@ -15,11 +15,13 @@ module Polyphony
       end
     end
 
-    def cancel_after(interval, &block)
+    def cancel_after(interval, with_exception: Polyphony::Cancel, &block)
       fiber = ::Fiber.current
       canceller = spin do
         sleep interval
-        fiber.schedule Polyphony::Cancel.new
+        exception = with_exception.is_a?(Class) ?
+          with_exception.new : RuntimeError.new(with_exception)
+        fiber.schedule exception
       end
       block ? cancel_after_wrap_block(canceller, &block) : canceller
     end
@@ -101,7 +103,7 @@ module Polyphony
 
     def sleep_forever
       Thread.current.agent.ref
-      suspend
+      loop { sleep 60 }
     ensure
       Thread.current.agent.unref
     end

data/lib/polyphony/core/resource_pool.rb

@@ -13,6 +13,7 @@ module Polyphony
 
       @stock = []
       @queue = []
+      @acquired_resources = {}
 
       @limit = opts[:limit] || 4
       @size = 0
@@ -23,16 +24,25 @@ module Polyphony
     end
 
     def acquire
-      Thread.current.agent.ref
-      resource = wait_for_resource
-      return unless resource
-
-      yield resource
-    ensure
-      Thread.current.agent.unref
-      release(resource) if resource
+      fiber = Fiber.current
+      if @acquired_resources[fiber]
+        yield @acquired_resources[fiber]
+      else
+        begin
+          Thread.current.agent.ref
+          resource = wait_for_resource
+          return unless resource
+          
+          @acquired_resources[fiber] = resource
+          yield resource
+        ensure
+          @acquired_resources.delete fiber
+          Thread.current.agent.unref
+          release(resource) if resource
+        end
+      end
     end
-
+        
     def wait_for_resource
       fiber = Fiber.current
       @queue << fiber

data/lib/polyphony/core/thread_pool.rb

@@ -49,7 +49,7 @@ module Polyphony
     end
 
     def run_queued_task
-      (block, watcher) = @task_queue.pop
+      (block, watcher) = @task_queue.shift
       result = block.()
       watcher&.signal(result)
     rescue Exception => e

data/lib/polyphony/event.rb

@@ -3,25 +3,15 @@
 module Polyphony
   # Event watcher for thread-safe synchronisation
   class Event
-    def initialize
-      @i, @o = IO.pipe
-    end
-
     def await
-      Thread.current.agent.read(@i, +'', 8192, false)
-      raise @value if @value.is_a?(Exception)
-
-      @value
-    end
-
-    def await_no_raise
-      Thread.current.agent.read(@i, +'', 8192, false)
-      @value
+      @fiber = Fiber.current
+      Thread.current.agent.wait_event(true)
     end
 
     def signal(value = nil)
-      @value = value
-      Thread.current.agent.write(@o, '1')
+      @fiber&.schedule(value)
+    ensure
+      @fiber = nil
     end
   end
 end

data/lib/polyphony/extensions/core.rb

@@ -57,6 +57,12 @@ module ::Process
       fiber.define_singleton_method(:pid) { pid }
       fiber
     end
+
+    alias_method :orig_daemon, :daemon
+    def daemon(*args)
+      orig_daemon(*args)
+      Polyphony.original_pid = Process.pid
+    end
   end
 end
 
@@ -101,6 +107,15 @@ module ::Kernel
     $stdin.gets
   end
 
+  alias_method :orig_p, :p
+  def p(*args)
+    strs = args.inject([]) do |m, a|
+      m << a.inspect << "\n"
+    end
+    STDOUT.write *strs
+    args.size == 1 ? args.first : args
+  end
+
   alias_method :orig_system, :system
   def system(*args)
     Open3.popen2(*args) do |i, o, _t|
@@ -120,6 +135,31 @@ module ::Kernel
       break
     end
   end
+
+  alias_method :orig_trap, :trap
+  def trap(sig, command = nil, &block)
+    return orig_trap(sig, command) if command.is_a? String
+      
+    block = command if command.respond_to?(:call) && !block
+    exception = command.is_a?(Class) && command.new
+
+    # The signal trap can be invoked at any time, including while the system
+    # agent is blocking while polling for events. In order to deal with this
+    # correctly, we spin a fiber that will run the signal handler code, then
+    # call break_out_of_ev_loop, which will put the fiber at the front of the
+    # run queue, then wake up the system agent.
+    #
+    # If the command argument is an exception class however, it will be raised
+    # directly in the context of the main fiber.
+    orig_trap(sig) do
+      if exception
+        Thread.current.break_out_of_ev_loop(Thread.main.main_fiber, exception)
+      else
+        fiber = spin { snooze; block.call }
+        Thread.current.break_out_of_ev_loop(fiber, nil)
+      end
+    end
+  end
 end
 
 # Override Timeout to use cancel scope

data/lib/polyphony/extensions/fiber.rb

@@ -189,7 +189,7 @@ module Polyphony
     end
 
     def receive_pending
-      @mailbox.shift_each
+      @mailbox.shift_all
     end
   end
 
@@ -221,7 +221,14 @@ module Polyphony
     def await_all_children
       return unless @children && !@children.empty?
 
-      Fiber.await(*@children.keys)
+      @results = @children.dup
+      @on_child_done = proc do |c, r|
+        @results[c] = r
+        self.schedule if @children.empty?
+      end
+      suspend
+      @on_child_done = nil
+      @results.values
     end
 
     def shutdown_all_children
@@ -370,15 +377,3 @@ class ::Fiber
 end
 
 Fiber.current.setup_main_fiber
-
-# This at_exit handler is needed only when the original process exits. Due to
-# the behaviour of fibers on fork (and especially on exit from forked
-# processes,) we use a separate mechanism to terminate fibers in forked
-# processes (see Polyphony.fork).
-orig_pid = Process.pid
-at_exit do
-  next unless orig_pid == Process.pid
-
-  Polyphony.terminate_threads
-  Fiber.current.shutdown_all_children
-end

data/lib/polyphony/extensions/io.rb

@@ -97,7 +97,7 @@ class ::IO
   # end
 
   alias_method :orig_read, :read
-  def read(len = 1 << 30)
+  def read(len = nil)
     @read_buffer ||= +''
     result = Thread.current.agent.read(self, @read_buffer, len, true)
     return nil unless result
@@ -108,19 +108,23 @@ class ::IO
   end
 
   alias_method :orig_readpartial, :read
-  def readpartial(len)
+  def readpartial(len, str = nil)
     @read_buffer ||= +''
     result = Thread.current.agent.read(self, @read_buffer, len, false)
     raise EOFError unless result
 
-    already_read = @read_buffer
+    if str
+      str << @read_buffer
+    else
+      str = @read_buffer
+    end
     @read_buffer = +''
-    already_read
+    str
   end
 
   alias_method :orig_write, :write
-  def write(str)
-    Thread.current.agent.write(self, str)
+  def write(str, *args)
+    Thread.current.agent.write(self, str, *args)
   end
 
   alias_method :orig_write_chevron, :<<
@@ -166,16 +170,13 @@ class ::IO
       return
     end
 
-    s = args.each_with_object(+'') do |a, str|
-      if a.is_a?(Array)
-        a.each { |a2| str << a2.to_s << "\n" }
-      else
-        a = a.to_s
-        str << a
-        str << "\n" unless a =~ /\n$/
-      end
+    strs = args.inject([]) do |m, a|
+      a = a.to_s
+      m << a
+      m << "\n" unless a =~ /\n$/
+      m
     end
-    write s
+    write *strs
     nil
   end
 
@@ -193,7 +194,7 @@ class ::IO
 
   alias_method :orig_write_nonblock, :write_nonblock
   def write_nonblock(string, _options = {})
-    write(string, 0)
+    write(string)
   end
 
   alias_method :orig_read_nonblock, :read_nonblock

data/lib/polyphony/extensions/openssl.rb

@@ -5,6 +5,12 @@ require_relative './socket'
 
 # Open ssl socket helper methods (to make it compatible with Socket API)
 class ::OpenSSL::SSL::SSLSocket
+  alias_method :orig_initialize, :initialize
+  def initialize(socket, context = nil)
+    socket = socket.respond_to?(:io) ? socket.io || socket : socket
+    context ? orig_initialize(socket, context) : orig_initialize(socket)
+  end
+
   def dont_linger
     io.dont_linger
   end
@@ -35,6 +41,7 @@ class ::OpenSSL::SSL::SSLSocket
     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)
       else return result
       end
     end
@@ -44,6 +51,7 @@ 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)
       else
         return result

data/lib/polyphony/extensions/socket.rb

@@ -5,6 +5,16 @@ 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
@@ -77,6 +87,8 @@ end
 class ::TCPSocket
   NO_EXCEPTION = { exception: false }.freeze
 
+  attr_reader :io
+
   def initialize(remote_host, remote_port, local_host = nil, local_port = nil)
     @io = Socket.new Socket::AF_INET, Socket::SOCK_STREAM
     if local_host && local_port

data/lib/polyphony/version.rb

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

data/test/helper.rb

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

data/test/q.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'fiber'
+require_relative '../lib/polyphony_ext'
+
+queue = Polyphony::LibevQueue.new
+
+queue.push :a
+queue.push :b
+queue.push :c
+p [queue.shift_no_wait]
+queue.push :d
+p [queue.shift_no_wait]
+p [queue.shift_no_wait]
+p [queue.shift_no_wait]
+p [queue.shift_no_wait]
+
+queue.unshift :e
+p [queue.shift_no_wait]
+
+queue.push :f
+queue.push :g
+p [queue.shift_no_wait]

data/test/test_agent.rb

@@ -97,7 +97,7 @@ class AgentTest < MiniTest::Test
     o.close
 
     # read_loop will snooze after every read
-    4.times { snooze }
+    6.times { snooze }
 
     assert_equal [:ready, 'foo', 'bar', :done], buf
   end
@@ -111,12 +111,12 @@ class AgentTest < MiniTest::Test
     end
 
     c1 = TCPSocket.new('127.0.0.1', 1234)
-    snooze
+    10.times { snooze }
 
     assert_equal 1, clients.size
 
     c2 = TCPSocket.new('127.0.0.1', 1234)
-    2.times { snooze }
+    10.times { snooze }
 
     assert_equal 2, clients.size