polyphony 0.41 → 0.42

data/ext/polyphony/libev_queue.c

@@ -137,6 +137,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 +154,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

@@ -36,14 +36,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 +52,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);

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/thread.c

@@ -2,7 +2,6 @@
 
 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;
@@ -18,34 +17,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 +125,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 +150,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 +161,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 +176,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);
@@ -215,7 +188,6 @@ void Init_Thread() {
 
   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");

data/lib/polyphony.rb

@@ -26,14 +26,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)

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

@@ -100,10 +100,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

@@ -23,13 +23,13 @@ module Polyphony
     end
 
     def acquire
-      Polyphony.ref
+      Thread.current.agent.ref
       resource = wait_for_resource
       return unless resource
 
       yield resource
     ensure
-      Polyphony.unref
+      Thread.current.agent.unref
       release(resource) if resource
     end
 

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
@@ -93,6 +91,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
 

data/lib/polyphony/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Polyphony
-  VERSION = '0.41'
+  VERSION = '0.42'
 end

data/polyphony.gemspec

@@ -36,5 +36,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency  'jekyll',               '~>3.8.6'
   s.add_development_dependency  'jekyll-remote-theme',  '~>0.4.1'
   s.add_development_dependency  'jekyll-seo-tag',       '~>2.6.1'
-  s.add_development_dependency  'just-the-docs',        '~>0.2.7'
+  s.add_development_dependency  'just-the-docs',        '~>0.3.0'
 end

data/test/test_agent.rb

@@ -5,11 +5,14 @@ require_relative 'helper'
 class AgentTest < MiniTest::Test
   def setup
     super
+    @prev_agent = Thread.current.agent
     @agent = Polyphony::LibevAgent.new
+    Thread.current.agent = @agent
   end
 
   def teardown
     @agent.finalize
+    Thread.current.agent = @prev_agent
   end
 
   def test_sleep
@@ -67,11 +70,55 @@ class AgentTest < MiniTest::Test
 
   def test_waitpid
     pid = fork do
-      Thread.current.agent.post_fork
+      @agent.post_fork
       exit(42)
     end
     
-    result = Thread.current.agent.waitpid(pid)
+    result = @agent.waitpid(pid)
     assert_equal [pid, 42], result
   end
+
+  def test_read_loop
+    i, o = IO.pipe
+
+    buf = []
+    spin do
+      buf << :ready
+      @agent.read_loop(i) { |d| buf << d }
+      buf << :done
+    end
+
+    o << 'foo'
+    o << 'bar'
+    o.close
+    snooze
+
+    assert_equal [:ready, 'foo', 'bar', :done], buf
+  end
+
+  def test_accept_loop
+    server = TCPServer.new('127.0.0.1', 1234)
+
+    clients = []
+    server_fiber = spin do
+      @agent.accept_loop(server) { |c| clients << c }
+    end
+
+    c1 = TCPSocket.new('127.0.0.1', 1234)
+    snooze
+
+    assert_equal 1, clients.size
+
+    c2 = TCPSocket.new('127.0.0.1', 1234)
+    snooze
+
+    assert_equal 2, clients.size
+
+  ensure
+    c1&.close
+    c2&.close
+    server_fiber.stop
+    snooze
+    server&.close
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: '0.41'
+  version: '0.42'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-27 00:00:00.000000000 Z
+date: 2020-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -212,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: 0.3.0
 description: 
 email: ciconia@gmail.com
 executables: []
@@ -242,20 +242,14 @@ 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
 - docs/_sass/custom/custom.scss
 - docs/_sass/overrides.scss
-- docs/api-reference.md
+- docs/_user-guide/all-about-timers.md
+- docs/_user-guide/index.md
+- docs/_user-guide/web-server.md
 - docs/api-reference/exception.md
 - docs/api-reference/fiber.md
-- docs/api-reference/gyro-async.md
-- docs/api-reference/gyro-child.md
-- docs/api-reference/gyro-queue.md
-- docs/api-reference/gyro-timer.md
-- docs/api-reference/gyro.md
+- docs/api-reference/index.md
 - docs/api-reference/io.md
 - docs/api-reference/object.md
 - docs/api-reference/polyphony-baseexception.md
@@ -273,19 +267,17 @@ files:
 - docs/assets/img/echo-fibers.svg
 - docs/assets/img/sleeping-fiber.svg
 - docs/faq.md
-- docs/getting-started.md
+- docs/getting-started/index.md
 - docs/getting-started/installing.md
+- docs/getting-started/overview.md
 - docs/getting-started/tutorial.md
 - docs/index.md
-- docs/main-concepts.md
 - docs/main-concepts/concurrency.md
 - docs/main-concepts/design-principles.md
 - docs/main-concepts/exception-handling.md
 - docs/main-concepts/extending.md
 - docs/main-concepts/fiber-scheduling.md
-- docs/user-guide.md
-- docs/user-guide/all-about-timers.md
-- docs/user-guide/web-server.md
+- docs/main-concepts/index.md
 - examples/adapters/pg_client.rb
 - examples/adapters/pg_notify.rb
 - examples/adapters/pg_pool.rb
@@ -297,7 +289,7 @@ files:
 - examples/core/01-spinning-up-fibers.rb
 - examples/core/02-awaiting-fibers.rb
 - examples/core/03-interrupting.rb
-- examples/core/forever_sleep.rb
+- examples/core/04-handling-signals.rb
 - examples/core/xx-agent.rb
 - examples/core/xx-at_exit.rb
 - examples/core/xx-caller.rb
@@ -361,10 +353,14 @@ files:
 - examples/performance/snooze_raw.rb
 - examples/performance/thread-vs-fiber/polyphony_mt_server.rb
 - examples/performance/thread-vs-fiber/polyphony_server.rb
+- examples/performance/thread-vs-fiber/polyphony_server_read_loop.rb
 - examples/performance/thread-vs-fiber/threaded_server.rb
 - examples/performance/thread-vs-fiber/xx-httparty_multi.rb
 - examples/performance/thread-vs-fiber/xx-httparty_threaded.rb
 - examples/performance/thread_pool_perf.rb
+- examples/performance/xx-array.rb
+- examples/performance/xx-fiber-switch.rb
+- examples/performance/xx-snooze.rb
 - ext/libev/Changes
 - ext/libev/LICENSE
 - ext/libev/README