polyphony 0.22 → 0.23

data/ext/gyro/child.c

@@ -105,7 +105,7 @@ static VALUE Gyro_Child_await(VALUE self) {
   child->active = 1;
   ev_child_start(EV_DEFAULT, &child->ev_child);
 
-  ret = Gyro_yield();
+  ret = Gyro_await();
 
   // fiber is resumed, check if resumed value is an exception
   if (RTEST(rb_obj_is_kind_of(ret, rb_eException))) {
@@ -114,7 +114,7 @@ static VALUE Gyro_Child_await(VALUE self) {
       child->active = 0;
       ev_child_stop(EV_DEFAULT, &child->ev_child);
     }
-    return rb_funcall(ret, ID_raise, 1, ret);
+    return rb_funcall(rb_mKernel, ID_raise, 1, ret);
   }
   else {
     return ret;

data/ext/gyro/gyro.c

@@ -6,6 +6,7 @@ static VALUE Gyro_break_get(VALUE self);
 static VALUE Gyro_ref(VALUE self);
 static VALUE Gyro_unref(VALUE self);
 
+static VALUE Gyro_run(VALUE self);
 static VALUE Gyro_reset(VALUE self);
 static VALUE Gyro_post_fork(VALUE self);
 static VALUE Gyro_suspend(VALUE self);
@@ -53,6 +54,7 @@ void Init_Gyro() {
   rb_define_singleton_method(mGyro, "ref", Gyro_ref, 0);
   rb_define_singleton_method(mGyro, "unref", Gyro_unref, 0);
 
+  rb_define_singleton_method(mGyro, "run", Gyro_run, 0);
   rb_define_singleton_method(mGyro, "reset!", Gyro_reset, 0);
   rb_define_singleton_method(mGyro, "post_fork", Gyro_post_fork, 0);
   rb_define_singleton_method(mGyro, "snooze", Gyro_snooze, 0);
@@ -110,6 +112,10 @@ static VALUE Gyro_unref(VALUE self) {
   return Qnil;
 }
 
+static VALUE Gyro_run(VALUE self) {
+  return Gyro_run_next_fiber();
+}
+
 static VALUE Gyro_reset(VALUE self) {
   break_flag = 0;
   ref_count = 0;
@@ -121,7 +127,6 @@ static VALUE Gyro_reset(VALUE self) {
 static VALUE Gyro_break_set(VALUE self) {
   break_flag = 1;
   ev_break(EV_DEFAULT, EVBREAK_ALL);
-  // printf("\n");
   return Qnil;
 }
 
@@ -133,9 +138,9 @@ VALUE Gyro_snooze(VALUE self) {
   VALUE fiber = rb_fiber_current();
   Gyro_schedule_fiber(fiber, Qnil);
 
-  VALUE ret = Gyro_run();
+  VALUE ret = Gyro_run_next_fiber();
   if (RTEST(rb_obj_is_kind_of(ret, rb_eException)))
-    return rb_funcall(ret, ID_raise, 1, ret);
+    return rb_funcall(rb_mKernel, ID_raise, 1, ret);
   else
     return ret;
 }
@@ -151,9 +156,10 @@ static VALUE Gyro_post_fork(VALUE self) {
 }
 
 static VALUE Gyro_suspend(VALUE self) {
-  VALUE ret = Gyro_run();
+  rb_ivar_set(self, ID_scheduled_value, Qnil);
+  VALUE ret = Gyro_run_next_fiber();
   if (RTEST(rb_obj_is_kind_of(ret, rb_eException))) {
-    return rb_funcall(ret, ID_raise, 1, ret);
+    return rb_funcall(rb_mKernel, ID_raise, 1, ret);
   }
   else
     return ret;
@@ -165,7 +171,7 @@ static VALUE Fiber_safe_transfer(int argc, VALUE *argv, VALUE self) {
 
   // fiber is resumed, check if resumed value is an exception
   return RTEST(rb_obj_is_kind_of(ret, rb_eException)) ? 
-    rb_funcall(ret, ID_raise, 1, ret) : ret;
+    rb_funcall(rb_mKernel, ID_raise, 1, ret) : ret;
 }
 
 static VALUE Fiber_schedule(int argc, VALUE *argv, VALUE self) {
@@ -188,14 +194,14 @@ static VALUE Fiber_mark_as_done(VALUE self) {
   return self;
 }
 
-VALUE Gyro_yield() {
+VALUE Gyro_await() {
   Gyro_ref_count_incr();
-  VALUE ret = Gyro_run();
+  VALUE ret = Gyro_run_next_fiber();
   Gyro_ref_count_decr();
   return ret;
 }
 
-VALUE Gyro_run() {
+VALUE Gyro_run_next_fiber() {
   while (1) {
     if (break_flag != 0) {
       return Qnil;
@@ -220,8 +226,9 @@ VALUE Gyro_run() {
     scheduled_tail = Qnil;
   }
 
-  if (rb_fiber_alive_p(next_fiber) != Qtrue)
+  if (rb_fiber_alive_p(next_fiber) != Qtrue) {
     return Qnil;
+  }
 
   // run next fiber
   VALUE value = rb_ivar_get(next_fiber, ID_scheduled_value);

data/ext/gyro/gyro.h

@@ -15,8 +15,8 @@ enum {
 // void Gyro_del_watcher_ref(VALUE obj);
 VALUE Gyro_snooze(VALUE self);
 
-VALUE Gyro_run();
-VALUE Gyro_yield();
+VALUE Gyro_run_next_fiber();
+VALUE Gyro_await();
 void Gyro_schedule_fiber(VALUE fiber, VALUE value);
 
 int Gyro_ref_count();

data/ext/gyro/io.c

@@ -123,7 +123,7 @@ VALUE Gyro_IO_await(VALUE self) {
   io->fiber = rb_fiber_current();
   io->active = 1;
   ev_io_start(EV_DEFAULT, &io->ev_io);
-  ret = Gyro_yield();
+  ret = Gyro_await();
 
   // make sure io watcher is stopped
   io->fiber = Qnil;
@@ -134,7 +134,7 @@ VALUE Gyro_IO_await(VALUE self) {
 
   // fiber is resumed, check if resumed value is an exception
   if (RTEST(rb_obj_is_kind_of(ret, rb_eException))) {
-    return rb_funcall(ret, ID_raise, 1, ret);
+    return rb_funcall(rb_mKernel, ID_raise, 1, ret);
   }
   else {
     return Qnil;

data/ext/gyro/signal.c

@@ -4,7 +4,7 @@ struct Gyro_Signal {
   struct  ev_signal ev_signal;
   int     active;
   int     signum;
-  VALUE   callback;
+  VALUE   fiber;
 };
 
 static VALUE cGyro_Signal = Qnil;
@@ -18,8 +18,7 @@ static size_t Gyro_Signal_size(const void *ptr);
 /* Methods */
 static VALUE Gyro_Signal_initialize(VALUE self, VALUE sig);
 
-static VALUE Gyro_Signal_start(VALUE self);
-static VALUE Gyro_Signal_stop(VALUE self);
+static VALUE Gyro_Signal_await(VALUE self);
 
 void Gyro_Signal_callback(struct ev_loop *ev_loop, struct ev_signal *signal, int revents);
 
@@ -29,8 +28,7 @@ void Init_Gyro_Signal() {
   rb_define_alloc_func(cGyro_Signal, Gyro_Signal_allocate);
 
   rb_define_method(cGyro_Signal, "initialize", Gyro_Signal_initialize, 1);
-  rb_define_method(cGyro_Signal, "start", Gyro_Signal_start, 0);
-  rb_define_method(cGyro_Signal, "stop", Gyro_Signal_stop, 0);
+  rb_define_method(cGyro_Signal, "await", Gyro_Signal_await, 0);
 }
 
 static const rb_data_type_t Gyro_Signal_type = {
@@ -47,8 +45,8 @@ static VALUE Gyro_Signal_allocate(VALUE klass) {
 
 static void Gyro_Signal_mark(void *ptr) {
   struct Gyro_Signal *signal = ptr;
-  if (signal->callback != Qnil) {
-    rb_gc_mark(signal->callback);
+  if (signal->fiber != Qnil) {
+    rb_gc_mark(signal->fiber);
   }
 }
 
@@ -72,15 +70,11 @@ static VALUE Gyro_Signal_initialize(VALUE self, VALUE sig) {
   GetGyro_Signal(self, signal);
   signal->signum = NUM2INT(signum);
 
-  if (rb_block_given_p()) {
-    signal->callback = rb_block_proc();
-  }
-
   ev_signal_init(&signal->ev_signal, Gyro_Signal_callback, signal->signum);
 
-  signal->active = 1;
-  Gyro_ref_count_incr();
-  ev_signal_start(EV_DEFAULT, &signal->ev_signal);
+  // signal->active = 1;
+  // Gyro_ref_count_incr();
+  // ev_signal_start(EV_DEFAULT, &signal->ev_signal);
 
   return Qnil;
 }
@@ -88,33 +82,37 @@ static VALUE Gyro_Signal_initialize(VALUE self, VALUE sig) {
 void Gyro_Signal_callback(struct ev_loop *ev_loop, struct ev_signal *ev_signal, int revents) {
   struct Gyro_Signal *signal = (struct Gyro_Signal*)ev_signal;
 
-  if (signal->callback != Qnil) {
-    rb_funcall(signal->callback, ID_call, 1, INT2NUM(signal->signum));
+  if (signal->fiber != Qnil) {
+    VALUE fiber = signal->fiber;
+
+    ev_signal_stop(EV_DEFAULT, ev_signal);
+    signal->active = 0;
+    signal->fiber = Qnil;
+    Gyro_schedule_fiber(fiber, INT2NUM(signal->signum));
   }
 }
 
-static VALUE Gyro_Signal_start(VALUE self) {
+static VALUE Gyro_Signal_await(VALUE self) {
   struct Gyro_Signal *signal;
+  VALUE ret;
+  
   GetGyro_Signal(self, signal);
 
-  if (!signal->active) {
-    Gyro_ref_count_incr();
-    ev_signal_start(EV_DEFAULT, &signal->ev_signal);
-    signal->active = 1;
-  }
-
-  return self;
-}
+  signal->fiber = rb_fiber_current();
+  signal->active = 1;
+  ev_signal_start(EV_DEFAULT, &signal->ev_signal);
 
-static VALUE Gyro_Signal_stop(VALUE self) {
-  struct Gyro_Signal *signal;
-  GetGyro_Signal(self, signal);
+  ret = Gyro_await();
 
-  if (signal->active) {
-    Gyro_ref_count_decr();
-    ev_signal_stop(EV_DEFAULT, &signal->ev_signal);
-    signal->active = 0;
+  // fiber is resumed, check if resumed value is an exception
+  signal->fiber = Qnil;
+  if (RTEST(rb_obj_is_kind_of(ret, rb_eException))) {
+    if (signal->active) {
+      signal->active = 0;
+      ev_signal_stop(EV_DEFAULT, &signal->ev_signal);
+    }
+    return rb_funcall(rb_mKernel, ID_raise, 1, ret);
   }
-
-  return self;
-}
+  else
+    return ret;
+}

data/ext/gyro/timer.c

@@ -6,7 +6,6 @@ struct Gyro_Timer {
   double  after;
   double  repeat;
   VALUE   self;
-  VALUE   callback;
   VALUE   fiber;
 };
 
@@ -21,9 +20,6 @@ static size_t Gyro_Timer_size(const void *ptr);
 /* Methods */
 static VALUE Gyro_Timer_initialize(VALUE self, VALUE after, VALUE repeat);
 
-static VALUE Gyro_Timer_start(VALUE self);
-static VALUE Gyro_Timer_stop(VALUE self);
-static VALUE Gyro_Timer_reset(VALUE self);
 static VALUE Gyro_Timer_await(VALUE self);
 
 void Gyro_Timer_callback(struct ev_loop *ev_loop, struct ev_timer *timer, int revents);
@@ -34,9 +30,6 @@ void Init_Gyro_Timer() {
   rb_define_alloc_func(cGyro_Timer, Gyro_Timer_allocate);
 
   rb_define_method(cGyro_Timer, "initialize", Gyro_Timer_initialize, 2);
-  rb_define_method(cGyro_Timer, "start", Gyro_Timer_start, 0);
-  rb_define_method(cGyro_Timer, "stop", Gyro_Timer_stop, 0);
-  rb_define_method(cGyro_Timer, "reset", Gyro_Timer_reset, 0);
   rb_define_method(cGyro_Timer, "await", Gyro_Timer_await, 0);
 }
 
@@ -54,9 +47,6 @@ static VALUE Gyro_Timer_allocate(VALUE klass) {
 
 static void Gyro_Timer_mark(void *ptr) {
   struct Gyro_Timer *timer = ptr;
-  if (timer->callback != Qnil) {
-    rb_gc_mark(timer->callback);
-  }
   if (timer->fiber != Qnil) {
     rb_gc_mark(timer->fiber);
   }
@@ -83,7 +73,6 @@ static VALUE Gyro_Timer_initialize(VALUE self, VALUE after, VALUE repeat) {
   GetGyro_Timer(self, timer);
 
   timer->self     = self;
-  timer->callback = Qnil;
   timer->fiber    = Qnil;
   timer->after    = NUM2DBL(after);
   timer->repeat   = NUM2DBL(repeat);
@@ -105,63 +94,9 @@ void Gyro_Timer_callback(struct ev_loop *ev_loop, struct ev_timer *ev_timer, int
     VALUE fiber = timer->fiber;
     VALUE resume_value = DBL2NUM(timer->after);
 
-    ev_timer_stop(EV_DEFAULT, ev_timer);
-    timer->active = 0;
     timer->fiber = Qnil;
     Gyro_schedule_fiber(fiber, resume_value);
   }
-  else if (timer->callback != Qnil) {
-    Gyro_ref_count_decr();
-    rb_funcall(timer->callback, ID_call, 1, Qtrue);
-  }
-}
-
-static VALUE Gyro_Timer_start(VALUE self) {
-  struct Gyro_Timer *timer;
-  GetGyro_Timer(self, timer);
-
-  if (rb_block_given_p()) {
-    Gyro_ref_count_incr();
-    timer->callback = rb_block_proc();
-  }
-
-  if (!timer->active) {
-    ev_timer_start(EV_DEFAULT, &timer->ev_timer);
-    timer->active = 1;
-  }
-
-  return self;
-}
-
-static VALUE Gyro_Timer_stop(VALUE self) {
-  struct Gyro_Timer *timer;
-  GetGyro_Timer(self, timer);
-
-  if (timer->active) {
-    ev_timer_stop(EV_DEFAULT, &timer->ev_timer);
-    timer->active = 0;
-  }
-
-  return self;
-}
-
-static VALUE Gyro_Timer_reset(VALUE self) {
-  struct Gyro_Timer *timer;
-  int prev_active;
-  GetGyro_Timer(self, timer);
-
-  prev_active = timer->active;
-
-  if (prev_active) {
-    ev_timer_stop(EV_DEFAULT, &timer->ev_timer);
-  }
-  ev_timer_set(&timer->ev_timer, timer->after, timer->repeat);
-  ev_timer_start(EV_DEFAULT, &timer->ev_timer);
-  if (!prev_active) {
-    timer->active = 1;
-  }
-
-  return self;
 }
 
 static VALUE Gyro_Timer_await(VALUE self) {
@@ -171,19 +106,17 @@ static VALUE Gyro_Timer_await(VALUE self) {
   GetGyro_Timer(self, timer);
 
   timer->fiber = rb_fiber_current();
-  timer->active = 1;
-  ev_timer_start(EV_DEFAULT, &timer->ev_timer);
+  if (timer->active != 1) {
+    timer->active = 1;
+    ev_timer_start(EV_DEFAULT, &timer->ev_timer);
+  }
 
-  ret = Gyro_yield();
+  ret = Gyro_await();
 
   // fiber is resumed, check if resumed value is an exception
   timer->fiber = Qnil;
   if (RTEST(rb_obj_is_kind_of(ret, rb_eException))) {
-    if (timer->active) {
-      timer->active = 0;
-      ev_timer_stop(EV_DEFAULT, &timer->ev_timer);
-    }
-    return rb_funcall(ret, ID_raise, 1, ret);
+    return rb_funcall(rb_mKernel, ID_raise, 1, ret);
   }
   else
     return ret;

data/lib/polyphony.rb

@@ -12,6 +12,9 @@ import './polyphony/extensions/io'
 
 # Main Polyphony API
 module Polyphony
+  GlobalAPI = import './polyphony/core/global_api'
+  ::Object.include GlobalAPI
+
   exceptions = import './polyphony/core/exceptions'
   Cancel        = exceptions::Cancel
   MoveOn        = exceptions::MoveOn
@@ -56,13 +59,6 @@ module Polyphony
       pid = Kernel.fork do
         setup_forked_process
         block.()
-
-        # We cannot simply depend on the at_exit block (see polyphony/auto_run)
-        # to yield to the reactor fiber. Doing that will raise a FiberError
-        # complaining: "fiber called across stack rewinding barrier". Apparently
-        # this is a bug in Ruby, so the workaround is to yield just before
-        # exiting.
-        suspend
       end
       Gyro.reset!
       pid
@@ -71,14 +67,16 @@ module Polyphony
     def reset!
       # Fiber.root.scheduled_value = nil
       Gyro.reset!
+      Coprocess.map.clear
+      Fiber.set_root_fiber
     end
 
     private
 
     def setup_forked_process
+      Coprocess.map.delete Fiber.root
       Gyro.post_fork
       Fiber.set_root_fiber
-      Fiber.current.coprocess = Coprocess.new(Fiber.current)
     end
   end
 end

data/lib/polyphony/core/cancel_scope.rb

@@ -10,6 +10,8 @@ Exceptions = import('./exceptions')
 class CancelScope
   def initialize(opts = {}, &block)
     @opts = opts
+    @fibers = []
+    start_timeout_waiter if @opts[:timeout]
     call(&block) if block
   end
 
@@ -19,33 +21,49 @@ class CancelScope
 
   def cancel!
     @cancelled = true
-    @fiber.cancelled = true
-    @fiber.transfer error_class.new(self, @opts[:value])
+    @fibers.each do |f|
+      f.cancelled = true
+      f.schedule error_class.new(self, @opts[:value])
+    end
+    @on_cancel&.()
   end
 
-  def start_timeout
-    @timeout = Gyro::Timer.new(@opts[:timeout], 0)
-    @timeout.start { cancel! }
+  def start_timeout_waiter
+    @timeout_waiter = spin do
+      sleep @opts[:timeout]
+      @timeout_waiter = nil
+      cancel!
+    end
   end
 
-  def reset_timeout
-    @timeout.reset
+  def stop_timeout_waiter
+    return unless @timeout_waiter
+
+    @timeout_waiter.stop
+    @timeout_waiter = nil
   end
 
-  def disable
-    @timeout&.stop
+  def reset_timeout
+    return unless @timeout_waiter
+
+    @timeout_waiter.stop
+    start_timeout_waiter
   end
 
+  # def disable
+  #   @timeout&.stop
+  # end
+
   def call
-    start_timeout if @opts[:timeout]
-    @fiber = Fiber.current
-    @fiber.cancelled = nil
+    fiber = Fiber.current
+    @fibers << fiber
+    fiber.cancelled = nil
     yield self
   rescue Exceptions::MoveOn => e
     e.scope == self ? e.value : raise(e)
   ensure
-    @timeout&.stop
-    protect(&@on_cancel) if @cancelled && @on_cancel
+    @fibers.delete fiber
+    stop_timeout_waiter if @fibers.empty? && @timeout_waiter
   end
 
   def on_cancel(&block)
@@ -55,11 +73,4 @@ class CancelScope
   def cancelled?
     @cancelled
   end
-
-  def protect(&block)
-    @fiber.cancelled = false
-    block.()
-  ensure
-    @fiber.cancelled = @cancelled
-  end
 end