polyphony 0.42 → 0.43.4

data/ext/polyphony/libev_queue.c

@@ -120,11 +120,12 @@ static VALUE LibevQueue_initialize(VALUE self) {
 
 VALUE LibevQueue_push(VALUE self, VALUE value) {
   LibevQueue_t *queue;
-  struct async_watcher *watcher;
   GetQueue(self, queue);
-  watcher = async_queue_pop(&queue->shift_queue);
-  if (watcher) {
-    ev_async_send(watcher->ev_loop, &watcher->async);
+  if (queue->shift_queue.count > 0) {
+    struct async_watcher *watcher = async_queue_pop(&queue->shift_queue);
+    if (watcher) {
+      ev_async_send(watcher->ev_loop, &watcher->async);
+    }
   }
   rb_ary_push(queue->items, value);
   return self;

data/ext/polyphony/polyphony.c

@@ -7,11 +7,8 @@ ID ID_call;
 ID ID_caller;
 ID ID_clear;
 ID ID_each;
-ID ID_empty;
 ID ID_inspect;
 ID ID_new;
-ID ID_pop;
-ID ID_push;
 ID ID_raise;
 ID ID_ivar_running;
 ID ID_ivar_thread;
@@ -62,13 +59,10 @@ void Init_Polyphony() {
   ID_caller         = rb_intern("caller");
   ID_clear          = rb_intern("clear");
   ID_each           = rb_intern("each");
-  ID_empty          = rb_intern("empty?");
   ID_inspect        = rb_intern("inspect");
   ID_ivar_running   = rb_intern("@running");
   ID_ivar_thread    = rb_intern("@thread");
   ID_new            = rb_intern("new");
-  ID_pop            = rb_intern("pop");
-  ID_push           = rb_intern("push");
   ID_raise          = rb_intern("raise");
   ID_runnable       = rb_intern("runnable");
   ID_runnable_value = rb_intern("runnable_value");

data/ext/polyphony/polyphony_ext.c

@@ -4,7 +4,6 @@ void Init_Fiber();
 void Init_Polyphony();
 void Init_LibevAgent();
 void Init_LibevQueue();
-void Init_Socket();
 void Init_Thread();
 void Init_Tracing();
 
@@ -16,7 +15,6 @@ void Init_polyphony_ext() {
   Init_LibevQueue();
 
   Init_Fiber();
-  Init_Socket();
   Init_Thread();
 
   Init_Tracing();

data/ext/polyphony/thread.c

@@ -1,14 +1,11 @@
 #include "polyphony.h"
 
 ID ID_deactivate_all_watchers_post_fork;
-ID ID_empty;
 ID ID_ivar_agent;
 ID ID_ivar_join_wait_queue;
 ID ID_ivar_main_fiber;
 ID ID_ivar_result;
 ID ID_ivar_terminated;
-ID ID_pop;
-ID ID_push;
 ID ID_run_queue;
 ID ID_runnable_next;
 ID ID_stop;
@@ -187,14 +184,11 @@ void Init_Thread() {
   rb_define_method(rb_cThread, "switch_fiber", Thread_switch_fiber, 0);
 
   ID_deactivate_all_watchers_post_fork = rb_intern("deactivate_all_watchers_post_fork");
-  ID_empty                    = rb_intern("empty?");
   ID_ivar_agent               = rb_intern("@agent");
   ID_ivar_join_wait_queue     = rb_intern("@join_wait_queue");
   ID_ivar_main_fiber          = rb_intern("@main_fiber");
   ID_ivar_result              = rb_intern("@result");
   ID_ivar_terminated          = rb_intern("@terminated");
-  ID_pop                      = rb_intern("pop");
-  ID_push                     = rb_intern("push");
   ID_run_queue                = rb_intern("run_queue");
   ID_runnable_next            = rb_intern("runnable_next");
   ID_stop                     = rb_intern("stop");

data/lib/polyphony.rb

@@ -6,6 +6,12 @@ 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 +100,9 @@ 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)
+      trap('SIGINT', Interrupt)
     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/adapters/redis.rb

@@ -6,7 +6,7 @@ require 'redis'
 require 'hiredis/reader'
 
 # Polyphony-based Redis driver
-class Driver
+class Polyphony::RedisDriver
   def self.connect(config)
     raise 'unix sockets not supported' if config[:scheme] == 'unix'
 
@@ -43,6 +43,7 @@ class Driver
   end
 
   def format_command(args)
+    args = args.flatten
     (+"*#{args.size}\r\n").tap do |s|
       args.each do |a|
         a = a.to_s
@@ -63,4 +64,4 @@ class Driver
   end
 end
 
-Redis::Connection.drivers << Driver
+Redis::Connection.drivers << Polyphony::RedisDriver

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[fiber] = nil
+          Thread.current.agent.unref
+          release(resource) if resource
+        end
+      end
     end
-
+        
     def wait_for_resource
       fiber = Fiber.current
       @queue << fiber

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
 
@@ -120,6 +126,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

@@ -370,15 +370,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
@@ -201,6 +201,10 @@ class ::IO
     buf ? readpartial(maxlen, buf) : readpartial(maxlen)
   end
 
+  def read_loop(&block)
+    Thread.current.agent.read_loop(self, &block)
+  end
+
   # alias_method :orig_read, :read
   # def read(length = nil, outbuf = nil)
   #   if length

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,12 +17,36 @@ class ::OpenSSL::SSL::SSLSocket
     io.reuse_addr
   end
 
-  def sysread(maxlen, buf)
+  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 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 result
+      else
+        return result
       end
     end
   end
@@ -37,13 +60,14 @@ class ::OpenSSL::SSL::SSLSocket
     # @sync = osync
   end
 
-  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 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

@@ -128,11 +128,11 @@ class ::TCPServer
 
   alias_method :orig_accept, :accept
   def accept
-    @io ? @io.accept : orig_accept
+    @io.accept
   end
 
   alias_method :orig_close, :close
   def close
-    @io ? @io.close : orig_close
+    @io.close
   end
 end

data/lib/polyphony/version.rb

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

data/test/test_agent.rb

@@ -21,10 +21,13 @@ class AgentTest < MiniTest::Test
     spin {
       @agent.sleep 0.01
       count += 1
-    }
-    suspend
-    assert Time.now - t0 >= 0.01
-    assert_equal 1, count
+      @agent.sleep 0.01
+      count += 1
+      @agent.sleep 0.01
+      count += 1
+    }.await
+    assert Time.now - t0 >= 0.03
+    assert_equal 3, count
   end
 
   def test_write_read_partial
@@ -88,10 +91,13 @@ class AgentTest < MiniTest::Test
       buf << :done
     end
 
+    # writing always causes snoozing
     o << 'foo'
     o << 'bar'
     o.close
-    snooze
+
+    # read_loop will snooze after every read
+    4.times { snooze }
 
     assert_equal [:ready, 'foo', 'bar', :done], buf
   end
@@ -105,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)
-    snooze
+    10.times { snooze }
 
     assert_equal 2, clients.size