polyphony 0.34 → 0.41

data/ext/{gyro → polyphony}/socket.c

@@ -1,4 +1,4 @@
-#include "gyro.h"
+#include "polyphony.h"
 #include <sys/socket.h>
 
 static VALUE cTCPSocket;
@@ -71,8 +71,8 @@ static VALUE BasicSocket_send(int argc, VALUE *argv, VALUE sock) {
   ssize_t n;
   rb_blocking_function_t *func;
   const char *funcname;
-  VALUE write_watcher = Qnil;
-  
+  VALUE agent = Qnil;
+
   rb_scan_args(argc, argv, "21", &arg.mesg, &flags, &to);
 
   StringValue(arg.mesg);
@@ -94,10 +94,9 @@ static VALUE BasicSocket_send(int argc, VALUE *argv, VALUE sock) {
   arg.fd = fptr->fd;
   arg.flags = NUM2INT(flags);
   while ((n = (ssize_t)func(&arg)) < 0) {
-    if (write_watcher == Qnil) {
-      write_watcher = IO_write_watcher(sock);
-    }
-    Gyro_IO_await(write_watcher);
+    if (NIL_P(agent))
+      agent = rb_ivar_get(rb_thread_current(), ID_ivar_agent);
+    LibevAgent_wait_io(agent, sock, Qtrue);
   }
   return SSIZET2NUM(n);
 }
@@ -113,7 +112,7 @@ static VALUE BasicSocket_recv(int argc, VALUE *argv, VALUE sock) {
   rb_io_t *fptr;
   long n;
   int shrinkable;
-  VALUE read_watcher = Qnil;
+  VALUE agent = Qnil;
 
 
   VALUE str = argc >= 3 ? argv[2] : Qnil;
@@ -132,9 +131,9 @@ static VALUE BasicSocket_recv(int argc, VALUE *argv, VALUE sock) {
     if (n < 0) {
       int e = errno;
       if (e == EWOULDBLOCK || e == EAGAIN) {
-        if (read_watcher == Qnil)
-          read_watcher = IO_read_watcher(sock);
-        Gyro_IO_await(read_watcher);
+        if (NIL_P(agent))
+          agent = rb_ivar_get(rb_thread_current(), ID_ivar_agent);
+        LibevAgent_wait_io(agent, sock, Qnil);
       }
       else
         rb_syserr_fail(e, strerror(e));
@@ -158,7 +157,7 @@ static VALUE Socket_accept(VALUE sock) {
   int fd;
   struct sockaddr addr;
   socklen_t len = (socklen_t)sizeof addr;
-  VALUE read_watcher = Qnil;
+  VALUE agent = Qnil;
 
   GetOpenFile(sock, fptr);
   rb_io_set_nonblock(fptr);
@@ -169,9 +168,9 @@ static VALUE Socket_accept(VALUE sock) {
     if (fd < 0) {
       int e = errno;
       if (e == EWOULDBLOCK || e == EAGAIN) {
-        if (read_watcher == Qnil)
-          read_watcher = IO_read_watcher(sock);
-        Gyro_IO_await(read_watcher);
+        if (NIL_P(agent))
+          agent = rb_ivar_get(rb_thread_current(), ID_ivar_agent);
+        LibevAgent_wait_io(agent, sock, Qnil);
       }
       else
         rb_syserr_fail(e, strerror(e));
@@ -197,15 +196,18 @@ static VALUE Socket_accept(VALUE sock) {
 }
 
 void Init_Socket() {
+  VALUE cBasicSocket;
+  VALUE cSocket;
+  
   rb_require("socket");
-  VALUE cBasicSocket = rb_const_get(rb_cObject, rb_intern("BasicSocket"));
+  cBasicSocket = rb_const_get(rb_cObject, rb_intern("BasicSocket"));
 
   rb_define_method(cBasicSocket, "send", BasicSocket_send, -1);
   rb_define_method(cBasicSocket, "recv", BasicSocket_recv, -1);
 
-  VALUE cSocket = rb_const_get(rb_cObject, rb_intern("Socket"));
-  
-  rb_define_method(cSocket, "accept", Socket_accept, 0);
+  cSocket = rb_const_get(rb_cObject, rb_intern("Socket"));
+
+  // rb_define_method(cSocket, "accept", Socket_accept, 0);
 
   cTCPSocket = rb_const_get(rb_cObject, rb_intern("TCPSocket"));
 }

data/ext/{gyro → polyphony}/thread.c

@@ -1,64 +1,26 @@
-#include "gyro.h"
-
-static VALUE cQueue;
-
-static ID ID_create_event_selector;
-static ID ID_empty;
-static ID ID_fiber_ref_count;
-static ID ID_ivar_event_selector_proc;
-static ID ID_ivar_event_selector;
-static ID ID_ivar_join_wait_queue;
-static ID ID_ivar_main_fiber;
-static ID ID_ivar_result;
-static ID ID_ivar_terminated;
-static ID ID_pop;
-static ID ID_push;
-static ID ID_run_queue;
-// static ID ID_run_queue_head;
-// static ID ID_run_queue_tail;
-static ID ID_runnable_next;
-static ID ID_stop;
-
-VALUE event_selector_factory_proc(RB_BLOCK_CALL_FUNC_ARGLIST(args, klass)) {
-  return rb_funcall(klass, ID_new, 1, rb_ary_entry(args, 0));
-}
-
-static VALUE Thread_event_selector_set_proc(VALUE self, VALUE proc) {
-  if (!rb_obj_is_proc(proc)) {
-    proc = rb_proc_new(event_selector_factory_proc, proc);
-  }
-  rb_ivar_set(self, ID_ivar_event_selector_proc, proc);
-  return self;
-}
-
-static VALUE Thread_create_event_selector(VALUE self, VALUE thread) {
-  VALUE selector_proc = rb_ivar_get(self, ID_ivar_event_selector_proc);
-  if (selector_proc == Qnil) {
-    rb_raise(rb_eRuntimeError, "No event_selector_proc defined");
-  }
-
-  return rb_funcall(selector_proc, ID_call, 1, thread);
-}
+#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;
 
 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));
-  VALUE queue = rb_ary_new();
+  queue = rb_ary_new();
   rb_ivar_set(self, ID_run_queue, queue);
-  VALUE selector = rb_funcall(rb_cThread, ID_create_event_selector, 1, self);
-  rb_ivar_set(self, ID_ivar_event_selector, selector);
-
-  return self;
-}
-
-static VALUE Thread_stop_event_selector(VALUE self) {
-  VALUE selector = rb_ivar_get(self, ID_ivar_event_selector);
-  if (selector != Qnil) {
-    rb_funcall(selector, ID_stop, 0);
-  }
-  // Nullify the selector in order to prevent running the
-  // selector after the thread is done running.
-  rb_ivar_set(self, ID_ivar_event_selector, Qnil);
 
   return self;
 }
@@ -90,23 +52,24 @@ static VALUE SYM_scheduled_fibers;
 static VALUE SYM_pending_watchers;
 
 static VALUE Thread_fiber_scheduling_stats(VALUE self) {
+  VALUE agent = rb_ivar_get(self,ID_ivar_agent);
   VALUE stats = rb_hash_new();
   VALUE queue = rb_ivar_get(self, ID_run_queue);
-  VALUE selector = rb_ivar_get(self, ID_ivar_event_selector);
-  
+  long pending_count;
+
   long scheduled_count = RARRAY_LEN(queue);
   rb_hash_aset(stats, SYM_scheduled_fibers, INT2NUM(scheduled_count));
 
-  long pending_count = Gyro_Selector_pending_count(selector);
+  pending_count = LibevAgent_pending_count(agent);
   rb_hash_aset(stats, SYM_pending_watchers, INT2NUM(pending_count));
 
   return stats;
 }
 
 VALUE Thread_schedule_fiber(VALUE self, VALUE fiber, VALUE value) {
-  if (rb_fiber_alive_p(fiber) != Qtrue) {
-    return self;
-  }
+  VALUE queue;
+
+  if (rb_fiber_alive_p(fiber) != Qtrue) return self;
 
   FIBER_TRACE(3, SYM_fiber_schedule, fiber, value);
   // if fiber is already scheduled, just set the scheduled value, then return
@@ -115,7 +78,7 @@ VALUE Thread_schedule_fiber(VALUE self, VALUE fiber, VALUE value) {
     return self;
   }
 
-  VALUE queue = rb_ivar_get(self, ID_run_queue);
+  queue = rb_ivar_get(self, ID_run_queue);
   rb_ary_push(queue, fiber);
   rb_ivar_set(fiber, ID_runnable, Qtrue);
 
@@ -125,22 +88,21 @@ VALUE Thread_schedule_fiber(VALUE self, VALUE fiber, VALUE value) {
     // event selector. Otherwise it's gonna be stuck waiting for an event to
     // happen, not knowing that it there's already a fiber ready to run in its
     // run queue.
-    VALUE selector = rb_ivar_get(self, ID_ivar_event_selector);
-    if (selector != Qnil) {
-      Gyro_Selector_break_out_of_ev_loop(selector);
-    }
+    VALUE agent = rb_ivar_get(self,ID_ivar_agent);
+    LibevAgent_break(agent);
   }
   return self;
 }
 
 VALUE Thread_schedule_fiber_with_priority(VALUE self, VALUE fiber, VALUE value) {
-  if (rb_fiber_alive_p(fiber) != Qtrue) {
-    return self;
-  }
+  VALUE queue;
+
+  if (rb_fiber_alive_p(fiber) != Qtrue) return self;
+
   FIBER_TRACE(3, SYM_fiber_schedule, fiber, value);
   rb_ivar_set(fiber, ID_runnable_value, value);
 
-  VALUE queue = rb_ivar_get(self, ID_run_queue);
+  queue = rb_ivar_get(self, ID_run_queue);
 
   // if fiber is already scheduled, remove it from the run queue
   if (rb_ivar_get(fiber, ID_runnable) != Qnil) {
@@ -155,56 +117,49 @@ VALUE Thread_schedule_fiber_with_priority(VALUE self, VALUE fiber, VALUE value)
   if (rb_thread_current() != self) {
     // if the fiber scheduling is done across threads, we need to make sure the
     // target thread is woken up in case it is in the middle of running its
-    // event selector. Otherwise it's gonna be stuck waiting for an event to
+    // event loop. Otherwise it's gonna be stuck waiting for an event to
     // happen, not knowing that it there's already a fiber ready to run in its
     // run queue.
-    VALUE selector = rb_ivar_get(self, ID_ivar_event_selector);
-    if (selector != Qnil) {
-      Gyro_Selector_break_out_of_ev_loop(selector);
-    }
+    VALUE agent = rb_ivar_get(self, ID_ivar_agent);
+    LibevAgent_break(agent);
   }
   return self;
 }
 
 VALUE Thread_switch_fiber(VALUE self) {
   VALUE current_fiber = rb_fiber_current();
+  VALUE queue = rb_ivar_get(self, ID_run_queue);
+  VALUE next_fiber;
+  VALUE value;
+  VALUE agent = rb_ivar_get(self, ID_ivar_agent);
+  int ref_count;
+
   if (__tracing_enabled__) {
     if (rb_ivar_get(current_fiber, ID_ivar_running) != Qfalse) {
       rb_funcall(rb_cObject, ID_fiber_trace, 2, SYM_fiber_switchpoint, current_fiber);
     }
   }
-  VALUE queue = rb_ivar_get(self, ID_run_queue);
-  VALUE selector = rb_ivar_get(self, ID_ivar_event_selector);
-
-  VALUE next_fiber;
 
   while (1) {
+    ref_count = Thread_fiber_ref_count(self);
     next_fiber = rb_ary_shift(queue);
-    // if (break_flag != 0) {
-    //   return Qnil;
-    // }
-    int ref_count = Thread_fiber_ref_count(self);
     if (next_fiber != Qnil) {
       if (ref_count > 0) {
         // this mechanism prevents event starvation in case the run queue never
         // empties
-        Gyro_Selector_run_no_wait(selector, current_fiber, RARRAY_LEN(queue));
+        LibevAgent_poll(agent, Qtrue, current_fiber, queue);
       }
       break;
     }
-    if (ref_count == 0) {
-      break;
-    }
+    if (ref_count == 0) break;
 
-    Gyro_Selector_run(selector, current_fiber);
+    LibevAgent_poll(agent, Qnil, current_fiber, queue);
   }
 
-  if (next_fiber == Qnil) {
-    return Qnil;
-  }
+  if (next_fiber == Qnil) return Qnil;
 
   // run next fiber
-  VALUE value = rb_ivar_get(next_fiber, ID_runnable_value);
+  value = rb_ivar_get(next_fiber, ID_runnable_value);
   FIBER_TRACE(3, SYM_fiber_run, next_fiber, value);
 
   rb_ivar_set(next_fiber, ID_runnable, Qnil);
@@ -220,33 +175,23 @@ VALUE Thread_reset_fiber_scheduling(VALUE self) {
   return self;
 }
 
-VALUE Thread_post_fork(VALUE self) {
-  VALUE selector = rb_ivar_get(self, ID_ivar_event_selector);
-  Gyro_Selector_post_fork(selector);
-
-  return self;
-}
-
-VALUE Fiber_await() {
+VALUE Polyphony_switchpoint() {
+  VALUE ret;
   VALUE thread = rb_thread_current();
   Thread_ref(thread);
-  VALUE ret = Thread_switch_fiber(thread);
+  ret = Thread_switch_fiber(thread);
   Thread_unref(thread);
   RB_GC_GUARD(ret);
   return ret;
 }
 
-VALUE Thread_current_event_selector() {
-  return rb_ivar_get(rb_thread_current(), ID_ivar_event_selector);
-}
-
 VALUE Thread_fiber_break_out_of_ev_loop(VALUE self, VALUE fiber, VALUE resume_obj) {
-  VALUE selector = rb_ivar_get(self, ID_ivar_event_selector);
+  VALUE agent = rb_ivar_get(self, ID_ivar_agent);
   if (fiber != Qnil) {
     Thread_schedule_fiber_with_priority(self, fiber, resume_obj);
   }
 
-  if (Gyro_Selector_break_out_of_ev_loop(selector) == Qnil) {
+  if (LibevAgent_break(agent) == Qnil) {
     // we're not inside the ev_loop, so we just do a switchpoint
     Thread_switch_fiber(self);
   }
@@ -255,18 +200,10 @@ VALUE Thread_fiber_break_out_of_ev_loop(VALUE self, VALUE fiber, VALUE resume_ob
 }
 
 void Init_Thread() {
-  cQueue = rb_const_get(rb_cObject, rb_intern("Queue"));
-
-  rb_define_singleton_method(rb_cThread, "event_selector=", Thread_event_selector_set_proc, 1);
-  rb_define_singleton_method(rb_cThread, "create_event_selector", Thread_create_event_selector, 1);
-
   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, "post_fork", Thread_post_fork, 0);
-
   rb_define_method(rb_cThread, "setup_fiber_scheduling", Thread_setup_fiber_scheduling, 0);
-  rb_define_method(rb_cThread, "stop_event_selector", Thread_stop_event_selector, 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);
   rb_define_method(rb_cThread, "break_out_of_ev_loop", Thread_fiber_break_out_of_ev_loop, 2);
@@ -276,11 +213,10 @@ void Init_Thread() {
     Thread_schedule_fiber_with_priority, 2);
   rb_define_method(rb_cThread, "switch_fiber", Thread_switch_fiber, 0);
 
-  ID_create_event_selector    = rb_intern("create_event_selector");
+  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_event_selector      = rb_intern("@event_selector");
-  ID_ivar_event_selector_proc = rb_intern("@event_selector_proc");
+  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");

data/ext/{gyro → polyphony}/tracing.c

@@ -1,4 +1,4 @@
-#include "gyro.h"
+#include "polyphony.h"
 
 int __tracing_enabled__ = 0;
 

data/lib/polyphony.rb

@@ -1,50 +1,35 @@
 # frozen_string_literal: true
 
-require 'modulation/gem'
+require 'fiber'
+require_relative './polyphony_ext'
 
-export_default :Polyphony
+module Polyphony
+  # Map Queue to Libev queue implementation
+  Queue = LibevQueue
+end
 
-require 'fiber'
-require_relative './gyro_ext'
+require_relative './polyphony/extensions/core'
+require_relative './polyphony/extensions/thread'
+require_relative './polyphony/extensions/fiber'
+require_relative './polyphony/extensions/io'
 
-Thread.event_selector = Gyro::Selector
 Thread.current.setup_fiber_scheduling
+Thread.current.agent = Polyphony::LibevAgent.new
 
-import './polyphony/extensions/core'
-import './polyphony/extensions/thread'
-import './polyphony/extensions/fiber'
-import './polyphony/extensions/io'
+require_relative './polyphony/core/global_api'
+require_relative './polyphony/core/resource_pool'
+require_relative './polyphony/net'
+require_relative './polyphony/adapters/process'
+require_relative './polyphony/event'
 
 # 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
-  Restart   = exceptions::Restart
-  Terminate = exceptions::Terminate
-
-  Net = import './polyphony/net'
-
-  auto_import(
-    Channel:      './polyphony/core/channel',
-    FS:           './polyphony/adapters/fs',
-    Process:      './polyphony/adapters/process',
-    ResourcePool: './polyphony/core/resource_pool',
-    Sync:         './polyphony/core/sync',
-    ThreadPool:   './polyphony/core/thread_pool',
-    Throttler:    './polyphony/core/throttler',
-    Trace:        './polyphony/adapters/trace'
-  )
-
   class << self
     def wait_for_signal(sig)
       fiber = Fiber.current
-      Gyro.ref
+      Polyphony.ref
       old_trap = trap(sig) do
-        Gyro.unref
+        Polyphony.unref
         fiber.schedule(sig)
         trap(sig, old_trap)
       end
@@ -53,10 +38,10 @@ module Polyphony
 
     def fork(&block)
       Kernel.fork do
-        # Since the fiber doing the fork will become the main fiber of the
-        # forked process, we leave it behind by transferring to a new fiber
-        # created in the context of the forked process, which rescues *all*
-        # exceptions, including Interrupt and SystemExit.
+        # # Since the fiber doing the fork will become the main fiber of the
+        # # forked process, we leave it behind by transferring to a new fiber
+        # # created in the context of the forked process, which rescues *all*
+        # # exceptions, including Interrupt and SystemExit.
         spin_forked_block(&block).transfer
       end
     end
@@ -64,12 +49,13 @@ module Polyphony
     def spin_forked_block(&block)
       Fiber.new do
         run_forked_block(&block)
-        exit_forked_process
-      rescue ::SystemExit
-        exit_forked_process
+      rescue SystemExit
+        # fall through to ensure
       rescue Exception => e
         e.full_message
         exit!
+      ensure
+        exit_forked_process
       end
     end
 
@@ -81,9 +67,9 @@ module Polyphony
       trap('SIGTERM', 'DEFAULT')
       trap('SIGINT', 'DEFAULT')
 
-      Thread.current.post_fork
       Thread.current.setup
       Fiber.current.setup_main_fiber
+      Thread.current.agent.post_fork
 
       install_terminating_signal_handlers
 
@@ -91,14 +77,13 @@ module Polyphony
     end
 
     def exit_forked_process
+      terminate_threads
       Fiber.current.shutdown_all_children
+
       # Since fork could be called from any fiber, we explicitly call exit here.
       # Otherwise, the fiber might want to pass execution to another fiber that
       # previously transferred execution to the forking fiber, but doesn't exist
       # anymore...
-      #
-      # The call to exit will invoke the at_exit handler we use to terminate the
-      # (forked) main fiber's child fibers.
       exit
     end
 
@@ -118,6 +103,14 @@ module Polyphony
       install_terminating_signal_handler('SIGTERM', ::SystemExit)
       install_terminating_signal_handler('SIGINT', ::Interrupt)
     end
+
+    def terminate_threads
+      threads = Thread.list - [Thread.current]
+      return if threads.empty?
+
+      threads.each(&:kill)
+      threads.each(&:join)
+    end
   end
 end