polyphony 0.41 → 0.43.3

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;
@@ -137,6 +138,8 @@ void async_queue_callback(struct ev_loop *ev_loop, struct ev_async *ev_async, in
   Fiber_make_runnable(watcher->fiber, Qnil);
 }
 
+VALUE libev_agent_await(VALUE self);
+
 VALUE LibevQueue_shift(VALUE self) {
   LibevQueue_t *queue;
   GetQueue(self, queue);
@@ -152,7 +155,7 @@ VALUE LibevQueue_shift(VALUE self) {
     ev_async_init(&watcher.async, async_queue_callback);
     ev_async_start(watcher.ev_loop, &watcher.async);
     
-    switchpoint_result = Polyphony_switchpoint();
+    switchpoint_result = libev_agent_await(agent);
     ev_async_stop(watcher.ev_loop, &watcher.async);
 
     if (RTEST(rb_obj_is_kind_of(switchpoint_result, rb_eException))) {

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;
@@ -36,14 +33,6 @@ VALUE Polyphony_snooze(VALUE self) {
   return ret;
 }
 
-static VALUE Polyphony_ref(VALUE self) {
-  return Thread_ref(rb_thread_current());
-}
-
-static VALUE Polyphony_unref(VALUE self) {
-  return Thread_unref(rb_thread_current());
-}
-
 static VALUE Polyphony_suspend(VALUE self) {
   VALUE ret = Thread_switch_fiber(rb_thread_current());
 
@@ -60,9 +49,7 @@ VALUE Polyphony_trace(VALUE self, VALUE enabled) {
 void Init_Polyphony() {
   mPolyphony = rb_define_module("Polyphony");
 
-  rb_define_singleton_method(mPolyphony, "ref", Polyphony_ref, 0);
   rb_define_singleton_method(mPolyphony, "trace", Polyphony_trace, 1);
-  rb_define_singleton_method(mPolyphony, "unref", Polyphony_unref, 0);
 
   rb_define_global_function("snooze", Polyphony_snooze, 0);
   rb_define_global_function("suspend", Polyphony_suspend, 0);
@@ -72,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.h

@@ -7,7 +7,7 @@
 
 // debugging
 #define OBJ_ID(obj) (NUM2LONG(rb_funcall(obj, rb_intern("object_id"), 0)))
-#define INSPECT(...) (rb_funcall(rb_cObject, rb_intern("p"), __VA_ARGS__))
+#define INSPECT(obj) { VALUE s = rb_funcall(obj, rb_intern("inspect"), 0); printf("%s\n", StringValueCStr(s));}
 #define FIBER_TRACE(...) if (__tracing_enabled__) { \
   rb_funcall(rb_cObject, ID_fiber_trace, __VA_ARGS__); \
 }
@@ -66,22 +66,22 @@ enum {
 VALUE Fiber_auto_watcher(VALUE self);
 void Fiber_make_runnable(VALUE fiber, VALUE value);
 
-VALUE Polyphony_switchpoint();
-
 VALUE LibevAgent_poll(VALUE self, VALUE nowait, VALUE current_fiber, VALUE queue);
 VALUE LibevAgent_break(VALUE self);
 VALUE LibevAgent_pending_count(VALUE self);
 VALUE LibevAgent_wait_io(VALUE self, VALUE io, VALUE write);
 
+VALUE LibevAgent_ref(VALUE self);
+VALUE LibevAgent_unref(VALUE self);
+int LibevAgent_ref_count(VALUE self);
+void LibevAgent_reset_ref_count(VALUE self);
+
 VALUE Polyphony_snooze(VALUE self);
 
 VALUE Polyphony_Queue_push(VALUE self, VALUE value);
 
-VALUE Thread_post_fork(VALUE thread);
-VALUE Thread_ref(VALUE thread);
 VALUE Thread_schedule_fiber(VALUE thread, VALUE fiber, VALUE value);
 VALUE Thread_switch_fiber(VALUE thread);
-VALUE Thread_unref(VALUE thread);
 
 int io_setstrbuf(VALUE *str, long len);
 void io_set_read_length(VALUE str, long n, int shrinkable);

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,15 +1,11 @@
 #include "polyphony.h"
 
 ID ID_deactivate_all_watchers_post_fork;
-ID ID_empty;
-ID ID_fiber_ref_count;
 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;
@@ -18,34 +14,20 @@ static VALUE Thread_setup_fiber_scheduling(VALUE self) {
   VALUE queue;
   
   rb_ivar_set(self, ID_ivar_main_fiber, rb_fiber_current());
-  rb_ivar_set(self, ID_fiber_ref_count, INT2NUM(0));
   queue = rb_ary_new();
   rb_ivar_set(self, ID_run_queue, queue);
 
   return self;
 }
 
-VALUE Thread_ref(VALUE self) {
-  VALUE count = rb_ivar_get(self, ID_fiber_ref_count);
-  int new_count = NUM2INT(count) + 1;
-  rb_ivar_set(self, ID_fiber_ref_count, INT2NUM(new_count));
-  return self;
-}
-
-VALUE Thread_unref(VALUE self) {
-  VALUE count = rb_ivar_get(self, ID_fiber_ref_count);
-  int new_count = NUM2INT(count) - 1;
-  rb_ivar_set(self, ID_fiber_ref_count, INT2NUM(new_count));
-  return self;
-}
-
 int Thread_fiber_ref_count(VALUE self) {
-  VALUE count = rb_ivar_get(self, ID_fiber_ref_count);
-  return NUM2INT(count);
+  VALUE agent = rb_ivar_get(self, ID_ivar_agent);
+  return NUM2INT(LibevAgent_ref_count(agent));
 }
 
-void Thread_fiber_reset_ref_count(VALUE self) {
-  rb_ivar_set(self, ID_fiber_ref_count, INT2NUM(0));
+inline void Thread_fiber_reset_ref_count(VALUE self) {
+  VALUE agent = rb_ivar_get(self, ID_ivar_agent);
+  LibevAgent_reset_ref_count(agent);
 }
 
 static VALUE SYM_scheduled_fibers;
@@ -140,8 +122,8 @@ VALUE Thread_switch_fiber(VALUE self) {
     }
   }
 
+  ref_count = LibevAgent_ref_count(agent);
   while (1) {
-    ref_count = Thread_fiber_ref_count(self);
     next_fiber = rb_ary_shift(queue);
     if (next_fiber != Qnil) {
       if (ref_count > 0) {
@@ -165,7 +147,8 @@ VALUE Thread_switch_fiber(VALUE self) {
   rb_ivar_set(next_fiber, ID_runnable, Qnil);
   RB_GC_GUARD(next_fiber);
   RB_GC_GUARD(value);
-  return rb_funcall(next_fiber, ID_transfer, 1, value);
+  return (next_fiber == current_fiber) ? 
+    value : rb_funcall(next_fiber, ID_transfer, 1, value);
 }
 
 VALUE Thread_reset_fiber_scheduling(VALUE self) {
@@ -175,16 +158,6 @@ VALUE Thread_reset_fiber_scheduling(VALUE self) {
   return self;
 }
 
-VALUE Polyphony_switchpoint() {
-  VALUE ret;
-  VALUE thread = rb_thread_current();
-  Thread_ref(thread);
-  ret = Thread_switch_fiber(thread);
-  Thread_unref(thread);
-  RB_GC_GUARD(ret);
-  return ret;
-}
-
 VALUE Thread_fiber_break_out_of_ev_loop(VALUE self, VALUE fiber, VALUE resume_obj) {
   VALUE agent = rb_ivar_get(self, ID_ivar_agent);
   if (fiber != Qnil) {
@@ -200,9 +173,6 @@ VALUE Thread_fiber_break_out_of_ev_loop(VALUE self, VALUE fiber, VALUE resume_ob
 }
 
 void Init_Thread() {
-  rb_define_method(rb_cThread, "fiber_ref", Thread_ref, 0);
-  rb_define_method(rb_cThread, "fiber_unref", Thread_unref, 0);
-
   rb_define_method(rb_cThread, "setup_fiber_scheduling", Thread_setup_fiber_scheduling, 0);
   rb_define_method(rb_cThread, "reset_fiber_scheduling", Thread_reset_fiber_scheduling, 0);
   rb_define_method(rb_cThread, "fiber_scheduling_stats", Thread_fiber_scheduling_stats, 0);
@@ -214,15 +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_fiber_ref_count          = rb_intern("fiber_ref_count");
   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'
@@ -26,14 +32,17 @@ require_relative './polyphony/event'
 module Polyphony
   class << self
     def wait_for_signal(sig)
+      raise "should be reimplemented"
+
       fiber = Fiber.current
-      Polyphony.ref
+      # Polyphony.ref
       old_trap = trap(sig) do
-        Polyphony.unref
+        # Polyphony.unref
         fiber.schedule(sig)
         trap(sig, old_trap)
       end
       suspend
+
     end
 
     def fork(&block)
@@ -111,7 +120,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/channel.rb

@@ -26,7 +26,7 @@ module Polyphony
     end
 
     def receive
-      Polyphony.ref
+      Thread.current.agent.ref
       if @payload_queue.empty?
         @waiting_queue << Fiber.current
         suspend
@@ -34,7 +34,7 @@ module Polyphony
         receive_from_queue
       end
     ensure
-      Polyphony.unref
+      Thread.current.agent.unref
     end
 
     def receive_from_queue

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
@@ -100,10 +102,10 @@ module Polyphony
     end
 
     def sleep_forever
-      Thread.current.fiber_ref
+      Thread.current.agent.ref
       suspend
     ensure
-      Thread.current.fiber_unref
+      Thread.current.agent.unref
     end
 
     def throttled_loop(rate, count: nil, &block)

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
-      Polyphony.ref
-      resource = wait_for_resource
-      return unless resource
-
-      yield resource
-    ensure
-      Polyphony.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

@@ -8,8 +8,6 @@ require_relative '../core/exceptions'
 
 # Exeption overrides
 class ::Exception
-  EXIT_EXCEPTION_CLASSES = [::Interrupt, ::SystemExit].freeze
-
   class << self
     attr_accessor :__disable_sanitized_backtrace__
   end
@@ -24,7 +22,7 @@ class ::Exception
 
   alias_method :orig_backtrace, :backtrace
   def backtrace
-    unless @first_backtrace_call || EXIT_EXCEPTION_CLASSES.include?(self.class)
+    unless @first_backtrace_call
       @first_backtrace_call = true
       return orig_backtrace
     end
@@ -59,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
 
@@ -93,6 +97,7 @@ module ::Kernel
   def gets(*_args)
     if !ARGV.empty? || @gets_fiber
       @gets_fiber ||= Fiber.new(&ARGV_GETS_LOOP)
+      @gets_fiber.thread = Thread.current
       result = @gets_fiber.alive? && @gets_fiber.safe_transfer(Fiber.current)
       return result if result