polyphony 0.45.2 → 0.47.0

data/test/test_queue.rb

@@ -129,4 +129,121 @@ class QueueTest < MiniTest::Test
 
     assert_equal 0, @queue.size
   end
+end
+
+class CappedQueueTest < MiniTest::Test
+  def setup
+    super
+    @queue = Polyphony::Queue.new
+    @queue.cap(3)
+  end
+
+  def test_capped?
+    q = Polyphony::Queue.new
+    assert_nil q.capped?
+
+    q.cap(3)
+    assert_equal 3, q.capped?
+  end
+
+  def test_initalize_with_cap
+    q = Polyphony::Queue.new(42)
+    assert_equal 42, q.capped?
+  end
+
+  def test_capped_push
+    buffer = []
+    a = spin do
+      (1..5).each do |i|
+        @queue.push(i)
+        buffer << :"p#{i}"
+      end
+      @queue.push :stop
+    end
+
+    snooze
+
+    b = spin_loop do
+      i = @queue.shift
+      raise Polyphony::Terminate if i == :stop
+      buffer << :"s#{i}"
+    end
+
+    Fiber.join(a, b)
+    assert_equal [:p1, :p2, :s1, :p3, :s2, :p4, :s3, :p5, :s4, :s5], buffer
+  end
+
+  def test_capped_multi_push
+    buffer = []
+    a = spin(:a) do
+      (1..3).each do |i|
+        @queue.push(i)
+        buffer << :"p#{i}"
+      end
+    end
+
+    buffer = []
+    b = spin(:b) do
+      (4..6).each do |i|
+        @queue.push(i)
+        buffer << :"p#{i}"
+      end
+      @queue.push :stop
+    end
+
+    c = spin_loop do
+      i = @queue.shift
+      raise Polyphony::Terminate if i == :stop
+      buffer << :"s#{i}"
+      snooze
+    end
+
+    Fiber.join(a, b, c)
+    assert_equal [:p1, :p4, :s1, :p5, :p2, :s4, :p3, :s5, :p6, :s2, :s3, :s6], buffer
+  end
+
+  def test_capped_clear
+    buffer = []
+    a = spin(:a) do
+      (1..5).each do |i|
+        @queue.push(i)
+        buffer << i
+      end
+    end
+
+    snooze while buffer.size < 3
+    @queue.clear
+    buffer << :clear
+
+    a.join
+    assert_equal [1, 2, 3, :clear, 4, 5], buffer
+  end
+
+  def test_capped_delete
+    buffer = []
+    a = spin(:a) do
+      (1..5).each do |i|
+        @queue.push(i)
+        buffer << i
+      end
+    end
+
+    i = 0
+    spin_loop do
+      i += 1
+      snooze 
+    end
+
+    5.times { snooze }
+    assert_equal 5, i
+    @queue.delete 1
+    buffer << :"d#{i}"
+    3.times { snooze }
+    assert_equal 8, i
+    @queue.delete 2
+    buffer << :"d#{i}"
+
+    a.join
+    assert_equal [1, 2, 3, :d5, 4, :d8, 5], buffer
+  end
 end

data/test/test_signal.rb

@@ -3,18 +3,21 @@
 require_relative 'helper'
 
 class SignalTrapTest < Minitest::Test
+  def test_int_signal
+    Thread.new { sleep 0.001; Process.kill('INT', Process.pid) }
+    assert_raises(Interrupt) { sleep 5 }
+  end
+
+  def test_term_signal
+    Thread.new { sleep 0.001; Process.kill('TERM', Process.pid) }
+    assert_raises(SystemExit) { sleep 5 }
+  end
+
   def test_signal_exception_handling
     i, o = IO.pipe
     pid = Polyphony.fork do
       i.close
-      spin do
-        spin do
-          sleep 5
-        rescue ::Interrupt => e
-          # the signal should be raised only in the main fiber
-          o.puts "1-interrupt"
-        end.await
-      end.await
+      sleep 5
     rescue ::Interrupt => e
       o.puts "3-interrupt"
     ensure

data/test/test_socket.rb

@@ -40,12 +40,12 @@ class HTTPClientTest < MiniTest::Test
   def test_http
     res = HTTParty.get('http://worldtimeapi.org/api/timezone/Europe/Paris')
     response = JSON.load(res.body)
-    assert_equal "CEST", response['abbreviation']
+    assert_equal "CET", response['abbreviation']
   end
 
   def test_https
     res = HTTParty.get('https://worldtimeapi.org/api/timezone/Europe/Paris')
     response = JSON.load(res.body)
-    assert_equal "CEST", response['abbreviation']
+    assert_equal "CET", response['abbreviation']
   end
 end

data/test/test_sync.rb

@@ -20,6 +20,27 @@ class MutexTest < MiniTest::Test
     assert_equal ['>> 1', '<< 1', '>> 2', '<< 2', '>> 3', '<< 3'], buf
   end
 
+  def test_mutex_race_condition
+    lock = Polyphony::Mutex.new
+    buf = []
+    f1 = spin do
+      lock.synchronize { buf << 1; snooze; lock.synchronize { buf << 1.1 }; snooze }
+    end
+    f2 = spin do
+      lock.synchronize { buf << 2 }
+    end
+    f3 = spin do
+      lock.synchronize { buf << 3 }
+    end
+
+    snooze
+    f2.terminate
+
+    f3.await
+
+    assert_equal [1, 1.1, 3], buf
+  end
+
   def test_condition_variable
     buf = []
     lock1 = Polyphony::Mutex.new

data/test/test_throttler.rb

@@ -10,9 +10,7 @@ class ThrottlerTest < MiniTest::Test
     f = spin { loop { t.process { buffer << 1 } } }
     sleep 0.2
     f.stop
-    elapsed = Time.now - t0
-    expected = (elapsed * 10).to_i
-    assert buffer.size >= expected - 1 && buffer.size <= expected + 1
+    assert_in_range 1..3, buffer.size
   ensure
     t.stop
   end
@@ -25,7 +23,7 @@ class ThrottlerTest < MiniTest::Test
     end
     sleep 0.25
     f.stop
-    assert (2..6).include?(buffer.size)
+    assert_in_range 2..6, buffer.size
   ensure
     t.stop
   end
@@ -36,8 +34,7 @@ class ThrottlerTest < MiniTest::Test
     f = spin { loop { t.process { buffer << 1 } } }
     sleep 0.02
     f.stop
-    assert buffer.size >= 2
-    assert buffer.size <= 3
+    assert_in_range 2..3, buffer.size
   ensure
     t.stop
   end

data/test/test_trace.rb

@@ -35,7 +35,9 @@ class TraceTest < MiniTest::Test
   def test_2_fiber_trace
     records = []
     thread = Thread.current
-    t = Polyphony::Trace.new(:fiber_all) { |r| records << r if Thread.current == thread && r[:event] =~ /^fiber_/ }
+    t = Polyphony::Trace.new(:fiber_all) do |r|
+      records << r if Thread.current == thread && r[:event] =~ /^fiber_/
+    end
     t.enable
     Polyphony.trace(true)
 
@@ -50,15 +52,15 @@ class TraceTest < MiniTest::Test
       [:current, :fiber_switchpoint],
       [:f, :fiber_run],
       [:f, :fiber_switchpoint],
-      [:f, :fiber_ev_loop_enter],
+      [:f, :fiber_event_poll_enter],
       [:f, :fiber_schedule],
-      [:f, :fiber_ev_loop_leave],
+      [:f, :fiber_event_poll_leave],
       [:f, :fiber_run],
       [:f, :fiber_terminate],
       [:current, :fiber_switchpoint],
-      [:current, :fiber_ev_loop_enter],
+      [:current, :fiber_event_poll_enter],
       [:current, :fiber_schedule],
-      [:current, :fiber_ev_loop_leave],
+      [:current, :fiber_event_poll_leave],
       [:current, :fiber_run]
     ], events
   ensure

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: 0.45.2
+  version: 0.47.0
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-03 00:00:00.000000000 Z
+date: 2020-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -278,6 +278,7 @@ extra_rdoc_files:
 files:
 - ".github/workflows/test.yml"
 - ".gitignore"
+- ".gitmodules"
 - ".rubocop.yml"
 - ".vscode/launch.json"
 - CHANGELOG.md
@@ -289,6 +290,7 @@ files:
 - TODO.md
 - bin/polyphony-debug
 - bin/stress.rb
+- bin/test
 - docs/_config.yml
 - docs/_includes/head.html
 - docs/_includes/title.html
@@ -346,6 +348,7 @@ files:
 - examples/core/await.rb
 - examples/core/channels.rb
 - examples/core/deferring-an-operation.rb
+- examples/core/enumerable.rb
 - examples/core/erlang-style-genserver.rb
 - examples/core/forking.rb
 - examples/core/handling-signals.rb
@@ -377,11 +380,14 @@ files:
 - examples/io/open.rb
 - examples/io/pry.rb
 - examples/io/rack_server.rb
+- examples/io/raw.rb
+- examples/io/reline.rb
 - examples/io/system.rb
 - examples/io/tcpserver.rb
 - examples/io/tcpsocket.rb
 - examples/io/tunnel.rb
 - examples/io/zip.rb
+- examples/performance/fiber_resume.rb
 - examples/performance/fiber_transfer.rb
 - examples/performance/fs_read.rb
 - examples/performance/mem-usage.rb
@@ -390,6 +396,8 @@ files:
 - examples/performance/snooze.rb
 - examples/performance/snooze_raw.rb
 - examples/performance/switch.rb
+- examples/performance/thread-vs-fiber/compare.rb
+- examples/performance/thread-vs-fiber/em_server.rb
 - examples/performance/thread-vs-fiber/httparty_multi.rb
 - examples/performance/thread-vs-fiber/httparty_threaded.rb
 - examples/performance/thread-vs-fiber/polyphony_mt_server.rb
@@ -397,6 +405,7 @@ files:
 - examples/performance/thread-vs-fiber/polyphony_server_read_loop.rb
 - examples/performance/thread-vs-fiber/threaded_server.rb
 - examples/performance/thread_pool_perf.rb
+- examples/performance/thread_switch.rb
 - ext/libev/Changes
 - ext/libev/LICENSE
 - ext/libev/README
@@ -413,19 +422,38 @@ files:
 - ext/libev/ev_win32.c
 - ext/libev/ev_wrap.h
 - ext/libev/test_libev_win32.c
+- ext/liburing/liburing.h
+- ext/liburing/liburing/README.md
+- ext/liburing/liburing/barrier.h
+- ext/liburing/liburing/compat.h
+- ext/liburing/liburing/io_uring.h
+- ext/liburing/queue.c
+- ext/liburing/register.c
+- ext/liburing/setup.c
+- ext/liburing/syscall.c
+- ext/liburing/syscall.h
 - ext/polyphony/backend.h
+- ext/polyphony/backend_common.h
+- ext/polyphony/backend_io_uring.c
+- ext/polyphony/backend_io_uring_context.c
+- ext/polyphony/backend_io_uring_context.h
+- ext/polyphony/backend_libev.c
 - ext/polyphony/event.c
 - ext/polyphony/extconf.rb
 - ext/polyphony/fiber.c
 - ext/polyphony/libev.c
 - ext/polyphony/libev.h
-- ext/polyphony/libev_backend.c
+- ext/polyphony/liburing.c
+- ext/polyphony/playground.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/runqueue.c
+- ext/polyphony/runqueue_ring_buffer.c
+- ext/polyphony/runqueue_ring_buffer.h
 - ext/polyphony/thread.c
 - ext/polyphony/tracing.c
 - lib/polyphony.rb
@@ -446,6 +474,7 @@ files:
 - lib/polyphony/core/thread_pool.rb
 - lib/polyphony/core/throttler.rb
 - lib/polyphony/extensions/core.rb
+- lib/polyphony/extensions/debug.rb
 - lib/polyphony/extensions/fiber.rb
 - lib/polyphony/extensions/io.rb
 - lib/polyphony/extensions/openssl.rb
@@ -457,6 +486,7 @@ files:
 - test/coverage.rb
 - test/eg.rb
 - test/helper.rb
+- test/io_uring_test.rb
 - test/q.rb
 - test/run.rb
 - test/stress.rb
@@ -505,7 +535,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Fine grained concurrency for Ruby