polyphony 0.43 → 0.43.5

data/ext/polyphony/ring_buffer.h

@@ -0,0 +1,28 @@
+#ifndef RING_BUFFER_H
+#define RING_BUFFER_H
+
+#include "ruby.h"
+
+typedef struct ring_buffer {
+  VALUE *entries;
+  unsigned int size;
+  unsigned int count;
+  unsigned int head;
+  unsigned int tail;
+} ring_buffer;
+
+void ring_buffer_init(ring_buffer *buffer);
+void ring_buffer_free(ring_buffer *buffer);
+void ring_buffer_mark(ring_buffer *buffer);
+int ring_buffer_empty_p(ring_buffer *buffer);
+void ring_buffer_clear(ring_buffer *buffer);
+
+VALUE ring_buffer_shift(ring_buffer *buffer);
+void ring_buffer_unshift(ring_buffer *buffer, VALUE value);
+void ring_buffer_push(ring_buffer *buffer, VALUE value);
+
+void ring_buffer_shift_each(ring_buffer *buffer);
+VALUE ring_buffer_shift_all(ring_buffer *buffer);
+void ring_buffer_delete(ring_buffer *buffer, VALUE value);
+
+#endif /* RING_BUFFER_H */

data/ext/polyphony/thread.c

@@ -1,23 +1,19 @@
 #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;
 
 static VALUE Thread_setup_fiber_scheduling(VALUE self) {
-  VALUE queue;
+  VALUE queue = rb_funcall(cLibevQueue, ID_new, 0);
   
   rb_ivar_set(self, ID_ivar_main_fiber, rb_fiber_current());
-  queue = rb_ary_new();
   rb_ivar_set(self, ID_run_queue, queue);
 
   return self;
@@ -64,7 +60,7 @@ VALUE Thread_schedule_fiber(VALUE self, VALUE fiber, VALUE value) {
   }
 
   queue = rb_ivar_get(self, ID_run_queue);
-  rb_ary_push(queue, fiber);
+  LibevQueue_push(queue, fiber);
   rb_ivar_set(fiber, ID_runnable, Qtrue);
 
   if (rb_thread_current() != self) {
@@ -91,13 +87,13 @@ VALUE Thread_schedule_fiber_with_priority(VALUE self, VALUE fiber, VALUE value)
 
   // if fiber is already scheduled, remove it from the run queue
   if (rb_ivar_get(fiber, ID_runnable) != Qnil) {
-    rb_ary_delete(queue, fiber);
+    LibevQueue_delete(queue, fiber);
   } else {
     rb_ivar_set(fiber, ID_runnable, Qtrue);
   }
 
   // the fiber is given priority by putting it at the front of the run queue
-  rb_ary_unshift(queue, fiber);
+  LibevQueue_unshift(queue, fiber);
 
   if (rb_thread_current() != self) {
     // if the fiber scheduling is done across threads, we need to make sure the
@@ -127,7 +123,7 @@ VALUE Thread_switch_fiber(VALUE self) {
 
   ref_count = LibevAgent_ref_count(agent);
   while (1) {
-    next_fiber = rb_ary_shift(queue);
+    next_fiber = LibevQueue_shift_no_wait(queue);
     if (next_fiber != Qnil) {
       if (ref_count > 0) {
         // this mechanism prevents event starvation in case the run queue never
@@ -154,9 +150,15 @@ VALUE Thread_switch_fiber(VALUE self) {
     value : rb_funcall(next_fiber, ID_transfer, 1, value);
 }
 
+VALUE Thread_run_queue_trace(VALUE self) {
+  VALUE queue = rb_ivar_get(self, ID_run_queue);
+  LibevQueue_trace(queue);
+  return self;
+}
+
 VALUE Thread_reset_fiber_scheduling(VALUE self) {
   VALUE queue = rb_ivar_get(self, ID_run_queue);
-  rb_ary_clear(queue);
+  LibevQueue_clear(queue);
   Thread_fiber_reset_ref_count(self);
   return self;
 }
@@ -185,16 +187,14 @@ void Init_Thread() {
   rb_define_method(rb_cThread, "schedule_fiber_with_priority",
     Thread_schedule_fiber_with_priority, 2);
   rb_define_method(rb_cThread, "switch_fiber", Thread_switch_fiber, 0);
+  rb_define_method(rb_cThread, "run_queue_trace", Thread_run_queue_trace, 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/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/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,6 +221,13 @@ module Polyphony
     def await_all_children
       return unless @children && !@children.empty?
 
+      # @results = @children.dup
+      # @on_child_done = proc do |c, r|
+      #   @results[c] = r
+      #   self.schedule if @children.empty?
+      # end
+      # suspend
+      # @results.values
       Fiber.await(*@children.keys)
     end
 
@@ -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