polyphony 0.43.10 → 0.43.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3000a280d995b187518c1e12f585939b4e67312db5458d105c6e6b40c784d5a
-  data.tar.gz: 5a582fc77ae044238521619b1d5364a0dd2aac13ca8a6b82d006ec1f23284d2d
+  metadata.gz: 5d1eb9e2b1eef7f180107b3952fc6974e9c816268ebd8d2368ddfaac276d2086
+  data.tar.gz: dafb382dc7606b92b97fb98125b57abc72e1b1d6b07bb877abff608a41ee51a1
 SHA512:
-  metadata.gz: 6d403109b1bbf55e1b0ab799d8c74752677784ca0c12cb5b1e21f62c9bdd244245966db8020b20a8d4ed988263a9535aef5a8aff24b50587c9583a67109d7677
-  data.tar.gz: 205d6c9859ec8d12ddf7630cbd3893a13d3efb3537dd734e53f17efe31d52399488761da45684d0da7e5074ce950c47a7e51f4a1446577e36f7c3c7838604a7a
+  metadata.gz: 9f91b787b3eec2c19f6a02fd8a77469c8ae5d7a9302799c3e2a5957376b9f4b0135d2cd958ec7dcf326701e8ba81d85a28201a140ce5806ccc057cedafe907d5
+  data.tar.gz: df865277e2f37c0d7fde0ffd38f52fc466bf28033fb968bd012af7455df9e7805989152467e1e8e84719194f173c99c6290496987ad8a2b48fe26076e62c85bd

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.43.11 2020-07-24
+
+* Dump uncaught exception info for forked process (#36)
+* Add additional socket config options (#37)
+  - :reuse_port (`SO_REUSEPORT`)
+  - :backlog (listen backlog, default `SOMAXCONN`)
+* Fix possible race condition in Queue#shift (#34)
+
 ## 0.43.10 2020-07-23
 
 * Fix race condition when terminating fibers (#33)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    polyphony (0.43.10)
+    polyphony (0.43.11)
 
 GEM
   remote: https://rubygems.org/

data/TODO.md

@@ -1,5 +1,3 @@
--- Add `Fiber#schedule_with_priority` method
-
 - Debugging
   - Eat your own dogfood: need a good tool to check what's going on when some
     test fails

data/ext/polyphony/agent.h

@@ -13,25 +13,27 @@
 // VALUE LibevAgent_post_fork(VALUE self);
 // VALUE LibevAgent_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_eof);
 // VALUE LibevAgent_read_loop(VALUE self, VALUE io);
-// VALUE LibevAgent_ref(VALUE self);
 // VALUE LibevAgent_sleep(VALUE self, VALUE duration);
-// VALUE LibevAgent_unref(VALUE self);
 // VALUE LibevAgent_wait_io(VALUE self, VALUE io, VALUE write);
 // VALUE LibevAgent_wait_pid(VALUE self, VALUE pid);
 // VALUE LibevAgent_write(int argc, VALUE *argv, VALUE self);
 
 typedef VALUE (* agent_pending_count_t)(VALUE self);
 typedef VALUE (*agent_poll_t)(VALUE self, VALUE nowait, VALUE current_fiber, VALUE queue);
+typedef VALUE (* agent_ref_t)(VALUE self);
 typedef int (* agent_ref_count_t)(VALUE self);
 typedef void (* agent_reset_ref_count_t)(VALUE self);
+typedef VALUE (* agent_unref_t)(VALUE self);
 typedef VALUE (* agent_wait_event_t)(VALUE self, VALUE raise_on_exception);
 typedef VALUE (* agent_wakeup_t)(VALUE self);
 
 typedef struct agent_interface {
   agent_pending_count_t   pending_count;
   agent_poll_t            poll;
+  agent_ref_t             ref;
   agent_ref_count_t       ref_count;
   agent_reset_ref_count_t reset_ref_count;
+  agent_unref_t           unref;
   agent_wait_event_t      wait_event;
   agent_wakeup_t          wakeup;
 } agent_interface_t;

data/ext/polyphony/libev_agent.c

@@ -11,16 +11,16 @@
 
 VALUE cTCPSocket;
 
-struct LibevAgent_t {
+typedef struct LibevAgent_t {
   struct ev_loop *ev_loop;
   struct ev_async break_async;
   int running;
   int ref_count;
   int run_no_wait_count;
-};
+} LibevAgent_t;
 
 static size_t LibevAgent_size(const void *ptr) {
-  return sizeof(struct LibevAgent_t);
+  return sizeof(LibevAgent_t);
 }
 
 static const rb_data_type_t LibevAgent_type = {
@@ -30,13 +30,13 @@ static const rb_data_type_t LibevAgent_type = {
 };
 
 static VALUE LibevAgent_allocate(VALUE klass) {
-  struct LibevAgent_t *agent = ALLOC(struct LibevAgent_t);
+  LibevAgent_t *agent = ALLOC(LibevAgent_t);
   
   return TypedData_Wrap_Struct(klass, &LibevAgent_type, agent);
 }
 
 #define GetLibevAgent(obj, agent) \
-  TypedData_Get_Struct((obj), struct LibevAgent_t, &LibevAgent_type, (agent))
+  TypedData_Get_Struct((obj), LibevAgent_t, &LibevAgent_type, (agent))
 
 void break_async_callback(struct ev_loop *ev_loop, struct ev_async *ev_async, int revents) {
   // This callback does nothing, the break async is used solely for breaking out
@@ -44,7 +44,7 @@ void break_async_callback(struct ev_loop *ev_loop, struct ev_async *ev_async, in
 }
 
 static VALUE LibevAgent_initialize(VALUE self) {
-  struct LibevAgent_t *agent;
+  LibevAgent_t *agent;
   VALUE thread = rb_thread_current();
   int is_main_thread = (thread == rb_thread_main());
 
@@ -63,7 +63,7 @@ static VALUE LibevAgent_initialize(VALUE self) {
 }
 
 VALUE LibevAgent_finalize(VALUE self) {
-  struct LibevAgent_t *agent;
+  LibevAgent_t *agent;
   GetLibevAgent(self, agent);
 
    ev_async_stop(agent->ev_loop, &agent->break_async);
@@ -74,7 +74,7 @@ VALUE LibevAgent_finalize(VALUE self) {
 }
 
 VALUE LibevAgent_post_fork(VALUE self) {
-  struct LibevAgent_t *agent;
+  LibevAgent_t *agent;
   GetLibevAgent(self, agent);
 
   if (!ev_is_default_loop(agent->ev_loop)) {
@@ -91,7 +91,7 @@ VALUE LibevAgent_post_fork(VALUE self) {
 }
 
 VALUE LibevAgent_ref(VALUE self) {
-  struct LibevAgent_t *agent;
+  LibevAgent_t *agent;
   GetLibevAgent(self, agent);
 
   agent->ref_count++;
@@ -99,7 +99,7 @@ VALUE LibevAgent_ref(VALUE self) {
 }
 
 VALUE LibevAgent_unref(VALUE self) {
-  struct LibevAgent_t *agent;
+  LibevAgent_t *agent;
   GetLibevAgent(self, agent);
 
   agent->ref_count--;
@@ -107,14 +107,14 @@ VALUE LibevAgent_unref(VALUE self) {
 }
 
 int LibevAgent_ref_count(VALUE self) {
-  struct LibevAgent_t *agent;
+  LibevAgent_t *agent;
   GetLibevAgent(self, agent);
 
   return agent->ref_count;
 }
 
 void LibevAgent_reset_ref_count(VALUE self) {
-  struct LibevAgent_t *agent;
+  LibevAgent_t *agent;
   GetLibevAgent(self, agent);
 
   agent->ref_count = 0;
@@ -122,7 +122,7 @@ void LibevAgent_reset_ref_count(VALUE self) {
 
 VALUE LibevAgent_pending_count(VALUE self) {
   int count;
-  struct LibevAgent_t *agent;
+  LibevAgent_t *agent;
   GetLibevAgent(self, agent);
   count = ev_pending_count(agent->ev_loop);
   return INT2NUM(count);
@@ -130,7 +130,7 @@ VALUE LibevAgent_pending_count(VALUE self) {
 
 VALUE LibevAgent_poll(VALUE self, VALUE nowait, VALUE current_fiber, VALUE queue) {
   int is_nowait = nowait == Qtrue;
-  struct LibevAgent_t *agent;
+  LibevAgent_t *agent;
   GetLibevAgent(self, agent);
 
   if (is_nowait) {
@@ -152,7 +152,7 @@ VALUE LibevAgent_poll(VALUE self, VALUE nowait, VALUE current_fiber, VALUE queue
 }
 
 VALUE LibevAgent_wakeup(VALUE self) {
-  struct LibevAgent_t *agent;
+  LibevAgent_t *agent;
   GetLibevAgent(self, agent);
 
   if (agent->running) {
@@ -246,7 +246,7 @@ void LibevAgent_io_callback(EV_P_ ev_io *w, int revents)
   Fiber_make_runnable(watcher->fiber, Qnil);
 }
 
-inline VALUE libev_await(struct LibevAgent_t *agent) {
+inline VALUE libev_await(LibevAgent_t *agent) {
   VALUE ret;
   agent->ref_count++;
   ret = Thread_switch_fiber(rb_thread_current());
@@ -256,12 +256,12 @@ inline VALUE libev_await(struct LibevAgent_t *agent) {
 }
 
 VALUE libev_agent_await(VALUE self) {
-  struct LibevAgent_t *agent;
+  LibevAgent_t *agent;
   GetLibevAgent(self, agent);
   return libev_await(agent);
 }
 
-VALUE libev_io_wait(struct LibevAgent_t *agent, struct libev_io *watcher, rb_io_t *fptr, int flags) {
+VALUE libev_io_wait(LibevAgent_t *agent, struct libev_io *watcher, rb_io_t *fptr, int flags) {
   VALUE switchpoint_result;
 
   if (watcher->fiber == Qnil) {
@@ -307,7 +307,7 @@ inline void io_set_nonblock(rb_io_t *fptr, VALUE io) {
 }
 
 VALUE LibevAgent_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_eof) {
-  struct LibevAgent_t *agent;
+  LibevAgent_t *agent;
   struct libev_io watcher;
   rb_io_t *fptr;
   long dynamic_len = length == Qnil;
@@ -396,7 +396,7 @@ VALUE LibevAgent_read_loop(VALUE self, VALUE io) {
     PREPARE_STR(); \
   }
 
-  struct LibevAgent_t *agent;
+  LibevAgent_t *agent;
   struct libev_io watcher;
   rb_io_t *fptr;
   VALUE str;
@@ -460,7 +460,7 @@ error:
 }
 
 VALUE LibevAgent_write(VALUE self, VALUE io, VALUE str) {
-  struct LibevAgent_t *agent;
+  LibevAgent_t *agent;
   struct libev_io watcher;
   rb_io_t *fptr;
   VALUE switchpoint_result = Qnil;
@@ -504,7 +504,7 @@ error:
 }
 
 VALUE LibevAgent_writev(VALUE self, VALUE io, int argc, VALUE *argv) {
-  struct LibevAgent_t *agent;
+  LibevAgent_t *agent;
   struct libev_io watcher;
   rb_io_t *fptr;
   VALUE switchpoint_result = Qnil;
@@ -586,7 +586,7 @@ VALUE LibevAgent_write_m(int argc, VALUE *argv, VALUE self) {
 ///////////////////////////////////////////////////////////////////////////
 
 VALUE LibevAgent_accept(VALUE self, VALUE sock) {
-  struct LibevAgent_t *agent;
+  LibevAgent_t *agent;
   struct libev_io watcher;
   rb_io_t *fptr;
   int fd;
@@ -640,7 +640,7 @@ error:
 }
 
 VALUE LibevAgent_accept_loop(VALUE self, VALUE sock) {
-  struct LibevAgent_t *agent;
+  LibevAgent_t *agent;
   struct libev_io watcher;
   rb_io_t *fptr;
   int fd;
@@ -696,7 +696,7 @@ error:
 }
 
 VALUE LibevAgent_connect(VALUE self, VALUE sock, VALUE host, VALUE port) {
-  struct LibevAgent_t *agent;
+  LibevAgent_t *agent;
   struct libev_io watcher;
   rb_io_t *fptr;
   struct sockaddr_in addr;
@@ -731,30 +731,33 @@ error:
   return rb_funcall(rb_mKernel, ID_raise, 1, switchpoint_result);
 }
 
-VALUE LibevAgent_wait_io(VALUE self, VALUE io, VALUE write) {
-  struct LibevAgent_t *agent;
+VALUE libev_wait_fd(LibevAgent_t *agent, int fd, int events, int raise_exception) {
   struct libev_io watcher;
-  rb_io_t *fptr;
   VALUE switchpoint_result = Qnil;
-  int events = RTEST(write) ? EV_WRITE : EV_READ;
-
-  VALUE underlying_io = rb_iv_get(io, "@io");
-  GetLibevAgent(self, agent);
-  if (underlying_io != Qnil) io = underlying_io;
-  GetOpenFile(io, fptr);
   
   watcher.fiber = rb_fiber_current();
-  ev_io_init(&watcher.io, LibevAgent_io_callback, fptr->fd, events);
+  ev_io_init(&watcher.io, LibevAgent_io_callback, fd, events);
   ev_io_start(agent->ev_loop, &watcher.io);
   switchpoint_result = libev_await(agent);
   ev_io_stop(agent->ev_loop, &watcher.io);
   
-  TEST_RESUME_EXCEPTION(switchpoint_result);
-  RB_GC_GUARD(watcher.fiber);
+  if (raise_exception) TEST_RESUME_EXCEPTION(switchpoint_result);
   RB_GC_GUARD(switchpoint_result);
   return switchpoint_result;
 }
 
+VALUE LibevAgent_wait_io(VALUE self, VALUE io, VALUE write) {
+  LibevAgent_t *agent;
+  rb_io_t *fptr;
+  int events = RTEST(write) ? EV_WRITE : EV_READ;
+  VALUE underlying_io = rb_iv_get(io, "@io");
+  if (underlying_io != Qnil) io = underlying_io;
+  GetLibevAgent(self, agent);
+  GetOpenFile(io, fptr);
+  
+  return libev_wait_fd(agent, fptr->fd, events, 1);
+}
+
 struct libev_timer {
   struct ev_timer timer;
   VALUE fiber;
@@ -767,7 +770,7 @@ void LibevAgent_timer_callback(EV_P_ ev_timer *w, int revents)
 }
 
 VALUE LibevAgent_sleep(VALUE self, VALUE duration) {
-  struct LibevAgent_t *agent;
+  LibevAgent_t *agent;
   struct libev_timer watcher;
   VALUE switchpoint_result = Qnil;
 
@@ -802,7 +805,7 @@ void LibevAgent_child_callback(EV_P_ ev_child *w, int revents)
 }
 
 VALUE LibevAgent_waitpid(VALUE self, VALUE pid) {
-  struct LibevAgent_t *agent;
+  LibevAgent_t *agent;
   struct libev_child watcher;
   VALUE switchpoint_result = Qnil;
   GetLibevAgent(self, agent);
@@ -821,7 +824,7 @@ VALUE LibevAgent_waitpid(VALUE self, VALUE pid) {
 }
 
 struct ev_loop *LibevAgent_ev_loop(VALUE self) {
-  struct LibevAgent_t *agent;
+  LibevAgent_t *agent;
   GetLibevAgent(self, agent);
   return agent->ev_loop;
 }
@@ -829,14 +832,14 @@ struct ev_loop *LibevAgent_ev_loop(VALUE self) {
 void LibevAgent_async_callback(EV_P_ ev_async *w, int revents) { }
 
 VALUE LibevAgent_wait_event(VALUE self, VALUE raise) {
-  struct LibevAgent_t *agent;
-  struct ev_async async;
+  LibevAgent_t *agent;
   VALUE switchpoint_result = Qnil;
   GetLibevAgent(self, agent);
 
+  struct ev_async async;
+
   ev_async_init(&async, LibevAgent_async_callback);
   ev_async_start(agent->ev_loop, &async);
-  
   switchpoint_result = libev_await(agent);
   ev_async_stop(agent->ev_loop, &async);
 
@@ -876,10 +879,12 @@ void Init_LibevAgent() {
 
   ID_ivar_is_nonblocking = rb_intern("@is_nonblocking");
 
-  __AGENT__.wakeup          = LibevAgent_wakeup;
   __AGENT__.pending_count   = LibevAgent_pending_count;
   __AGENT__.poll            = LibevAgent_poll;
+  __AGENT__.ref             = LibevAgent_ref;
   __AGENT__.ref_count       = LibevAgent_ref_count;
   __AGENT__.reset_ref_count = LibevAgent_reset_ref_count;
+  __AGENT__.unref           = LibevAgent_unref;
   __AGENT__.wait_event      = LibevAgent_wait_event;
+  __AGENT__.wakeup          = LibevAgent_wakeup;
 }

data/ext/polyphony/polyphony.h

@@ -8,7 +8,7 @@
 
 // debugging
 #define OBJ_ID(obj) (NUM2LONG(rb_funcall(obj, rb_intern("object_id"), 0)))
-#define INSPECT(obj) { VALUE s = rb_funcall(obj, rb_intern("inspect"), 0); printf("%s\n", StringValueCStr(s));}
+#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__); \
 }
@@ -20,11 +20,8 @@
 }
 
 extern agent_interface_t agent_interface;
-// #define __AGENT_PASTER__(call) (agent_interface ## . ## call)
-// #define __AGENT__(call) __AGENT_PASTER__(call)
 #define __AGENT__ (agent_interface)
 
-
 extern VALUE mPolyphony;
 extern VALUE cQueue;
 extern VALUE cEvent;

data/ext/polyphony/queue.c

@@ -54,6 +54,7 @@ static VALUE Queue_initialize(VALUE self) {
 VALUE Queue_push(VALUE self, VALUE value) {
   Queue_t *queue;
   GetQueue(self, queue);
+
   if (queue->shift_queue.count > 0) {
     VALUE fiber = ring_buffer_shift(&queue->shift_queue);
     if (fiber != Qnil) Fiber_make_runnable(fiber, Qnil);
@@ -77,21 +78,26 @@ VALUE Queue_shift(VALUE self) {
   Queue_t *queue;
   GetQueue(self, queue);
 
-  if (queue->values.count == 0) {
-    VALUE agent = rb_ivar_get(rb_thread_current(), ID_ivar_agent);
-    VALUE fiber = rb_fiber_current();
-    VALUE switchpoint_result = Qnil;
+  VALUE fiber = rb_fiber_current();
+  VALUE thread = rb_thread_current();
+  VALUE agent = rb_ivar_get(thread, ID_ivar_agent);
+
+  while (1) {
     ring_buffer_push(&queue->shift_queue, fiber);
-    switchpoint_result = __AGENT__.wait_event(agent, Qnil);
-    if (RTEST(rb_obj_is_kind_of(switchpoint_result, rb_eException))) {
-      ring_buffer_delete(&queue->shift_queue, fiber);
+    if (queue->values.count > 0) Fiber_make_runnable(fiber, Qnil);
+    
+    VALUE switchpoint_result = __AGENT__.wait_event(agent, Qnil);
+    ring_buffer_delete(&queue->shift_queue, fiber);
+
+    if (RTEST(rb_obj_is_kind_of(switchpoint_result, rb_eException)))
       return rb_funcall(rb_mKernel, ID_raise, 1, switchpoint_result);
-    }
-    RB_GC_GUARD(agent);
     RB_GC_GUARD(switchpoint_result);
+
+    if (queue->values.count > 0)
+      return ring_buffer_shift(&queue->values);
   }
 
-  return ring_buffer_shift(&queue->values);
+  return Qnil;
 }
 
 VALUE Queue_shift_no_wait(VALUE self) {
@@ -158,6 +164,13 @@ VALUE Queue_empty_p(VALUE self) {
   return (queue->values.count == 0) ? Qtrue : Qfalse;
 }
 
+VALUE Queue_pending_p(VALUE self) {
+  Queue_t *queue;
+  GetQueue(self, queue);
+
+  return (queue->shift_queue.count > 0) ? Qtrue : Qfalse;
+}
+
 VALUE Queue_size_m(VALUE self) {
   Queue_t *queue;
   GetQueue(self, queue);
@@ -190,5 +203,6 @@ void Init_Queue() {
   rb_define_method(cQueue, "shift_all", Queue_shift_all, 0);
   rb_define_method(cQueue, "flush_waiters", Queue_flush_waiters, 1);
   rb_define_method(cQueue, "empty?", Queue_empty_p, 0);
+  rb_define_method(cQueue, "pending?", Queue_pending_p, 0);
   rb_define_method(cQueue, "size", Queue_size_m, 0);
 }

data/lib/polyphony.rb

@@ -57,7 +57,7 @@ module Polyphony
       rescue SystemExit
         # fall through to ensure
       rescue Exception => e
-        e.full_message
+        warn e.full_message
         exit!
       ensure
         exit_forked_process

data/lib/polyphony/core/resource_pool.rb

@@ -24,7 +24,7 @@ module Polyphony
       fiber = Fiber.current
       return @acquired_resources[fiber] if @acquired_resources[fiber]
 
-      add_to_stock if @size < @limit && @stock.empty?
+      add_to_stock if (@stock.empty? || @stock.pending?) && @size < @limit 
       resource = @stock.shift
       @acquired_resources[fiber] = resource
       yield resource

data/lib/polyphony/extensions/socket.rb

@@ -67,6 +67,10 @@ class ::Socket
     setsockopt(Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1)
   end
 
+  def reuse_port
+    setsockopt(::Socket::SOL_SOCKET, ::Socket::SO_REUSEPORT, 1)
+  end
+
   class << self
     alias_method :orig_getaddrinfo, :getaddrinfo
     def getaddrinfo(*args)
@@ -120,6 +124,10 @@ class ::TCPSocket
   def reuse_addr
     setsockopt(::Socket::SOL_SOCKET, ::Socket::SO_REUSEADDR, 1)
   end
+
+  def reuse_port
+    setsockopt(::Socket::SOL_SOCKET, ::Socket::SO_REUSEPORT, 1)
+  end
 end
 
 # Override stock TCPServer code by encapsulating a Socket instance.

data/lib/polyphony/net.rb

@@ -35,9 +35,10 @@ module Polyphony
         ::Socket.new(:INET, :STREAM).tap do |s|
           s.reuse_addr if opts[:reuse_addr]
           s.dont_linger if opts[:dont_linger]
+          s.reuse_port if opts[:reuse_port]
           addr = ::Socket.sockaddr_in(port, host)
           s.bind(addr)
-          s.listen(0)
+          s.listen(opts[:backlog] || Socket::SOMAXCONN)
         end
       end
 

data/lib/polyphony/version.rb

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

data/test/test_fiber.rb

@@ -692,7 +692,7 @@ class FiberTest < MiniTest::Test
 
     f.schedule
     f << 'bar'
-    snooze
+    2.times { snooze }
     assert_equal ['bar'], buffer
   end
 end

data/test/test_resource_pool.rb

@@ -12,29 +12,19 @@ class ResourcePoolTest < MiniTest::Test
     assert_equal 0, pool.size
 
     results = []
-    4.times {
-      spin {
-        snooze
+    4.times { |i|
+      spin(:"foo#{i}") {
         pool.acquire { |resource|
           results << resource
           snooze
         }
       }
     }
-    2.times { snooze }
-    assert_equal 2, pool.limit
-    assert_equal 0, pool.available
-    assert_equal 2, pool.size
-
-    2.times { snooze }
-
-    assert_equal ['a', 'b', 'a', 'b'], results
-
-    2.times { snooze }
-
+    Fiber.current.await_all_children
     assert_equal 2, pool.limit
     assert_equal 2, pool.available
     assert_equal 2, pool.size
+    assert_equal ['a', 'b', 'a', 'b'], results
   end
 
   def test_single_resource_limit
@@ -51,7 +41,7 @@ class ResourcePoolTest < MiniTest::Test
         }
       }
     }
-    20.times { snooze }
+    21.times { snooze }
 
     assert_equal ['a'] * 10, results
   end
@@ -92,4 +82,23 @@ class ResourcePoolTest < MiniTest::Test
       end
     end
   end
+
+  def test_overloaded_resource_pool
+    pool = Polyphony::ResourcePool.new(limit: 1) { 1 }
+
+    buf = []
+    fibers = 2.times.map do |i|
+      spin(:"foo#{i}") do
+        2.times do
+          pool.acquire do |r|
+            buf << r
+            snooze
+          end
+        end
+      end
+    end
+    Fiber.current.await_all_children
+
+    assert_equal [1, 1, 1, 1], buf
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: 0.43.10
+  version: 0.43.11
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-23 00:00:00.000000000 Z
+date: 2020-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -477,7 +477,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Fine grained concurrency for Ruby