polyphony 0.43.4 → 0.43.10

data/test/test_agent.rb

@@ -6,7 +6,7 @@ class AgentTest < MiniTest::Test
   def setup
     super
     @prev_agent = Thread.current.agent
-    @agent = Polyphony::LibevAgent.new
+    @agent = Polyphony::Agent.new
     Thread.current.agent = @agent
   end
 
@@ -97,7 +97,7 @@ class AgentTest < MiniTest::Test
     o.close
 
     # read_loop will snooze after every read
-    4.times { snooze }
+    6.times { snooze }
 
     assert_equal [:ready, 'foo', 'bar', :done], buf
   end

data/test/test_event.rb

@@ -34,6 +34,7 @@ class EventTest < MiniTest::Test
       }
     }
     snooze
+
     t = Thread.new do
       orig_sleep 0.001
       3.times { a.signal }
@@ -45,4 +46,15 @@ class EventTest < MiniTest::Test
     t&.kill
     t&.join
   end
+
+  def test_exception_while_waiting_for_event
+    e = Polyphony::Event.new
+
+    f = spin { e.await }
+    g = spin { f.raise 'foo' }
+
+    assert_raises(RuntimeError) do
+      f.await
+    end
+  end
 end

data/test/test_global_api.rb

@@ -211,13 +211,13 @@ class SpinLoopTest < MiniTest::Test
 
   def test_spin_loop_location
     location = /^#{__FILE__}:#{__LINE__ + 1}/
-    f = spin_loop {}
+    f = spin_loop { snooze }
     
     assert_match location, f.location
   end
 
   def test_spin_loop_tag
-    f = spin_loop(:my_loop) {}
+    f = spin_loop(:my_loop) { snooze }
 
     assert_equal :my_loop, f.tag
   end

data/test/test_io.rb

@@ -30,6 +30,14 @@ class IOTest < MiniTest::Test
     assert_equal 'hello', msg
   end
 
+  def test_write_multiple_arguments
+    i, o = IO.pipe
+    count = o.write('a', 'b', "\n", 'c')
+    assert_equal 4, count
+    o.close
+    assert_equal "ab\nc", i.read
+  end
+
   def test_that_double_chevron_method_returns_io
     assert_equal @o, @o << 'foo'
 
@@ -83,6 +91,20 @@ class IOTest < MiniTest::Test
 
     assert_raises(EOFError) { i.readpartial(1) }    
   end
+
+  # see https://github.com/digital-fabric/polyphony/issues/30
+  def test_reopened_tempfile
+    file = Tempfile.new
+    file << 'hello: world'
+    file.close
+
+    buf = nil
+    File.open(file, 'r:bom|utf-8') do |f|
+      buf = f.read(16384)
+    end
+
+    assert_equal 'hello: world', buf
+  end
 end
 
 class IOClassMethodsTest < MiniTest::Test
@@ -121,7 +143,7 @@ class IOClassMethodsTest < MiniTest::Test
     assert_equal "end\n", lines[-1]
   end
 
-  def test_read
+  def test_read_class_method
     s = IO.read(__FILE__)
     assert_kind_of String, s
     assert(!s.empty?)
@@ -144,7 +166,7 @@ class IOClassMethodsTest < MiniTest::Test
 
   WRITE_DATA = "foo\nbar קוקו"
 
-  def test_write
+  def test_write_class_method
     fn = '/tmp/test_write'
     FileUtils.rm(fn) rescue nil
 

data/test/test_queue.rb

@@ -8,7 +8,7 @@ class QueueTest < MiniTest::Test
     @queue = Polyphony::Queue.new
   end
 
-  def test_pop
+  def test_push_shift
     spin {
       @queue << 42
     }
@@ -21,6 +21,18 @@ class QueueTest < MiniTest::Test
     assert_equal [1, 2, 3, 4], buf
   end
 
+  def test_unshift
+    @queue.push 1
+    @queue.push 2
+    @queue.push 3
+    @queue.unshift 4
+
+    buf = []
+    buf << @queue.shift while !@queue.empty?
+
+    assert_equal [4, 1, 2, 3], buf
+  end
+
   def test_multiple_waiters
     a = spin { @queue.shift }
     b = spin { @queue.shift }
@@ -41,6 +53,19 @@ class QueueTest < MiniTest::Test
     buf = []
     @queue.shift_each { |i| buf << i }
     assert_equal [1, 2, 3, 4], buf
+
+    buf = []
+    @queue.shift_each { |i| buf << i }
+    assert_equal [], buf
+  end
+
+  def test_shift_all
+    (1..4).each { |i| @queue << i }
+    buf = @queue.shift_all
+    assert_equal [1, 2, 3, 4], buf
+
+    buf = @queue.shift_all
+    assert_equal [], buf
   end
 
   def test_empty?
@@ -71,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

@@ -37,49 +37,6 @@ class ResourcePoolTest < MiniTest::Test
     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
-  end
-
   def test_single_resource_limit
     resources = [+'a', +'b']
     pool = Polyphony::ResourcePool.new(limit: 1) { resources.shift }

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.4
+  version: 0.43.10
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-09 00:00:00.000000000 Z
+date: 2020-07-23 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,8 +354,11 @@ 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
 - examples/performance/multi_snooze.rb
 - examples/performance/snooze.rb
 - examples/performance/snooze_raw.rb
@@ -366,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
@@ -382,15 +389,19 @@ 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
 - ext/polyphony/tracing.c
 - lib/polyphony.rb
@@ -407,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
@@ -420,6 +430,7 @@ files:
 - test/coverage.rb
 - test/eg.rb
 - test/helper.rb
+- test/q.rb
 - test/run.rb
 - test/stress.rb
 - test/test_agent.rb
@@ -466,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.0.8
 signing_key: 
 specification_version: 4
 summary: Fine grained concurrency for Ruby

data/ext/polyphony/libev_queue.c

@@ -1,217 +0,0 @@
-#include "polyphony.h"
-
-struct async_watcher {
-  ev_async async;
-  struct ev_loop *ev_loop;
-  VALUE fiber;
-};
-
-struct async_queue {
-  struct async_watcher **queue;
-  unsigned int len;
-  unsigned int count;
-  unsigned int push_idx;
-  unsigned int pop_idx;
-};
-
-void async_queue_init(struct async_queue *queue) {
-  queue->len = 4;
-  queue->count = 0;
-  queue->queue = malloc(sizeof(struct async_watcher *) * queue->len);
-  queue->push_idx = 0;
-  queue->pop_idx = 0;
-}
-
-void async_queue_free(struct async_queue *queue) {
-  free(queue->queue);
-}
-
-void async_queue_push(struct async_queue *queue, struct async_watcher *watcher) {
-  if (queue->push_idx == queue->len) {
-    queue->len = queue->len * 2;
-    queue->queue = realloc(queue->queue, sizeof(struct async_watcher *) * queue->len);
-  }
-  if (queue->count == 0) {
-    queue->push_idx = 0;
-    queue->pop_idx = 0;
-  }
-  queue->count++;
-  queue->queue[queue->push_idx++] = watcher;
-}
-
-struct async_watcher *async_queue_pop(struct async_queue *queue) {
-  if (queue->count == 0) return 0;
-
-  queue->count--;
-
-  return queue->queue[queue->pop_idx++];
-}
-
-void async_queue_remove_at_idx(struct async_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_queue_remove_by_fiber(struct async_queue *queue, VALUE fiber) {
-  if (queue->count == 0) return;
-
-  for (unsigned idx = queue->pop_idx; idx < queue->push_idx; idx++) {
-    if (queue->queue[idx]->fiber == fiber) {
-      async_queue_remove_at_idx(queue, idx);
-      return; 
-    }
-  }
-}
-
-typedef struct queue {
-  VALUE items;
-  struct async_queue shift_queue;
-} LibevQueue_t;
-
-
-VALUE cLibevQueue = Qnil;
-
-static void LibevQueue_mark(void *ptr) {
-  LibevQueue_t *queue = ptr;
-  rb_gc_mark(queue->items);
-}
-
-static void LibevQueue_free(void *ptr) {
-  LibevQueue_t *queue = ptr;
-  async_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);
-
-  queue->items = rb_ary_new();
-  async_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_queue_pop(&queue->shift_queue);
-    if (watcher) {
-      ev_async_send(watcher->ev_loop, &watcher->async);
-    }
-  }
-  rb_ary_push(queue->items, value);
-  return self;
-}
-
-struct ev_loop *LibevAgent_ev_loop(VALUE self);
-
-void async_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 (RARRAY_LEN(queue->items) == 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_queue_push(&queue->shift_queue, &watcher);
-    ev_async_init(&watcher.async, async_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_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 rb_ary_shift(queue->items);
-}
-
-VALUE LibevQueue_shift_each(VALUE self) {
-  LibevQueue_t *queue;
-  VALUE old_queue;
-  GetQueue(self, queue);
-  old_queue = queue->items;
-  queue->items = rb_ary_new();
-
-  if (rb_block_given_p()) {
-    long len = RARRAY_LEN(old_queue);
-    long i;
-    for (i = 0; i < len; i++) {
-      rb_yield(RARRAY_AREF(old_queue, i));
-    }
-    RB_GC_GUARD(old_queue);
-    return self;
-  }
-  else {
-    RB_GC_GUARD(old_queue);
-    return old_queue;
-  }
-}
-
-VALUE LibevQueue_empty_p(VALUE self) {
-  LibevQueue_t *queue;
-  GetQueue(self, queue);
-
-  return (RARRAY_LEN(queue->items) == 0) ? Qtrue : Qfalse;
-}
-
-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, "pop", LibevQueue_shift, 0);
-  rb_define_method(cLibevQueue, "shift", LibevQueue_shift, 0);
-
-  rb_define_method(cLibevQueue, "shift_each", LibevQueue_shift_each, 0);
-  rb_define_method(cLibevQueue, "empty?", LibevQueue_empty_p, 0);
-}
-
-