polyphony 0.43.5 → 0.43.11

data/test/test_queue.rb

@@ -96,4 +96,37 @@ class QueueTest < MiniTest::Test
     assert_nil f2.await
     assert_equal :bar, f3.await
   end
+
+  def test_fiber_removal_from_queue_simple
+    f1 = spin { @queue.shift }
+    
+    # let fibers run
+    snooze
+
+    f1.stop
+    snooze
+
+    @queue << :foo
+    assert_nil f1.await
+  end
+
+  def test_queue_size
+    assert_equal 0, @queue.size
+
+    @queue.push 1
+    
+    assert_equal 1, @queue.size
+
+    @queue.push 2
+    
+    assert_equal 2, @queue.size
+
+    @queue.shift
+
+    assert_equal 1, @queue.size
+
+    @queue.shift
+
+    assert_equal 0, @queue.size
+  end
 end

data/test/test_resource_pool.rb

@@ -12,72 +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
-  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
-          resource.__discard__ if resource == 'b'
-          snooze
-        }
-      }
-    }
-    6.times { snooze }
-
-    assert_equal ['a', 'b', 'a', 'a'], results
-    assert_equal 1, pool.size
-  end
-
-  def test_add
-    resources = [+'a', +'b']
-    pool = Polyphony::ResourcePool.new(limit: 2) { resources.shift }
-
-    pool << +'c'
-
-    results = []
-    4.times {
-      spin {
-        snooze
-        pool.acquire { |resource|
-          results << resource
-          resource.__discard__ if resource == 'b'
-          snooze
-        }
-      }
-    }
-    6.times { snooze }
-
-    assert_equal ['c', 'a', 'c', 'a'], results
+    assert_equal ['a', 'b', 'a', 'b'], results
   end
 
   def test_single_resource_limit
@@ -94,7 +41,7 @@ class ResourcePoolTest < MiniTest::Test
         }
       }
     }
-    20.times { snooze }
+    21.times { snooze }
 
     assert_equal ['a'] * 10, results
   end
@@ -135,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

data/test/test_trace.rb

@@ -34,7 +34,8 @@ class TraceTest < MiniTest::Test
 
   def test_2_fiber_trace
     records = []
-    t = Polyphony::Trace.new(:fiber_all) { |r| records << r if r[:event] =~ /^fiber_/ }
+    thread = Thread.current
+    t = Polyphony::Trace.new(:fiber_all) { |r| records << r if Thread.current == thread && r[:event] =~ /^fiber_/ }
     t.enable
     Polyphony.trace(true)
 
@@ -42,23 +43,23 @@ class TraceTest < MiniTest::Test
     suspend
     sleep 0
 
-    events = records.map { |r| [r[:fiber], r[:event]] }
+    events = records.map { |r| [r[:fiber] == f ? :f : :current, r[:event]] }
     assert_equal [
-      [f, :fiber_create],
-      [f, :fiber_schedule],
-      [Fiber.current, :fiber_switchpoint],
-      [f, :fiber_run],
-      [f, :fiber_switchpoint],
-      [f, :fiber_ev_loop_enter],
-      [f, :fiber_schedule],
-      [f, :fiber_ev_loop_leave],
-      [f, :fiber_run],
-      [f, :fiber_terminate],
-      [Fiber.current, :fiber_switchpoint],
-      [Fiber.current, :fiber_ev_loop_enter],
-      [Fiber.current, :fiber_schedule],
-      [Fiber.current, :fiber_ev_loop_leave],
-      [Fiber.current, :fiber_run]
+      [:f, :fiber_create],
+      [:f, :fiber_schedule],
+      [:current, :fiber_switchpoint],
+      [:f, :fiber_run],
+      [:f, :fiber_switchpoint],
+      [:f, :fiber_ev_loop_enter],
+      [:f, :fiber_schedule],
+      [:f, :fiber_ev_loop_leave],
+      [:f, :fiber_run],
+      [:f, :fiber_terminate],
+      [:current, :fiber_switchpoint],
+      [:current, :fiber_ev_loop_enter],
+      [:current, :fiber_schedule],
+      [:current, :fiber_ev_loop_leave],
+      [:current, :fiber_run]
     ], events
   ensure
     t&.disable

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: 0.43.5
+  version: 0.43.11
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-12 00:00:00.000000000 Z
+date: 2020-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -241,7 +241,10 @@ files:
 - Rakefile
 - TODO.md
 - bin/polyphony-debug
+- bin/stress.rb
 - docs/_config.yml
+- docs/_includes/head.html
+- docs/_includes/title.html
 - docs/_sass/custom/custom.scss
 - docs/_sass/overrides.scss
 - docs/_user-guide/all-about-timers.md
@@ -351,6 +354,8 @@ files:
 - examples/io/xx-system.rb
 - examples/io/xx-tcpserver.rb
 - examples/io/xx-tcpsocket.rb
+- examples/io/xx-zip.rb
+- examples/performance/fiber_transfer.rb
 - examples/performance/fs_read.rb
 - examples/performance/mem-usage.rb
 - examples/performance/messaging.rb
@@ -367,6 +372,7 @@ files:
 - examples/performance/xx-array.rb
 - examples/performance/xx-fiber-switch.rb
 - examples/performance/xx-snooze.rb
+- examples/xx-spin.rb
 - ext/libev/Changes
 - ext/libev/LICENSE
 - ext/libev/README
@@ -383,15 +389,17 @@ files:
 - ext/libev/ev_win32.c
 - ext/libev/ev_wrap.h
 - ext/libev/test_libev_win32.c
+- ext/polyphony/agent.h
+- ext/polyphony/event.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/queue.c
 - ext/polyphony/ring_buffer.c
 - ext/polyphony/ring_buffer.h
 - ext/polyphony/thread.c
@@ -410,7 +418,6 @@ 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
@@ -470,7 +477,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Fine grained concurrency for Ruby

data/ext/polyphony/libev_queue.c

@@ -1,288 +0,0 @@
-#include "polyphony.h"
-#include "ring_buffer.h"
-
-struct async_watcher {
-  ev_async async;
-  struct ev_loop *ev_loop;
-  VALUE fiber;
-};
-
-struct async_watcher_queue {
-  struct async_watcher **queue;
-  unsigned int length;
-  unsigned int count;
-  unsigned int push_idx;
-  unsigned int shift_idx;
-};
-
-void async_watcher_queue_init(struct async_watcher_queue *queue) {
-  queue->length = 1;
-  queue->count = 0;
-  queue->queue = malloc(sizeof(struct async_watcher *) * queue->length);
-  queue->push_idx = 0;
-  queue->shift_idx = 0;
-}
-
-void async_watcher_queue_free(struct async_watcher_queue *queue) {
-  free(queue->queue);
-}
-
-void async_watcher_queue_realign(struct async_watcher_queue *queue) {
-  memmove(
-    queue->queue,
-    queue->queue + queue->shift_idx,
-    queue->count * sizeof(struct async_watcher *)
-  );
-  queue->push_idx = queue->push_idx - queue->shift_idx;
-  queue->shift_idx = 0;
-}
-
-#define QUEUE_REALIGN_THRESHOLD 32
-
-void async_watcher_queue_push(struct async_watcher_queue *queue, struct async_watcher *watcher) {
-  if (queue->count == 0) {
-    queue->push_idx = 0;
-    queue->shift_idx = 0;
-  }
-  if (queue->push_idx == queue->length) {
-    // prevent shift idx moving too much away from zero
-    if (queue->length >= QUEUE_REALIGN_THRESHOLD && queue->shift_idx >= (queue->length / 2))
-      async_watcher_queue_realign(queue);
-    else {
-      queue->length = (queue->length == 1) ? 4 : queue->length * 2;
-      queue->queue = realloc(queue->queue, sizeof(struct async_watcher *) * queue->length);
-    }
-  }
-  queue->count++;
-  queue->queue[queue->push_idx++] = watcher;
-}
-
-struct async_watcher *async_watcher_queue_shift(struct async_watcher_queue *queue) {
-  if (queue->count == 0) return 0;
-
-  queue->count--;
-
-  return queue->queue[queue->shift_idx++];
-}
-
-void async_watcher_queue_remove_at_idx(struct async_watcher_queue *queue, unsigned int remove_idx) {
-  queue->count--;
-  queue->push_idx--;
-  if (remove_idx < queue->push_idx)
-    memmove(
-      queue->queue + remove_idx,
-      queue->queue + remove_idx + 1,
-      (queue->push_idx - remove_idx) * sizeof(struct async_watcher *)
-    );
-}
-
-void async_watcher_queue_remove_by_fiber(struct async_watcher_queue *queue, VALUE fiber) {
-  if (queue->count == 0) return;
-
-  for (unsigned idx = queue->shift_idx; idx < queue->push_idx; idx++) {
-    if (queue->queue[idx]->fiber == fiber) {
-      async_watcher_queue_remove_at_idx(queue, idx);
-      return; 
-    }
-  }
-}
-
-typedef struct queue {
-  ring_buffer values;
-  struct async_watcher_queue shift_queue;
-} LibevQueue_t;
-
-VALUE cLibevQueue = Qnil;
-
-static void LibevQueue_mark(void *ptr) {
-  LibevQueue_t *queue = ptr;
-  ring_buffer_mark(&queue->values);
-}
-
-static void LibevQueue_free(void *ptr) {
-  LibevQueue_t *queue = ptr;
-  ring_buffer_free(&queue->values);
-  async_watcher_queue_free(&queue->shift_queue);
-  xfree(ptr);
-}
-
-static size_t LibevQueue_size(const void *ptr) {
-  return sizeof(LibevQueue_t);
-}
-
-static const rb_data_type_t LibevQueue_type = {
-  "Queue",
-  {LibevQueue_mark, LibevQueue_free, LibevQueue_size,},
-  0, 0, 0
-};
-
-static VALUE LibevQueue_allocate(VALUE klass) {
-  LibevQueue_t *queue;
-
-  queue = ALLOC(LibevQueue_t);
-  return TypedData_Wrap_Struct(klass, &LibevQueue_type, queue);
-}
-
-#define GetQueue(obj, queue) \
-  TypedData_Get_Struct((obj), LibevQueue_t, &LibevQueue_type, (queue))
-
-static VALUE LibevQueue_initialize(VALUE self) {
-  LibevQueue_t *queue;
-  GetQueue(self, queue);
-
-  ring_buffer_init(&queue->values);
-  async_watcher_queue_init(&queue->shift_queue);
-
-  return self;
-}
-
-VALUE LibevQueue_push(VALUE self, VALUE value) {
-  LibevQueue_t *queue;
-  GetQueue(self, queue);
-  if (queue->shift_queue.count > 0) {
-    struct async_watcher *watcher = async_watcher_queue_shift(&queue->shift_queue);
-    if (watcher) {
-      ev_async_send(watcher->ev_loop, &watcher->async);
-    }
-  }
-  ring_buffer_push(&queue->values, value);
-  return self;
-}
-
-VALUE LibevQueue_unshift(VALUE self, VALUE value) {
-  LibevQueue_t *queue;
-  GetQueue(self, queue);
-  if (queue->shift_queue.count > 0) {
-    struct async_watcher *watcher = async_watcher_queue_shift(&queue->shift_queue);
-    if (watcher) {
-      ev_async_send(watcher->ev_loop, &watcher->async);
-    }
-  }
-  ring_buffer_unshift(&queue->values, value);
-  return self;
-}
-
-struct ev_loop *LibevAgent_ev_loop(VALUE self);
-
-void async_watcher_queue_callback(struct ev_loop *ev_loop, struct ev_async *ev_async, int revents) {
-  struct async_watcher *watcher = (struct async_watcher *)ev_async;
-  Fiber_make_runnable(watcher->fiber, Qnil);
-}
-
-VALUE libev_agent_await(VALUE self);
-
-VALUE LibevQueue_shift(VALUE self) {
-  LibevQueue_t *queue;
-  GetQueue(self, queue);
-
-  if (queue->values.count == 0) {
-    struct async_watcher watcher;
-    VALUE agent = rb_ivar_get(rb_thread_current(), ID_ivar_agent);
-    VALUE switchpoint_result = Qnil;
-
-    watcher.ev_loop = LibevAgent_ev_loop(agent);
-    watcher.fiber = rb_fiber_current();    
-    async_watcher_queue_push(&queue->shift_queue, &watcher);
-    ev_async_init(&watcher.async, async_watcher_queue_callback);
-    ev_async_start(watcher.ev_loop, &watcher.async);
-    
-    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))) {
-      async_watcher_queue_remove_by_fiber(&queue->shift_queue, watcher.fiber);
-      return rb_funcall(rb_mKernel, ID_raise, 1, switchpoint_result);
-    }
-    RB_GC_GUARD(watcher.fiber);
-    RB_GC_GUARD(agent);
-    RB_GC_GUARD(switchpoint_result);
-  }
-
-  return ring_buffer_shift(&queue->values);
-}
-
-VALUE LibevQueue_shift_no_wait(VALUE self) {
-    LibevQueue_t *queue;
-  GetQueue(self, queue);
-
-  return ring_buffer_shift(&queue->values);
-}
-
-VALUE LibevQueue_delete(VALUE self, VALUE value) {
-  LibevQueue_t *queue;
-  GetQueue(self, queue);
-
-  ring_buffer_delete(&queue->values, value);
-  return self;
-}
-
-VALUE LibevQueue_clear(VALUE self) {
-  LibevQueue_t *queue;
-  GetQueue(self, queue);
-
-  ring_buffer_clear(&queue->values);
-  return self;
-}
-
-long LibevQueue_len(VALUE self) {
-  LibevQueue_t *queue;
-  GetQueue(self, queue);
-
-  return queue->values.count;
-}
-
-VALUE LibevQueue_shift_each(VALUE self) {
-  LibevQueue_t *queue;
-  GetQueue(self, queue);
-
-  ring_buffer_shift_each(&queue->values);
-  return self;
-}
-
-VALUE LibevQueue_shift_all(VALUE self) {
-  LibevQueue_t *queue;
-  GetQueue(self, queue);
-
-  return ring_buffer_shift_all(&queue->values);
-}
-
-VALUE LibevQueue_empty_p(VALUE self) {
-  LibevQueue_t *queue;
-  GetQueue(self, queue);
-
-  return (queue->values.count == 0) ? Qtrue : Qfalse;
-}
-
-void LibevQueue_trace(VALUE self) {
-  LibevQueue_t *queue;
-  GetQueue(self, queue);
-
-  printf(
-    "queue size: %d count: %d head: %d tail: %d\n",
-    queue->values.size,
-    queue->values.count,
-    queue->values.head,
-    queue->values.tail
-  );
-}
-
-void Init_LibevQueue() {
-  cLibevQueue = rb_define_class_under(mPolyphony, "LibevQueue", rb_cData);
-  rb_define_alloc_func(cLibevQueue, LibevQueue_allocate);
-
-  rb_define_method(cLibevQueue, "initialize", LibevQueue_initialize, 0);
-  rb_define_method(cLibevQueue, "push", LibevQueue_push, 1);
-  rb_define_method(cLibevQueue, "<<", LibevQueue_push, 1);
-  rb_define_method(cLibevQueue, "unshift", LibevQueue_unshift, 1);
-
-  rb_define_method(cLibevQueue, "shift", LibevQueue_shift, 0);
-  rb_define_method(cLibevQueue, "pop", LibevQueue_shift, 0);
-  rb_define_method(cLibevQueue, "shift_no_wait", LibevQueue_shift_no_wait, 0);
-  rb_define_method(cLibevQueue, "delete", LibevQueue_delete, 1);
-
-  rb_define_method(cLibevQueue, "shift_each", LibevQueue_shift_each, 0);
-  rb_define_method(cLibevQueue, "shift_all", LibevQueue_shift_all, 0);
-  rb_define_method(cLibevQueue, "empty?", LibevQueue_empty_p, 0);
-}
-
-