polyphony 0.40 → 0.41

data/test/test_trace.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'helper'
+require 'polyphony/adapters/trace'
 
 class TraceTest < MiniTest::Test
   def test_tracing_disabled
@@ -11,13 +12,13 @@ class TraceTest < MiniTest::Test
     assert_equal 0, records.size
   ensure
     t&.disable
-    Gyro.trace(nil)
+    Polyphony.trace(nil)
   end
 
   def test_tracing_enabled
     records = []
     t = Polyphony::Trace.new(:fiber_all) { |r| records << r if r[:event] =~ /^fiber_/ }
-    Gyro.trace(true)
+    Polyphony.trace(true)
     t.enable
     snooze
     t.disable
@@ -28,14 +29,14 @@ class TraceTest < MiniTest::Test
     assert_equal [Fiber.current], records.map { |r| r[:fiber] }.uniq
   ensure
     t&.disable
-    Gyro.trace(nil)
+    Polyphony.trace(nil)
   end
 
   def test_2_fiber_trace
     records = []
     t = Polyphony::Trace.new(:fiber_all) { |r| records << r if r[:event] =~ /^fiber_/ }
     t.enable
-    Gyro.trace(true)
+    Polyphony.trace(true)
 
     f = spin { sleep 0 }
     suspend
@@ -61,6 +62,6 @@ class TraceTest < MiniTest::Test
     ], events
   ensure
     t&.disable
-    Gyro.trace(nil)
+    Polyphony.trace(nil)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: '0.40'
+  version: '0.41'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-04 00:00:00.000000000 Z
+date: 2020-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.80.0
+        version: 0.85.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.80.0
+        version: 0.85.1
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -224,7 +224,7 @@ description:
 email: ciconia@gmail.com
 executables: []
 extensions:
-- ext/gyro/extconf.rb
+- ext/polyphony/extconf.rb
 extra_rdoc_files:
 - README.md
 files:
@@ -242,6 +242,7 @@ files:
 - TODO.md
 - bin/polyphony-debug
 - docs/_config.yml
+- docs/_includes/head.html
 - docs/_includes/nav.html
 - docs/_includes/prevnext.html
 - docs/_layouts/default.html
@@ -297,6 +298,7 @@ files:
 - examples/core/02-awaiting-fibers.rb
 - examples/core/03-interrupting.rb
 - examples/core/forever_sleep.rb
+- examples/core/xx-agent.rb
 - examples/core/xx-at_exit.rb
 - examples/core/xx-caller.rb
 - examples/core/xx-channels.rb
@@ -363,23 +365,6 @@ files:
 - examples/performance/thread-vs-fiber/xx-httparty_multi.rb
 - examples/performance/thread-vs-fiber/xx-httparty_threaded.rb
 - examples/performance/thread_pool_perf.rb
-- ext/gyro/async.c
-- ext/gyro/child.c
-- ext/gyro/extconf.rb
-- ext/gyro/fiber.c
-- ext/gyro/gyro.c
-- ext/gyro/gyro.h
-- ext/gyro/gyro_ext.c
-- ext/gyro/io.c
-- ext/gyro/libev.c
-- ext/gyro/libev.h
-- ext/gyro/queue.c
-- ext/gyro/selector.c
-- ext/gyro/signal.c
-- ext/gyro/socket.c
-- ext/gyro/thread.c
-- ext/gyro/timer.c
-- ext/gyro/tracing.c
 - ext/libev/Changes
 - ext/libev/LICENSE
 - ext/libev/README
@@ -396,6 +381,18 @@ files:
 - ext/libev/ev_win32.c
 - ext/libev/ev_wrap.h
 - ext/libev/test_libev_win32.c
+- ext/polyphony/extconf.rb
+- ext/polyphony/fiber.c
+- ext/polyphony/libev.c
+- ext/polyphony/libev.h
+- ext/polyphony/libev_agent.c
+- ext/polyphony/libev_queue.c
+- ext/polyphony/polyphony.c
+- ext/polyphony/polyphony.h
+- ext/polyphony/polyphony_ext.c
+- ext/polyphony/socket.c
+- ext/polyphony/thread.c
+- ext/polyphony/tracing.c
 - lib/polyphony.rb
 - lib/polyphony/adapters/fs.rb
 - lib/polyphony/adapters/irb.rb
@@ -410,6 +407,7 @@ files:
 - lib/polyphony/core/sync.rb
 - lib/polyphony/core/thread_pool.rb
 - lib/polyphony/core/throttler.rb
+- lib/polyphony/event.rb
 - lib/polyphony/extensions/core.rb
 - lib/polyphony/extensions/fiber.rb
 - lib/polyphony/extensions/io.rb
@@ -424,20 +422,22 @@ files:
 - test/helper.rb
 - test/run.rb
 - test/stress.rb
-- test/test_async.rb
+- test/test_agent.rb
+- test/test_event.rb
 - test/test_ext.rb
 - test/test_fiber.rb
 - test/test_global_api.rb
 - test/test_io.rb
 - test/test_kernel.rb
 - test/test_process_supervision.rb
+- test/test_queue.rb
 - test/test_resource_pool.rb
 - test/test_signal.rb
+- test/test_socket.rb
 - test/test_supervise.rb
 - test/test_thread.rb
 - test/test_thread_pool.rb
 - test/test_throttler.rb
-- test/test_timer.rb
 - test/test_trace.rb
 homepage: https://digital-fabric.github.io/polyphony
 licenses:

data/ext/gyro/async.c

@@ -1,132 +0,0 @@
-#include "gyro.h"
-
-struct Gyro_Async {
-  GYRO_WATCHER_DECL(ev_async);
-  VALUE value;
-};
-
-VALUE cGyro_Async = Qnil;
-
-static void Gyro_Async_mark(void *ptr) {
-  struct Gyro_Async *async = ptr;
-  
-  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;
-  
-  GYRO_WATCHER_FREE(async);
-}
-
-static size_t Gyro_Async_size(const void *ptr) {
-  return sizeof(struct Gyro_Async);
-}
-
-static const rb_data_type_t Gyro_Async_type = {
-    "Gyro_Async",
-    {Gyro_Async_mark, Gyro_Async_free, Gyro_Async_size,},
-    0, 0, 0
-};
-
-static VALUE Gyro_Async_allocate(VALUE klass) {
-  struct Gyro_Async *async = ALLOC(struct Gyro_Async);
-  
-  return TypedData_Wrap_Struct(klass, &Gyro_Async_type, async);
-}
-
-inline void async_activate(struct Gyro_Async *async) {
-  if (async->active) return;
-
-  async->active = 1;
-  async->fiber = rb_fiber_current();
-  async->selector = Thread_current_event_selector();
-  async->ev_loop = Gyro_Selector_ev_loop(async->selector);
-  Gyro_Selector_add_active_watcher(async->selector, async->self);
-  ev_async_start(async->ev_loop, &async->ev_async);
-}
-
-inline void async_deactivate(struct Gyro_Async *async) {
-  if (!async->active) return;
-
-  ev_async_stop(async->ev_loop, &async->ev_async);
-  Gyro_Selector_remove_active_watcher(async->selector, async->self);
-  async->active = 0;
-  async->ev_loop = 0;
-  async->selector = Qnil;
-  async->fiber = Qnil;
-  async->value = Qnil;
-}
-
-void Gyro_Async_callback(struct ev_loop *ev_loop, struct ev_async *ev_async, int revents) {
-  struct Gyro_Async *async = (struct Gyro_Async*)ev_async;
-
-  Fiber_make_runnable(async->fiber, async->value);
-  async_deactivate(async);
-}
-
-#define GetGyro_Async(obj, async) \
-  TypedData_Get_Struct((obj), struct Gyro_Async, &Gyro_Async_type, (async))
-
-static VALUE Gyro_Async_initialize(VALUE self) {
-  struct Gyro_Async *async;
-  GetGyro_Async(self, async);
-
-  GYRO_WATCHER_INITIALIZE(async, self);
-  async->value = Qnil;
-  ev_async_init(&async->ev_async, Gyro_Async_callback);
-
-  return Qnil;
-}
-
-static VALUE Gyro_Async_signal(int argc, VALUE *argv, VALUE self) {
-  struct Gyro_Async *async;
-  GetGyro_Async(self, async);
-
-  if (!async->active) {
-    // printf("signal called before await\n");
-    return Qnil;
-  }
-
-  async->value = (argc == 1) ? argv[0] : Qnil;
-  ev_async_send(async->ev_loop, &async->ev_async);
-
-  return Qnil;
-}
-
-VALUE Gyro_Async_await(VALUE self) {
-  struct Gyro_Async *async;
-  VALUE ret;
-  GetGyro_Async(self, async);
-
-  async_activate(async);
-  ret = Gyro_switchpoint();
-  async_deactivate(async);
-
-  TEST_RESUME_EXCEPTION(ret);
-  RB_GC_GUARD(ret);
-  return ret;
-}
-
-VALUE Gyro_Async_await_no_raise(VALUE self) {
-  struct Gyro_Async *async;
-  VALUE ret;
-  GetGyro_Async(self, async);
-
-  async_activate(async);
-  ret = Gyro_switchpoint();
-  async_deactivate(async);
-
-  RB_GC_GUARD(ret);
-  return ret;
-}
-
-void Init_Gyro_Async() {
-  cGyro_Async = rb_define_class_under(mGyro, "Async", rb_cData);
-  rb_define_alloc_func(cGyro_Async, Gyro_Async_allocate);
-
-  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, "signal", Gyro_Async_signal, -1);
-}

data/ext/gyro/child.c

@@ -1,108 +0,0 @@
-#include "gyro.h"
-
-struct Gyro_Child {
-  GYRO_WATCHER_DECL(ev_child);
-  int pid;
-};
-
-static VALUE cGyro_Child = Qnil;
-
-static void Gyro_Child_mark(void *ptr) {
-  struct Gyro_Child *child = ptr;
-  GYRO_WATCHER_MARK(child);
-}
-
-static void Gyro_Child_free(void *ptr) {
-  struct Gyro_Child *child = ptr;
-  GYRO_WATCHER_FREE(child);
-}
-
-static size_t Gyro_Child_size(const void *ptr) {
-  return sizeof(struct Gyro_Child);
-}
-
-static const rb_data_type_t Gyro_Child_type = {
-    "Gyro_Child",
-    {Gyro_Child_mark, Gyro_Child_free, Gyro_Child_size,},
-    0, 0, 0
-};
-
-static VALUE Gyro_Child_allocate(VALUE klass) {
-  struct Gyro_Child *child = ALLOC(struct Gyro_Child);
-  return TypedData_Wrap_Struct(klass, &Gyro_Child_type, child);
-}
-
-inline void child_activate(struct Gyro_Child *child) {
-  if (child->active) return;
-
-  child->active = 1;
-  child->fiber = rb_fiber_current();
-  child->selector = Thread_current_event_selector();
-  child->ev_loop = Gyro_Selector_ev_loop(child->selector);
-  Gyro_Selector_add_active_watcher(child->selector, child->self);
-  ev_child_start(child->ev_loop, &child->ev_child);
-}
-
-inline void child_deactivate(struct Gyro_Child *child) {
-  if (!child->active) return;
-
-  ev_child_stop(child->ev_loop, &child->ev_child);
-  Gyro_Selector_remove_active_watcher(child->selector, child->self);
-  child->active = 0;
-  child->ev_loop = 0;
-  child->selector = Qnil;
-  child->fiber = Qnil;
-}
-
-VALUE Gyro_Child_resume_value(struct ev_child *ev_child) {
-  int exit_status = ev_child->rstatus >> 8; // weird, why should we do this?
-
-  return rb_ary_new_from_args(
-    2, INT2NUM(ev_child->rpid), INT2NUM(exit_status)
-  );
-}
-
-void Gyro_Child_callback(struct ev_loop *ev_loop, struct ev_child *ev_child, int revents) {
-  struct Gyro_Child *child = (struct Gyro_Child*)ev_child;
-
-  VALUE resume_value = Gyro_Child_resume_value(ev_child);
-  Fiber_make_runnable(child->fiber, resume_value);
-
-  child_deactivate(child);
-}
-
-#define GetGyro_Child(obj, child) \
-  TypedData_Get_Struct((obj), struct Gyro_Child, &Gyro_Child_type, (child))
-
-static VALUE Gyro_Child_initialize(VALUE self, VALUE pid) {
-  struct Gyro_Child *child;
-
-  GetGyro_Child(self, child);
-  GYRO_WATCHER_INITIALIZE(child, self);
-  child->pid = NUM2INT(pid);
-  ev_child_init(&child->ev_child, Gyro_Child_callback, child->pid, 0);
-
-  return Qnil;
-}
-
-static VALUE Gyro_Child_await(VALUE self) {
-  struct Gyro_Child *child;
-  VALUE ret;
-  GetGyro_Child(self, child);
-
-  child_activate(child);
-  ret = Gyro_switchpoint();
-  child_deactivate(child);
-
-  TEST_RESUME_EXCEPTION(ret);
-  RB_GC_GUARD(ret);
-  return ret;
-}
-
-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);
-}

data/ext/gyro/gyro.h

@@ -1,158 +0,0 @@
-#ifndef RUBY_EV_H
-#define RUBY_EV_H
-
-#include "ruby.h"
-#include "ruby/io.h"
-#include "libev.h"
-
-// 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 FIBER_TRACE(...) if (__tracing_enabled__) { \
-  rb_funcall(rb_cObject, ID_fiber_trace, __VA_ARGS__); \
-}
-
-#define TEST_RESUME_EXCEPTION(ret) if (RTEST(rb_obj_is_kind_of(ret, rb_eException))) { \
-  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;
-extern VALUE cGyro_Queue;
-extern VALUE cGyro_Selector;
-extern VALUE cGyro_Timer;
-
-extern ID ID_call;
-extern ID ID_caller;
-extern ID ID_clear;
-extern ID ID_each;
-extern ID ID_fiber_trace;
-extern ID ID_inspect;
-extern ID ID_ivar_running;
-extern ID ID_ivar_thread;
-extern ID ID_new;
-extern ID ID_raise;
-extern ID ID_runnable;
-extern ID ID_runnable_value;
-extern ID ID_signal;
-extern ID ID_size;
-extern ID ID_switch_fiber;
-extern ID ID_transfer;
-extern ID ID_R;
-extern ID ID_W;
-extern ID ID_RW;
-
-extern VALUE SYM_fiber_create;
-extern VALUE SYM_fiber_ev_loop_enter;
-extern VALUE SYM_fiber_ev_loop_leave;
-extern VALUE SYM_fiber_run;
-extern VALUE SYM_fiber_schedule;
-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,
-  FIBER_STATE_WAITING       = 1,
-  FIBER_STATE_SCHEDULED     = 2
-};
-
-// watcher flags
-enum {
-  // a watcher's active field will be set to this after fork
-  GYRO_WATCHER_POST_FORK = 0xFF
-};
-
-VALUE Fiber_auto_async(VALUE self);
-VALUE Fiber_auto_io(VALUE self);
-void Fiber_make_runnable(VALUE fiber, VALUE value);
-
-VALUE Gyro_Async_await(VALUE async);
-VALUE Gyro_Async_await_no_raise(VALUE async);
-
-VALUE Gyro_IO_auto_io(int fd, int events);
-VALUE Gyro_IO_await(VALUE self);
-
-void Gyro_Selector_add_active_watcher(VALUE self, VALUE watcher);
-VALUE Gyro_Selector_break_out_of_ev_loop(VALUE self);
-struct ev_loop *Gyro_Selector_current_thread_ev_loop();
-struct ev_loop *Gyro_Selector_ev_loop(VALUE selector);
-ev_tstamp Gyro_Selector_now(VALUE selector);
-long Gyro_Selector_pending_count(VALUE self);
-VALUE Gyro_Selector_post_fork(VALUE self);
-void Gyro_Selector_remove_active_watcher(VALUE self, VALUE watcher);
-VALUE Gyro_Selector_run(VALUE self, VALUE current_fiber);
-void Gyro_Selector_run_no_wait(VALUE self, VALUE current_fiber, long runnable_count);
-VALUE Gyro_switchpoint();
-
-
-VALUE Gyro_snooze(VALUE self);
-VALUE Gyro_Timer_await(VALUE self);
-
-VALUE IO_read_watcher(VALUE io);
-VALUE IO_write_watcher(VALUE io);
-
-VALUE Gyro_Queue_push(VALUE self, VALUE value);
-
-VALUE Thread_current_event_selector();
-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);
-VALUE io_enc_str(VALUE str, rb_io_t *fptr);
-
-#endif /* RUBY_EV_H */