polyphony 0.43.11 → 0.44.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d1eb9e2b1eef7f180107b3952fc6974e9c816268ebd8d2368ddfaac276d2086
-  data.tar.gz: dafb382dc7606b92b97fb98125b57abc72e1b1d6b07bb877abff608a41ee51a1
+  metadata.gz: 04c1c1221d46b1b9169aa04c5896c8d68c20fa11d64554e76b7452710423f142
+  data.tar.gz: 519528e0a3dfd323620869d4a7e43e4769cf3c1b5f0ea405cf341efc6fd534f6
 SHA512:
-  metadata.gz: 9f91b787b3eec2c19f6a02fd8a77469c8ae5d7a9302799c3e2a5957376b9f4b0135d2cd958ec7dcf326701e8ba81d85a28201a140ce5806ccc057cedafe907d5
-  data.tar.gz: df865277e2f37c0d7fde0ffd38f52fc466bf28033fb968bd012af7455df9e7805989152467e1e8e84719194f173c99c6290496987ad8a2b48fe26076e62c85bd
+  metadata.gz: de8ac460dd05b051057ffab1c155c6b2d675cc623b98549333ba1defbc99f4efb738ff4a34a9f8c14bd3cb9ab0cab5356aa34a2308daa73273a6ef8719565bc4
+  data.tar.gz: c26b254559e484774574555dc895cf072bda8061b92fed26d8e61e7172523fe0faf2750cd2f924db3a25b59583b673ebe5f14749fd6f1279ca2e7e7b7745490b

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.44.0 2020-07-25
+
+* Fix reentrant `ResourcePool` (#38)
+* Add `ResourcePool#discard!` (#35)
+* Add `Mysql2::Client` and `Sequel::ConnectionPool` adapters (#35)
+* Reimplement `Kernel.trap` using `Fiber#interject`
+* Add `Fiber#interject` for running arbitrary code on arbitrary fibers (#39)
+
 ## 0.43.11 2020-07-24
 
 * Dump uncaught exception info for forked process (#36)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    polyphony (0.43.11)
+    polyphony (0.44.0)
 
 GEM
   remote: https://rubygems.org/
@@ -72,6 +72,7 @@ GEM
       minitest (>= 5.0)
       ruby-progressbar
     multi_xml (0.6.0)
+    mysql2 (0.5.3)
     parallel (1.19.1)
     parser (2.7.0.2)
       ast (~> 2.4.0)
@@ -109,6 +110,7 @@ GEM
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
+    sequel (5.34.0)
     simplecov (0.17.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -130,11 +132,13 @@ DEPENDENCIES
   localhost (= 1.1.4)
   minitest (= 5.13.0)
   minitest-reporters (= 1.4.2)
+  mysql2 (= 0.5.3)
   pg (= 1.1.4)
   polyphony!
   rake-compiler (= 1.0.5)
   redis (= 4.1.0)
   rubocop (= 0.85.1)
+  sequel (= 5.34.0)
   simplecov (= 0.17.1)
 
 BUNDLED WITH

data/TODO.md

@@ -1,7 +1,14 @@
+- Adapter for Pry, or maybe just an adapter for readline
+- Rename Agent to Backend
+- Review all code
+  - Cleanup C code
+  - Cleanup Ruby code (use Rubocop)
+  - Cleanup and annotate examples (and remove all the examples used for
+    debugging). Focus on examples that serve as "how-to".
+
 - Debugging
   - Eat your own dogfood: need a good tool to check what's going on when some
     test fails
-  - Needs to work with Pry (can write perhaps an extension for pry)
   - First impl in Ruby using `TracePoint` API
   - Mode of operation:
     - Two parts: tracer and controller
@@ -111,7 +118,7 @@
   - discuss using `snooze` for ensuring responsiveness when executing CPU-bound work
 
 
-## 0.44
+## 0.45
 
 ### Some more API work, more docs
 
@@ -124,13 +131,13 @@
   - proceed from there
 
 
-## 0.45
+## 0.46
 
 ### Sinatra / Sidekiq
 
 - Pull out redis/postgres code, put into new `polyphony-xxx` gems
 
-## 0.46
+## 0.47
 
 ### Testing && Docs
 
@@ -142,10 +149,6 @@
   - `IO.foreach`
   - `Process.waitpid`
 
-## 0.47
-
-### Real IO#gets and IO#read
-
 ## 0.48 DNS
 
 ### DNS client

data/examples/adapters/sequel_mysql.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony/adapters/sequel'
+require 'polyphony/adapters/mysql2'
+
+time_printer = spin do
+  last = Time.now
+  throttled_loop(10) do
+    now = Time.now
+    puts now - last
+    last = now
+  end
+end
+
+db = Sequel.connect('mysql2://localhost/test')
+
+x = 10_000
+t0 = Time.now
+x.times { db.execute('select 1 as test') }
+puts "query rate: #{x / (Time.now - t0)} reqs/s"
+
+time_printer.stop

data/examples/adapters/sequel_mysql_pool.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony/adapters/sequel'
+require 'polyphony/adapters/mysql2'
+
+CONCURRENCY = ARGV.first ? ARGV.first.to_i : 1000
+puts "concurrency: #{CONCURRENCY}"
+
+db = Sequel.connect(
+  'mysql2://localhost/test',
+  max_connections: 100,
+  preconnect: true
+)
+
+t0 = Time.now
+count = 0
+
+fibers = Array.new(CONCURRENCY) do
+  spin do
+    loop do
+      db.execute('select sleep(0.001) as test')
+      count += 1
+    end
+  end
+end
+
+sleep 0.1
+fibers.first.terminate # Interrupt mid-query
+
+sleep 2
+puts "query rate: #{count / (Time.now - t0)} reqs/s"
+fibers.each(&:interrupt)

data/ext/polyphony/libev_agent.c

@@ -77,15 +77,13 @@ VALUE LibevAgent_post_fork(VALUE self) {
   LibevAgent_t *agent;
   GetLibevAgent(self, agent);
 
-  if (!ev_is_default_loop(agent->ev_loop)) {
-    // post_fork is called only for the main thread of the forked process. If
-    // the forked process was forked from a thread other than the main one,
-    // we remove the old non-default ev_loop and use the default one instead.
-    ev_loop_destroy(agent->ev_loop);
-    agent->ev_loop = EV_DEFAULT;
-  }
-
-  ev_loop_fork(agent->ev_loop);
+  // After fork there may be some watchers still active left over from the
+  // parent, so we destroy the loop, even if it's the default one, then use the
+  // default one, as post_fork is called only from the main thread of the forked
+  // process. That way we don't need to call ev_loop_fork, since the loop is
+  // always a fresh one.
+  ev_loop_destroy(agent->ev_loop);
+  agent->ev_loop = EV_DEFAULT;
 
   return self;
 }
@@ -142,11 +140,11 @@ VALUE LibevAgent_poll(VALUE self, VALUE nowait, VALUE current_fiber, VALUE queue
 
   agent->run_no_wait_count = 0;
   
-  FIBER_TRACE(2, SYM_fiber_ev_loop_enter, current_fiber);
+  COND_TRACE(2, SYM_fiber_ev_loop_enter, current_fiber);
   agent->running = 1;
   ev_run(agent->ev_loop, is_nowait ? EVRUN_NOWAIT : EVRUN_ONCE);
   agent->running = 0;
-  FIBER_TRACE(2, SYM_fiber_ev_loop_leave, current_fiber);
+  COND_TRACE(2, SYM_fiber_ev_loop_leave, current_fiber);
 
   return self;
 }
@@ -376,7 +374,7 @@ VALUE LibevAgent_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_eo
 
   return str;
 error:
-  return rb_funcall(rb_mKernel, ID_raise, 1, switchpoint_result);
+  return RAISE_EXCEPTION(switchpoint_result);
 }
 
 VALUE LibevAgent_read_loop(VALUE self, VALUE io) {
@@ -456,7 +454,7 @@ VALUE LibevAgent_read_loop(VALUE self, VALUE io) {
 
   return io;
 error:
-  return rb_funcall(rb_mKernel, ID_raise, 1, switchpoint_result);
+  return RAISE_EXCEPTION(switchpoint_result);
 }
 
 VALUE LibevAgent_write(VALUE self, VALUE io, VALUE str) {
@@ -500,7 +498,7 @@ VALUE LibevAgent_write(VALUE self, VALUE io, VALUE str) {
 
   return INT2NUM(len);
 error:
-  return rb_funcall(rb_mKernel, ID_raise, 1, switchpoint_result);
+  return RAISE_EXCEPTION(switchpoint_result);
 }
 
 VALUE LibevAgent_writev(VALUE self, VALUE io, int argc, VALUE *argv) {
@@ -570,7 +568,7 @@ VALUE LibevAgent_writev(VALUE self, VALUE io, int argc, VALUE *argv) {
   return INT2NUM(total_written);
 error:
   free(iov);
-  return rb_funcall(rb_mKernel, ID_raise, 1, switchpoint_result);
+  return RAISE_EXCEPTION(switchpoint_result);
 }
 
 VALUE LibevAgent_write_m(int argc, VALUE *argv, VALUE self) {
@@ -636,7 +634,7 @@ VALUE LibevAgent_accept(VALUE self, VALUE sock) {
   RB_GC_GUARD(switchpoint_result);
   return Qnil;
 error:
-  return rb_funcall(rb_mKernel, ID_raise, 1, switchpoint_result);
+  return RAISE_EXCEPTION(switchpoint_result);
 }
 
 VALUE LibevAgent_accept_loop(VALUE self, VALUE sock) {
@@ -692,7 +690,7 @@ VALUE LibevAgent_accept_loop(VALUE self, VALUE sock) {
   RB_GC_GUARD(switchpoint_result);
   return Qnil;
 error:
-  return rb_funcall(rb_mKernel, ID_raise, 1, switchpoint_result);
+  return RAISE_EXCEPTION(switchpoint_result);
 }
 
 VALUE LibevAgent_connect(VALUE self, VALUE sock, VALUE host, VALUE port) {
@@ -728,7 +726,7 @@ VALUE LibevAgent_connect(VALUE self, VALUE sock, VALUE host, VALUE port) {
   RB_GC_GUARD(switchpoint_result);
   return sock;
 error:
-  return rb_funcall(rb_mKernel, ID_raise, 1, switchpoint_result);
+  return RAISE_EXCEPTION(switchpoint_result);
 }
 
 VALUE libev_wait_fd(LibevAgent_t *agent, int fd, int events, int raise_exception) {

data/ext/polyphony/polyphony.c

@@ -7,6 +7,7 @@ ID ID_caller;
 ID ID_clear;
 ID ID_each;
 ID ID_inspect;
+ID ID_invoke;
 ID ID_new;
 ID ID_raise;
 ID ID_ivar_running;
@@ -60,6 +61,7 @@ void Init_Polyphony() {
   ID_clear          = rb_intern("clear");
   ID_each           = rb_intern("each");
   ID_inspect        = rb_intern("inspect");
+  ID_invoke         = rb_intern("invoke");
   ID_ivar_running   = rb_intern("@running");
   ID_ivar_thread    = rb_intern("@thread");
   ID_new            = rb_intern("new");

data/ext/polyphony/polyphony.h

@@ -8,17 +8,23 @@
 
 // debugging
 #define OBJ_ID(obj) (NUM2LONG(rb_funcall(obj, rb_intern("object_id"), 0)))
-#define INSPECT(str, obj) { printf(str); 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__); \
+#define INSPECT(str, obj) { printf(str); VALUE s = rb_funcall(obj, rb_intern("inspect"), 0); printf("%s\n", StringValueCStr(s)); }
+#define TRACE_CALLER() { VALUE c = rb_funcall(rb_mKernel, rb_intern("caller"), 0); INSPECT("caller: ", c); }
+
+// tracing
+#define TRACE(...)  rb_funcall(rb_cObject, ID_fiber_trace, __VA_ARGS__)
+#define COND_TRACE(...) if (__tracing_enabled__) { \
+  TRACE(__VA_ARGS__); \
 }
 
 #define TEST_EXCEPTION(ret) (RTEST(rb_obj_is_kind_of(ret, rb_eException)))
 
+#define RAISE_EXCEPTION(e) rb_funcall(e, ID_invoke, 0);
 #define TEST_RESUME_EXCEPTION(ret) if (RTEST(rb_obj_is_kind_of(ret, rb_eException))) { \
-  return rb_funcall(rb_mKernel, ID_raise, 1, ret); \
+  return RAISE_EXCEPTION(ret); \
 }
 
+
 extern agent_interface_t agent_interface;
 #define __AGENT__ (agent_interface)
 
@@ -32,6 +38,7 @@ extern ID ID_clear;
 extern ID ID_each;
 extern ID ID_fiber_trace;
 extern ID ID_inspect;
+extern ID ID_invoke;
 extern ID ID_ivar_agent;
 extern ID ID_ivar_running;
 extern ID ID_ivar_thread;

data/ext/polyphony/thread.c

@@ -64,7 +64,7 @@ VALUE Thread_schedule_fiber(VALUE self, VALUE fiber, VALUE value) {
   }
 
   rb_ivar_set(fiber, ID_runnable_value, value);
-  FIBER_TRACE(3, SYM_fiber_schedule, fiber, value);
+  COND_TRACE(3, SYM_fiber_schedule, fiber, value);
 
   if (!already_runnable) {
     queue = rb_ivar_get(self, ID_run_queue);
@@ -89,7 +89,7 @@ VALUE Thread_schedule_fiber_with_priority(VALUE self, VALUE fiber, VALUE value)
 
   if (rb_fiber_alive_p(fiber) != Qtrue) return self;
 
-  FIBER_TRACE(3, SYM_fiber_schedule, fiber, value);
+  COND_TRACE(3, SYM_fiber_schedule, fiber, value);
   rb_ivar_set(fiber, ID_runnable_value, value);
 
   queue = rb_ivar_get(self, ID_run_queue);
@@ -123,13 +123,10 @@ VALUE Thread_switch_fiber(VALUE self) {
   VALUE value;
   VALUE agent = rb_ivar_get(self, ID_ivar_agent);
   int ref_count;
-  int agent_was_polled = 0;1;
+  int agent_was_polled = 0;
 
-  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);
-    }
-  }
+  if (__tracing_enabled__ && (rb_ivar_get(current_fiber, ID_ivar_running) != Qfalse))
+    TRACE(2, SYM_fiber_switchpoint, current_fiber);
 
   ref_count = __AGENT__.ref_count(agent);
   while (1) {
@@ -152,7 +149,7 @@ VALUE Thread_switch_fiber(VALUE self) {
 
   // run next fiber
   value = rb_ivar_get(next_fiber, ID_runnable_value);
-  FIBER_TRACE(3, SYM_fiber_run, next_fiber, value);
+  COND_TRACE(3, SYM_fiber_run, next_fiber, value);
 
   rb_ivar_set(next_fiber, ID_runnable, Qnil);
   RB_GC_GUARD(next_fiber);
@@ -188,6 +185,11 @@ VALUE Thread_fiber_break_out_of_ev_loop(VALUE self, VALUE fiber, VALUE resume_ob
   return self;
 }
 
+VALUE Thread_debug(VALUE self) {
+  rb_ivar_set(self, rb_intern("@__debug__"), Qtrue);
+  return self;
+}
+
 void Init_Thread() {
   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);
@@ -200,6 +202,8 @@ void Init_Thread() {
   rb_define_method(rb_cThread, "switch_fiber", Thread_switch_fiber, 0);
   rb_define_method(rb_cThread, "run_queue_trace", Thread_run_queue_trace, 0);
 
+  rb_define_method(rb_cThread, "debug!", Thread_debug, 0);
+
   ID_deactivate_all_watchers_post_fork = rb_intern("deactivate_all_watchers_post_fork");
   ID_ivar_agent               = rb_intern("@agent");
   ID_ivar_join_wait_queue     = rb_intern("@join_wait_queue");

data/lib/polyphony.rb

@@ -27,26 +27,19 @@ require_relative './polyphony/adapters/process'
 # Main Polyphony API
 module Polyphony
   class << self
-    def wait_for_signal(sig)
-      raise "should be reimplemented"
-
-      fiber = Fiber.current
-      # Polyphony.ref
-      old_trap = trap(sig) do
-        # Polyphony.unref
-        fiber.schedule(sig)
-        trap(sig, old_trap)
-      end
-      suspend
-
-    end
-
     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.
+        # A race condition can arise if a TERM or INT signal is received before
+        # the forked process has finished initializing. To prevent this we restore
+        # the default signal handlers, and then reinstall the custom Polyphony
+        # handlers just before running the given block.
+        trap('SIGTERM', 'DEFAULT')
+        trap('SIGINT', 'DEFAULT')
+
+        # 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
@@ -65,13 +58,6 @@ module Polyphony
     end
 
     def run_forked_block(&block)
-      # A race condition can arise if a TERM or INT signal is received before
-      # the forked process has finished initializing. To prevent this we restore
-      # the default signal handlers, and then reinstall the custom Polyphony
-      # handlers just before running the given block.
-      trap('SIGTERM', 'DEFAULT')
-      trap('SIGINT', 'DEFAULT')
-
       Thread.current.setup
       Fiber.current.setup_main_fiber
       Thread.current.agent.post_fork

data/lib/polyphony/adapters/mysql2.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require_relative '../../polyphony'
+require 'mysql2/client'
+
+# Mysql2::Client overrides
+Mysql2::Client.prepend(Module.new do
+  def initialize(config)
+    config[:async] = true
+    super
+    @io = ::IO.for_fd(socket)
+  end
+
+  def query(sql, **options)
+    super
+    Thread.current.agent.wait_io(@io, false)
+    async_result
+  end
+end)

data/lib/polyphony/adapters/sequel.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require_relative '../../polyphony'
+require 'sequel'
+
+module Polyphony
+  # Sequel ConnectionPool that delegates to Polyphony::ResourcePool.
+  class FiberConnectionPool < Sequel::ConnectionPool
+    def initialize(db, opts = OPTS)
+      super
+      max_size = Integer(opts[:max_connections] || 4)
+      @pool = Polyphony::ResourcePool.new(limit: max_size) { make_new(:default) }
+    end
+
+    def hold(_server = nil)
+      @pool.acquire do |conn|
+        yield conn
+      rescue Polyphony::BaseException
+        # The connection may be in an unrecoverable state if interrupted,
+        # discard the connection from the pool so it isn't reused.
+        @pool.discard!
+        raise
+      end
+    end
+
+    def size
+      @pool.size
+    end
+
+    def max_size
+      @pool.limit
+    end
+
+    def preconnect(_concurrent = false)
+      @pool.preheat!
+    end
+  end
+
+  # Override Sequel::Database to use FiberConnectionPool by default.
+  Sequel::Database.prepend(Module.new do
+    def connection_pool_default_options
+      {pool_class: FiberConnectionPool}
+    end
+  end)
+end

data/lib/polyphony/core/exceptions.rb

@@ -33,4 +33,15 @@ module Polyphony
 
   # Restart is used to restart a fiber
   class Restart < BaseException; end
+
+  # Interjection is used to run arbitrary code on arbitrary fibers at any point
+  class Interjection < BaseException
+    def initialize(proc)
+      @proc = proc
+    end
+
+    def invoke
+      @proc.call
+    end
+  end
 end

data/lib/polyphony/core/resource_pool.rb

@@ -20,17 +20,23 @@ module Polyphony
       @stock.size
     end
 
-    def acquire
+    def acquire(&block)
       fiber = Fiber.current
-      return @acquired_resources[fiber] if @acquired_resources[fiber]
+      return yield @acquired_resources[fiber] if @acquired_resources[fiber]
 
+      acquire_from_stock(fiber, &block)
+    end
+
+    def acquire_from_stock(fiber)
       add_to_stock if (@stock.empty? || @stock.pending?) && @size < @limit 
       resource = @stock.shift
       @acquired_resources[fiber] = resource
       yield resource
     ensure
-      @acquired_resources.delete(fiber)
-      @stock.push resource if resource
+      if resource && @acquired_resources[fiber] == resource
+        @acquired_resources.delete(fiber)
+        @stock.push resource
+      end
     end
         
     def method_missing(sym, *args, &block)
@@ -45,7 +51,14 @@ module Polyphony
     # @return [any] allocated resource
     def add_to_stock
       @size += 1
-      @stock << @allocator.call
+      resource = @allocator.call
+      @stock << resource
+    end
+
+    # Discards the currently-acquired resource
+    # instead of returning it to the pool when done.
+    def discard!
+      @size -= 1 if @acquired_resources.delete(Fiber.current)
     end
 
     def preheat!

data/lib/polyphony/extensions/core.rb

@@ -46,6 +46,10 @@ class ::Exception
 
     backtrace.reject { |l| l[POLYPHONY_DIR] }
   end
+
+  def invoke
+    Kernel.raise(self)
+  end
 end
 
 # Overrides for Process
@@ -140,8 +144,16 @@ module ::Kernel
   def trap(sig, command = nil, &block)
     return orig_trap(sig, command) if command.is_a? String
       
-    block = command if command.respond_to?(:call) && !block
-    exception = command.is_a?(Class) && command.new
+    block = command if !block && command.respond_to?(:call)
+    if block
+      exception = Polyphony::Interjection.new(block)
+    else
+      exception = command.is_a?(Class) && command.new
+    end
+
+    unless exception
+      raise ArgumentError, "Must supply block or exception or callable object"
+    end
 
     # The signal trap can be invoked at any time, including while the system
     # agent is blocking while polling for events. In order to deal with this
@@ -152,12 +164,7 @@ module ::Kernel
     # If the command argument is an exception class however, it will be raised
     # directly in the context of the main fiber.
     orig_trap(sig) do
-      if exception
-        Thread.current.break_out_of_ev_loop(Thread.main.main_fiber, exception)
-      else
-        fiber = spin { snooze; block.call }
-        Thread.current.break_out_of_ev_loop(fiber, nil)
-      end
+      Thread.current.break_out_of_ev_loop(Thread.main.main_fiber, exception)
     end
   end
 end

data/lib/polyphony/extensions/fiber.rb

@@ -67,6 +67,10 @@ module Polyphony
       else RuntimeError.new
       end
     end
+
+    def interject(&block)
+      raise Polyphony::Interjection.new(block)
+    end
   end
 
   # Fiber supervision

data/lib/polyphony/version.rb

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

data/polyphony.gemspec

@@ -32,6 +32,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency  'redis',                '4.1.0'
   s.add_development_dependency  'hiredis',              '0.6.3'
   s.add_development_dependency  'http_parser.rb',       '~>0.6.0'
+  s.add_development_dependency  'mysql2',               '0.5.3'
+  s.add_development_dependency  'sequel',               '5.34.0'
 
   s.add_development_dependency  'jekyll',               '~>3.8.6'
   s.add_development_dependency  'jekyll-remote-theme',  '~>0.4.1'

data/test/test_fiber.rb

@@ -413,6 +413,22 @@ class FiberTest < MiniTest::Test
     f2&.stop
   end
 
+  def test_interject
+    buf = []
+    f = spin_loop { sleep }
+    snooze
+    f.interject { buf << Fiber.current }
+    snooze
+    assert_equal [f], buf
+    assert_equal :waiting, f.state
+
+    f.interject { buf << :foo; raise Polyphony::MoveOn }
+    snooze
+
+    assert_equal [f, :foo], buf
+    assert_equal :dead, f.state
+  end
+
   def test_state
     counter = 0
     f = spin do

data/test/test_resource_pool.rb

@@ -27,6 +27,27 @@ class ResourcePoolTest < MiniTest::Test
     assert_equal ['a', 'b', 'a', 'b'], results
   end
 
+  def test_discard
+    resources = [+'a', +'b']
+    pool = Polyphony::ResourcePool.new(limit: 2) { resources.shift }
+
+    results = []
+    4.times {
+      spin {
+        snooze
+        pool.acquire { |resource|
+        results << resource
+        pool.discard! if resource == 'b'
+          snooze
+        }
+      }
+    }
+    Fiber.current.await_all_children
+
+    assert_equal ['a', 'b', 'a', 'a'], results
+    assert_equal 1, pool.size
+  end
+
   def test_single_resource_limit
     resources = [+'a', +'b']
     pool = Polyphony::ResourcePool.new(limit: 1) { resources.shift }
@@ -41,7 +62,7 @@ class ResourcePoolTest < MiniTest::Test
         }
       }
     }
-    21.times { snooze }
+    Fiber.current.await_all_children
 
     assert_equal ['a'] * 10, results
   end
@@ -75,12 +96,16 @@ class ResourcePoolTest < MiniTest::Test
     resources = [+'a', +'b']
     pool = Polyphony::ResourcePool.new(limit: 1) { resources.shift }
 
+    results = []
     pool.acquire do |r|
-      assert_equal 'a', r
-      pool.acquire do |r|
-        assert_equal 'a', r
+      results << r
+      2.times do
+        pool.acquire do |r|
+          results << r
+        end
       end
     end
+    assert_equal ['a']*3, results
   end
 
   def test_overloaded_resource_pool

data/test/test_signal.rb

@@ -56,35 +56,11 @@ class SignalTrapTest < Minitest::Test
     assert_equal "3 - interrupted\n2 - terminated\n1 - terminated\n", buffer
   end
 
-  def test_signal_exception_possible_race_condition
+  def test_interrupt_signal_scheduling
     i, o = IO.pipe
     pid = Polyphony.fork do
       i.close
-      f1 = nil
-      f2 = spin do
-        # this fiber will try to create a race condition by
-        # - being scheduled before f1 is scheduled with the Interrupt exception
-        # - scheduling f1 without an exception
-        suspend
-        f1.schedule
-      rescue ::Interrupt => e
-        o.puts '2-interrupt'
-        raise e
-      end
-      f1 = spin do
-        # this fiber is the one that will be current when the
-        # signal is trapped
-        sleep 1
-        o << 'boom'
-      rescue ::Interrupt => e
-        o.puts '1-interrupt'
-        raise e
-      end
-      old_trap = trap('INT') do
-        f2.schedule
-        old_trap.()
-      end
-      Fiber.current.await_all_children
+      sleep
     rescue ::Interrupt => e
       o.puts '3-interrupt'
     ensure

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: 0.43.11
+  version: 0.44.0
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-24 00:00:00.000000000 Z
+date: 2020-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -164,6 +164,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.5.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.5.3
+- !ruby/object:Gem::Dependency
+  name: sequel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.34.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.34.0
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
@@ -293,6 +321,8 @@ files:
 - examples/adapters/redis_client.rb
 - examples/adapters/redis_pubsub.rb
 - examples/adapters/redis_pubsub_perf.rb
+- examples/adapters/sequel_mysql.rb
+- examples/adapters/sequel_mysql_pool.rb
 - examples/core/01-spinning-up-fibers.rb
 - examples/core/02-awaiting-fibers.rb
 - examples/core/03-interrupting.rb
@@ -407,9 +437,11 @@ files:
 - lib/polyphony.rb
 - lib/polyphony/adapters/fs.rb
 - lib/polyphony/adapters/irb.rb
+- lib/polyphony/adapters/mysql2.rb
 - lib/polyphony/adapters/postgres.rb
 - lib/polyphony/adapters/process.rb
 - lib/polyphony/adapters/redis.rb
+- lib/polyphony/adapters/sequel.rb
 - lib/polyphony/adapters/trace.rb
 - lib/polyphony/core/channel.rb
 - lib/polyphony/core/exceptions.rb