polyphony 0.39 → 0.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3be3a6ec277c0c06e1d4b071f7fcee1229bbdde20d6b78b5b585ca9ac5624cd
-  data.tar.gz: 27f3e920372dc8ab8e40f07b72444ba08813533e2912c8400fe28ad50ed756c2
+  metadata.gz: 2fac2ba159f62bc767c1c022a9ac84e0d682e9dc1cbb10f53e92ba53da376745
+  data.tar.gz: 8d43be97359735d5b7ac6b9867716c06c420385bb41f14916edd0a2d2bbca454
 SHA512:
-  metadata.gz: 6d4267e177eda276b2d643e0262d1475c9f9f0ebaed2dd8573c245127b618dab11b00c05e0ef58ba2f5b8fd88b127feb1cc0f94390e27c66ae8857d0a5eb1a65
-  data.tar.gz: 1006b8aa742a9c38bd39512c7f9bfbe3c33b0f07ee1b2e262d8f5f140114066599b9444726c3e9c8cb998326a779da8d14d159ebcf5df226f02eedaa78530f98
+  metadata.gz: 0350c4dbee7ad72ba68dfff4fc431870481f43a763d9e265e05ade0ce9545456adef2a79c5efd98ce7fc28b2314ab5558a9e69f9e9ef92759e5ae320c78435be
+  data.tar.gz: 7c7774de233962a1b06bac02623a6127f9b716e36852bc6e5849227db80fc0e910549756c83441f6d40dd75a22c26253fcfeef7e50d62482c1cc7603f6c4b2f3

data/CHANGELOG.md

@@ -1,6 +1,6 @@
-## 0.39 2020-04-13
+## 0.40 2020-05-04
 
-* Prevent timer scheduling a nil fiber
+* More improvements to stability after fork
 
 ## 0.38 2020-04-13
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    polyphony (0.39)
+    polyphony (0.40)
 
 GEM
   remote: https://rubygems.org/
@@ -78,7 +78,7 @@ GEM
       ast (~> 2.4.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    pg (1.1.3)
+    pg (1.1.4)
     public_suffix (4.0.3)
     rainbow (3.0.0)
     rake (12.3.3)
@@ -127,7 +127,7 @@ DEPENDENCIES
   localhost (= 1.1.4)
   minitest (= 5.13.0)
   minitest-reporters (= 1.4.2)
-  pg (= 1.1.3)
+  pg (= 1.1.4)
   polyphony!
   rake-compiler (= 1.0.5)
   redis (= 4.1.0)

data/README.md

@@ -1,5 +1,6 @@
 # Polyphony - Fine-Grained Concurrency for Ruby
 
+
 [![Gem Version](https://badge.fury.io/rb/polyphony.svg)](http://rubygems.org/gems/polyphony)
 [![Modulation Test](https://github.com/digital-fabric/polyphony/workflows/Tests/badge.svg)](https://github.com/digital-fabric/polyphony/actions?query=workflow%3ATests)
 [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/digital-fabric/polyphony/blob/master/LICENSE)
@@ -46,4 +47,4 @@ The complete documentation for Polyphony could be found on the
 
 Issues and pull requests will be gladly accepted. Please use the [Polyphony git
 repository](https://github.com/digital-fabric/polyphony) as your primary point
-of departure for contributing.
+of departure for contributing.

data/examples/io/tunnel.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony'
+
+Ports = ARGV[0..1]
+EndPoints = []
+
+def log(msg)
+  puts "#{Time.now.strftime('%Y-%m-%d %H:%M:%S.%3N')} #{msg}"
+end
+
+def endpoint_loop(idx, peer_idx)
+  port = Ports[idx]
+  server = Polyphony::Net.tcp_listen(
+    '0.0.0.0',
+    port,
+    reuse_addr: true
+  ) 
+  # server = TCPServer.open('0.0.0.0', port)
+  log "Listening on port #{port}"
+  loop do
+    conn = server.accept
+    conn.binmode
+    EndPoints[idx] = conn
+    log "Client connected on port #{port} (#{conn.remote_address.inspect})"
+    while data = conn.readpartial(8192)
+      peer = EndPoints[peer_idx]
+      if peer
+        peer << data
+        log "#{idx} => #{peer_idx} #{data.inspect}"
+      else
+        log "#{idx}: #{data.inspect}"
+      end
+    end
+    EndPoints[idx] = nil
+    log "Connection closed on port #{port}"
+  rescue => e
+    log "Error on port #{port}: #{e.inspect}"
+  end
+end
+
+spin { endpoint_loop(0, 1) }
+spin { endpoint_loop(1, 0) }
+
+log "Tunneling port #{Ports[0]} to port #{Ports[1]}..."
+sleep
+

data/ext/gyro/async.c

@@ -1,41 +1,23 @@
 #include "gyro.h"
 
 struct Gyro_Async {
-  struct  ev_async ev_async;
-  struct  ev_loop *ev_loop;
-  int     active;
-  VALUE   self;
-  VALUE   fiber;
-  VALUE   value;
-  VALUE   selector;
+  GYRO_WATCHER_DECL(ev_async);
+  VALUE value;
 };
 
 VALUE cGyro_Async = Qnil;
 
 static void Gyro_Async_mark(void *ptr) {
   struct Gyro_Async *async = ptr;
-  if (async->fiber != Qnil) {
-    rb_gc_mark(async->fiber);
-  }
-  if (async->value != Qnil) {
-    rb_gc_mark(async->value);
-  }
-  if (async->selector != Qnil) {
-    rb_gc_mark(async->selector);
-  }
+  
+  GYRO_WATCHER_MARK(async);
+  if (async->value != Qnil) rb_gc_mark(async->value);
 }
 
 static void Gyro_Async_free(void *ptr) {
   struct Gyro_Async *async = ptr;
-  switch (async->active) {
-    case GYRO_WATCHER_POST_FORK:
-      return;
-    case 1:
-      ev_clear_pending(async->ev_loop, &async->ev_async);
-      ev_async_stop(async->ev_loop, &async->ev_async);
-    default:
-      xfree(async);
-  }
+  
+  GYRO_WATCHER_FREE(async);
 }
 
 static size_t Gyro_Async_size(const void *ptr) {
@@ -50,6 +32,7 @@ static const rb_data_type_t Gyro_Async_type = {
 
 static VALUE Gyro_Async_allocate(VALUE klass) {
   struct Gyro_Async *async = ALLOC(struct Gyro_Async);
+  
   return TypedData_Wrap_Struct(klass, &Gyro_Async_type, async);
 }
 
@@ -90,13 +73,8 @@ static VALUE Gyro_Async_initialize(VALUE self) {
   struct Gyro_Async *async;
   GetGyro_Async(self, async);
 
-  async->self = self;
-  async->fiber = Qnil;
+  GYRO_WATCHER_INITIALIZE(async, self);
   async->value = Qnil;
-  async->selector = Qnil;
-  async->active = 0;
-  async->ev_loop = 0;
-
   ev_async_init(&async->ev_async, Gyro_Async_callback);
 
   return Qnil;
@@ -119,10 +97,11 @@ static VALUE Gyro_Async_signal(int argc, VALUE *argv, VALUE self) {
 
 VALUE Gyro_Async_await(VALUE self) {
   struct Gyro_Async *async;
+  VALUE ret;
   GetGyro_Async(self, async);
 
   async_activate(async);
-  VALUE ret = Gyro_switchpoint();
+  ret = Gyro_switchpoint();
   async_deactivate(async);
 
   TEST_RESUME_EXCEPTION(ret);
@@ -130,23 +109,15 @@ VALUE Gyro_Async_await(VALUE self) {
   return ret;
 }
 
-VALUE Gyro_Async_deactivate_post_fork(VALUE self) {
-  struct Gyro_Async *async;
-  GetGyro_Async(self, async);
-
-  if (async->active)
-    async->active = GYRO_WATCHER_POST_FORK;
-  return self;
-}
-
 VALUE Gyro_Async_await_no_raise(VALUE self) {
   struct Gyro_Async *async;
+  VALUE ret;
   GetGyro_Async(self, async);
 
   async_activate(async);
-  VALUE ret = Gyro_switchpoint();
+  ret = Gyro_switchpoint();
   async_deactivate(async);
-  
+
   RB_GC_GUARD(ret);
   return ret;
 }
@@ -157,6 +128,5 @@ void Init_Gyro_Async() {
 
   rb_define_method(cGyro_Async, "initialize", Gyro_Async_initialize, 0);
   rb_define_method(cGyro_Async, "await", Gyro_Async_await, 0);
-  rb_define_method(cGyro_Async, "deactivate_post_fork", Gyro_Async_deactivate_post_fork, 0);
   rb_define_method(cGyro_Async, "signal", Gyro_Async_signal, -1);
-}
+}

data/ext/gyro/child.c

@@ -1,38 +1,20 @@
 #include "gyro.h"
 
 struct Gyro_Child {
-  struct  ev_child ev_child;
-  struct  ev_loop *ev_loop;
-  int     active;
-  int     pid;
-  VALUE   self;
-  VALUE   fiber;
-  VALUE   selector;
+  GYRO_WATCHER_DECL(ev_child);
+  int pid;
 };
 
 static VALUE cGyro_Child = Qnil;
 
 static void Gyro_Child_mark(void *ptr) {
   struct Gyro_Child *child = ptr;
-  if (child->fiber != Qnil) {
-    rb_gc_mark(child->fiber);
-  }
-  if (child->selector != Qnil) {
-    rb_gc_mark(child->selector);
-  }
+  GYRO_WATCHER_MARK(child);
 }
 
 static void Gyro_Child_free(void *ptr) {
   struct Gyro_Child *child = ptr;
-  switch (child->active) {
-    case GYRO_WATCHER_POST_FORK:
-      return;
-    case 1:
-      ev_clear_pending(child->ev_loop, &child->ev_child);
-      ev_child_stop(child->ev_loop, &child->ev_child);
-    default:
-      xfree(child);
-  }
+  GYRO_WATCHER_FREE(child);
 }
 
 static size_t Gyro_Child_size(const void *ptr) {
@@ -96,14 +78,8 @@ static VALUE Gyro_Child_initialize(VALUE self, VALUE pid) {
   struct Gyro_Child *child;
 
   GetGyro_Child(self, child);
-
-  child->self       = self;
-  child->fiber      = Qnil;
-  child->selector   = Qnil;
-  child->pid        = NUM2INT(pid);
-  child->active     = 0;
-  child->ev_loop    = 0;
-  
+  GYRO_WATCHER_INITIALIZE(child, self);
+  child->pid = NUM2INT(pid);
   ev_child_init(&child->ev_child, Gyro_Child_callback, child->pid, 0);
 
   return Qnil;
@@ -111,10 +87,11 @@ static VALUE Gyro_Child_initialize(VALUE self, VALUE pid) {
 
 static VALUE Gyro_Child_await(VALUE self) {
   struct Gyro_Child *child;
+  VALUE ret;
   GetGyro_Child(self, child);
 
   child_activate(child);
-  VALUE ret = Gyro_switchpoint();
+  ret = Gyro_switchpoint();
   child_deactivate(child);
 
   TEST_RESUME_EXCEPTION(ret);
@@ -122,20 +99,10 @@ static VALUE Gyro_Child_await(VALUE self) {
   return ret;
 }
 
-VALUE Gyro_Child_deactivate_post_fork(VALUE self) {
-  struct Gyro_Child *child;
-  GetGyro_Child(self, child);
-
-  if (child->active)
-    child->active = GYRO_WATCHER_POST_FORK;
-  return self;
-}
-
 void Init_Gyro_Child() {
   cGyro_Child = rb_define_class_under(mGyro, "Child", rb_cData);
   rb_define_alloc_func(cGyro_Child, Gyro_Child_allocate);
 
   rb_define_method(cGyro_Child, "initialize", Gyro_Child_initialize, 1);
   rb_define_method(cGyro_Child, "await", Gyro_Child_await, 0);
-  rb_define_method(cGyro_Child, "deactivate_post_fork", Gyro_Child_deactivate_post_fork, 0);
 }

data/ext/gyro/fiber.c

@@ -26,7 +26,7 @@ VALUE SYM_fiber_terminate;
 static VALUE Fiber_safe_transfer(int argc, VALUE *argv, VALUE self) {
   VALUE arg = (argc == 0) ? Qnil : argv[0];
   VALUE ret = rb_funcall(self, ID_transfer, 1, arg);
-  
+
   TEST_RESUME_EXCEPTION(ret);
   RB_GC_GUARD(ret);
   return ret;
@@ -61,7 +61,7 @@ static VALUE Fiber_state(VALUE self) {
     return SYM_dead;
   if (rb_fiber_current() == self) return SYM_running;
   if (rb_ivar_get(self, ID_runnable) != Qnil) return SYM_runnable;
-  
+
   return SYM_waiting;
 }
 
@@ -71,8 +71,9 @@ void Fiber_make_runnable(VALUE fiber, VALUE value) {
     Thread_schedule_fiber(thread, fiber, value);
   }
   else {
+    VALUE caller;
     rb_warn("No thread set for fiber (fiber, value, caller):");
-    VALUE caller = rb_funcall(rb_cObject, rb_intern("caller"), 0);
+    caller = rb_funcall(rb_cObject, rb_intern("caller"), 0);
     INSPECT(3, fiber, value, caller);
   }
 }

data/ext/gyro/gyro.c

@@ -1,6 +1,7 @@
 #include "gyro.h"
 
 VALUE mGyro;
+int __gyro_current_generation__ = 0;
 
 ID ID_call;
 ID ID_caller;
@@ -24,21 +25,12 @@ ID ID_R;
 ID ID_W;
 ID ID_RW;
 
-static VALUE Gyro_break_set(VALUE self) {
-  // break_flag = 1;
-  ev_break(Gyro_Selector_current_thread_ev_loop(), EVBREAK_ALL);
-  return Qnil;
-}
-
-// static VALUE Gyro_break_get(VALUE self) {
-//   return (break_flag == 0) ? Qfalse : Qtrue;
-// }
-
 VALUE Gyro_snooze(VALUE self) {
+  VALUE ret;
   VALUE fiber = rb_fiber_current();
-  Fiber_make_runnable(fiber, Qnil);
 
-  VALUE ret = Thread_switch_fiber(rb_thread_current());
+  Fiber_make_runnable(fiber, Qnil);
+  ret = Thread_switch_fiber(rb_thread_current());
   TEST_RESUME_EXCEPTION(ret);
   RB_GC_GUARD(ret);
   return ret;
@@ -54,7 +46,7 @@ static VALUE Gyro_unref(VALUE self) {
 
 static VALUE Gyro_suspend(VALUE self) {
   VALUE ret = Thread_switch_fiber(rb_thread_current());
-  
+
   TEST_RESUME_EXCEPTION(ret);
   RB_GC_GUARD(ret);
   return ret;
@@ -65,15 +57,18 @@ VALUE Gyro_trace(VALUE self, VALUE enabled) {
   return Qnil;
 }
 
+VALUE Gyro_incr_generation(VALUE self) {
+  __gyro_current_generation__++;
+  return Qnil;
+}
+
 void Init_Gyro() {
   mGyro = rb_define_module("Gyro");
 
+  rb_define_singleton_method(mGyro, "incr_generation", Gyro_incr_generation, 0);
   rb_define_singleton_method(mGyro, "ref", Gyro_ref, 0);
-  rb_define_singleton_method(mGyro, "unref", Gyro_unref, 0);
   rb_define_singleton_method(mGyro, "trace", Gyro_trace, 1);
-
-  rb_define_singleton_method(mGyro, "break!", Gyro_break_set, 0);
-  // rb_define_singleton_method(mGyro, "break?", Gyro_break_get, 0);
+  rb_define_singleton_method(mGyro, "unref", Gyro_unref, 0);
 
   rb_define_global_function("snooze", Gyro_snooze, 0);
   rb_define_global_function("suspend", Gyro_suspend, 0);

data/ext/gyro/gyro.h

@@ -16,6 +16,53 @@
   return rb_funcall(rb_mKernel, ID_raise, 1, ret); \
 }
 
+typedef struct Gyro_watcher {
+  int active;
+  int generation;
+
+  struct  ev_loop *ev_loop;
+
+  VALUE   self;
+  VALUE   fiber;
+  VALUE   selector;
+} Gyro_watcher_t;
+
+
+#define GYRO_WATCHER_DECL(type) \
+  struct type type; \
+  int active; \
+  int generation; \
+  struct ev_loop *ev_loop; \
+  VALUE self; \
+  VALUE fiber; \
+  VALUE selector;
+
+#define GYRO_WATCHER_INITIALIZE(o, self) \
+  o->active     = 0; \
+  o->generation = __gyro_current_generation__; \
+  o->ev_loop    = 0; \
+  o->self       = self; \
+  o->fiber      = Qnil; \
+  o->selector   = Qnil;
+
+#define GYRO_WATCHER_MARK(o) \
+  if (o->fiber != Qnil) rb_gc_mark(o->fiber); \
+  if (o->selector != Qnil) rb_gc_mark(o->selector);
+
+#define GYRO_WATCHER_STOP_EXPAND(o) ev_ ## o ## _stop
+#define GYRO_WATCHER_STOP(o) GYRO_WATCHER_STOP_EXPAND(o)
+
+#define GYRO_WATCHER_FIELD_EXPAND(o) ev_ ## o
+#define GYRO_WATCHER_FIELD(o) GYRO_WATCHER_FIELD_EXPAND(o)
+
+#define GYRO_WATCHER_FREE(o) \
+  if (o->generation < __gyro_current_generation__) return; \
+  if (o->active) { \
+    ev_clear_pending(o->ev_loop, &o->GYRO_WATCHER_FIELD(o)); \
+    GYRO_WATCHER_STOP(o)(o->ev_loop, &o->GYRO_WATCHER_FIELD(o)); \
+  } \
+  xfree(o);
+
 extern VALUE mGyro;
 extern VALUE cGyro_Async;
 extern VALUE cGyro_IO;
@@ -52,6 +99,7 @@ extern VALUE SYM_fiber_switchpoint;
 extern VALUE SYM_fiber_terminate;
 
 extern int __tracing_enabled__;
+extern int __gyro_current_generation__;
 
 enum {
   FIBER_STATE_NOT_SCHEDULED = 0,

data/ext/gyro/io.c

@@ -7,12 +7,7 @@
 #endif /* GetReadFile */
 
 struct Gyro_IO {
-  struct  ev_io ev_io;
-  struct  ev_loop *ev_loop;
-  int     active;
-  VALUE   self;
-  VALUE   fiber;
-  VALUE   selector;
+  GYRO_WATCHER_DECL(ev_io);
 };
 
 VALUE cGyro_IO = Qnil;
@@ -24,25 +19,12 @@ VALUE SYM_w;
 
 static void Gyro_IO_mark(void *ptr) {
   struct Gyro_IO *io = ptr;
-  if (io->fiber != Qnil) {
-    rb_gc_mark(io->fiber);
-  }
-  if (io->selector != Qnil) {
-    rb_gc_mark(io->selector);
-  }
+  GYRO_WATCHER_MARK(io);
 }
 
 static void Gyro_IO_free(void *ptr) {
   struct Gyro_IO *io = ptr;
-  switch (io->active) {
-    case GYRO_WATCHER_POST_FORK:
-      return;
-    case 1:
-      ev_clear_pending(io->ev_loop, &io->ev_io);
-      ev_io_stop(io->ev_loop, &io->ev_io);
-    default:
-      xfree(io);
-  }
+  GYRO_WATCHER_FREE(io);
 }
 
 static size_t Gyro_IO_size(const void *ptr) {
@@ -119,16 +101,11 @@ static const char * S_to_io = "to_io";
 static VALUE Gyro_IO_initialize(VALUE self, VALUE io_obj, VALUE event_mask) {
   struct Gyro_IO *io;
   rb_io_t *fptr;
+  int fd;
+  int events;
 
   GetGyro_IO(self, io);
-
-  io->self = self;
-  io->fiber = Qnil;
-  io->selector = Qnil;
-  io->active = 0;
-  io->ev_loop = 0;
-
-  int fd;
+  GYRO_WATCHER_INITIALIZE(io, self);
   if (NIL_P(io_obj)) {
     fd = 0;
   }
@@ -136,8 +113,7 @@ static VALUE Gyro_IO_initialize(VALUE self, VALUE io_obj, VALUE event_mask) {
     GetOpenFile(rb_convert_type(io_obj, T_FILE, S_IO, S_to_io), fptr);
     fd = FPTR_TO_FD(fptr);
   }
-  int events = Gyro_IO_symbol2event_mask(event_mask);
-  
+  events = Gyro_IO_symbol2event_mask(event_mask);
   ev_io_init(&io->ev_io, Gyro_IO_callback, fd, events);
 
   return Qnil;
@@ -145,10 +121,11 @@ static VALUE Gyro_IO_initialize(VALUE self, VALUE io_obj, VALUE event_mask) {
 
 VALUE Gyro_IO_await(VALUE self) {
   struct Gyro_IO *io;
+  VALUE ret;
   GetGyro_IO(self, io);
 
   io_activate(io);
-  VALUE ret = Gyro_switchpoint();
+  ret = Gyro_switchpoint();
   io_deactivate(io);
 
   TEST_RESUME_EXCEPTION(ret);
@@ -156,16 +133,6 @@ VALUE Gyro_IO_await(VALUE self) {
   return ret;
 }
 
-VALUE Gyro_IO_deactivate_post_fork(VALUE self) {
-  struct Gyro_IO *io;
-  GetGyro_IO(self, io);
-
-  if (io->active)
-    io->active = GYRO_WATCHER_POST_FORK;
-
-  return self;
-}
-
 VALUE Gyro_IO_auto_io(int fd, int events) {
   VALUE watcher = Fiber_auto_io(rb_fiber_current());
   struct Gyro_IO *io;
@@ -265,7 +232,7 @@ static VALUE IO_read(int argc, VALUE *argv, VALUE io) {
 
   if (len == 0)
   	return str;
-  
+
   char *buf = RSTRING_PTR(str);
   long total = 0;
 
@@ -462,14 +429,15 @@ VALUE IO_write_watcher(VALUE self) {
 }
 
 void Init_Gyro_IO() {
+  VALUE cIO;
+  
   cGyro_IO = rb_define_class_under(mGyro, "IO", rb_cData);
   rb_define_alloc_func(cGyro_IO, Gyro_IO_allocate);
 
   rb_define_method(cGyro_IO, "initialize", Gyro_IO_initialize, 2);
   rb_define_method(cGyro_IO, "await", Gyro_IO_await, 0);
-  rb_define_method(cGyro_IO, "deactivate_post_fork", Gyro_IO_deactivate_post_fork, 0);
 
-  VALUE cIO = rb_const_get(rb_cObject, rb_intern("IO"));
+  cIO = rb_const_get(rb_cObject, rb_intern("IO"));
   // rb_define_method(cIO, "gets", IO_gets, -1);
   rb_define_method(cIO, "read", IO_read, -1);
   rb_define_method(cIO, "readpartial", IO_readpartial, -1);