polyphony 0.26 → 0.27

data/test/test_fiber.rb

@@ -327,8 +327,8 @@ class FiberTest < MiniTest::Test
   def test_select_from_multiple_fibers
     buffer = []
     f1 = spin { sleep 0.01; buffer << :foo; :foo }
-    f2 = spin { sleep 0.02; buffer << :bar; :bar }
-    f3 = spin { sleep 0.03; buffer << :baz; :baz }
+    f2 = spin { sleep 0.03; buffer << :bar; :bar }
+    f3 = spin { sleep 0.05; buffer << :baz; :baz }
 
     result, selected = Fiber.select(f1, f2, f3)
     assert_equal :foo, result

data/test/test_global_api.rb

@@ -63,7 +63,7 @@ class CancelScopeTest < Minitest::Test
     # async operation will only begin on next iteration of event loop
     assert_nil ctx[:cancel_scope]
 
-    Gyro.run
+    Thread.current.switch_fiber
     assert_kind_of Polyphony::CancelScope, ctx[:cancel_scope]
     assert_kind_of Polyphony::Cancel, ctx[:result]
   end
@@ -75,7 +75,7 @@ class CancelScopeTest < Minitest::Test
       sleep_with_cancel(ctx, :stop)
     end
 
-    Gyro.run
+    Thread.current.switch_fiber
     assert ctx[:cancel_scope]
     assert_nil ctx[:result]
   end
@@ -272,7 +272,7 @@ class MoveOnAfterTest < MiniTest::Test
     end
     sleep 0.1
     f.stop
-    assert_equal [1, 2, 3, 4, 5], buffer    
+    assert counter >= 5 && counter <= 6
   end
 
   def test_throttled_loop_with_count
@@ -299,8 +299,7 @@ class MoveOnAfterTest < MiniTest::Test
     t0 = Time.now
     sleep 0.05
     elapsed = Time.now - t0
-    puts "* elapsed: #{elapsed.inspect}"
-    assert (0.045..0.8).include? elapsed
+    assert (0.045..0.08).include? elapsed
 
     f = spin { sleep }
     snooze

data/test/test_gyro.rb

@@ -109,6 +109,7 @@ class GyroTest < MiniTest::Test
   end
 
   def test_break
+    skip "break is still not implemented for new scheduler"
     values = []
     Fiber.new do
       values << :foo
@@ -137,7 +138,7 @@ class GyroTest < MiniTest::Test
     end.schedule
 
     f2 = Fiber.new do
-      Gyro.reset!
+      Thread.current.reset_fiber_scheduling
       values << :restarted
       snooze
       values << :baz
@@ -161,7 +162,7 @@ class GyroTest < MiniTest::Test
     end.schedule
 
     Fiber.new do
-      Gyro.reset!
+      Thread.current.reset_fiber_scheduling
 
       # control is transfer to the fiber that called Gyro.restart
       values << :restarted

data/test/test_io.rb

@@ -28,6 +28,7 @@ end
 
 class IOTest < MiniTest::Test
   def setup
+    super
     @i, @o = IO.pipe
   end
 

data/test/test_supervisor.rb

@@ -55,9 +55,9 @@ class SupervisorTest < MiniTest::Test
     buffer = []
     foo_f = bar_f = baz_f = nil
     result, f = Polyphony::Supervisor.new.select { |s|
-      foo_f = s.spin { sleep 0.01; buffer << :foo; :foo }
-      bar_f = s.spin { sleep 0.03; buffer << :bar; :bar }
-      baz_f = s.spin { sleep 0.05; buffer << :baz; :baz }
+      foo_f = s.spin { sleep 0.1; buffer << :foo; :foo }
+      bar_f = s.spin { sleep 0.3; buffer << :bar; :bar }
+      baz_f = s.spin { sleep 0.5; buffer << :baz; :baz }
     }
 
     assert_equal :foo, result

data/test/test_thread.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+
+class ThreadTest < MiniTest::Test
+  def test_thread_spin
+    buffer = []
+    spin { (1..3).each { |i| snooze; buffer << i } }
+    t = Thread.new do
+      s1 = spin { (11..13).each { |i| snooze; buffer << i } }
+      s2 = spin { (21..23).each { |i| snooze; buffer << i } }
+      Fiber.join(s1, s2)
+    end
+    t.join
+
+    assert_equal [1, 2, 3, 11, 12, 13, 21, 22, 23], buffer.sort
+  end
+
+  def test_thread_join
+    buffer = []
+    spin { (1..3).each { |i| snooze; buffer << i } }
+    t = Thread.new { sleep 0.01; buffer << 4 }
+    r = t.join
+
+    assert_equal [1, 2, 3, 4], buffer
+    assert_equal t, r
+  end
+
+  def test_thread_join_with_timeout
+    buffer = []
+    spin { (1..3).each { |i| snooze; buffer << i } }
+    t = Thread.new { sleep 1; buffer << 4 }
+    t0 = Time.now
+    r = t.join(0.01)
+
+    assert Time.now - t0 < 0.2
+    assert_equal [1, 2, 3], buffer
+    assert_nil r
+  ensure
+    # killing the thread will prevent stopping the sleep timer, as well as the
+    # thread's event selector, leading to a memory leak.
+    t.kill if t.alive?
+  end
+end

data/test/test_throttler.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+
+class ThrottlerTest < MiniTest::Test
+  def test_throttler_with_rate
+    t = Polyphony::Throttler.new(100)
+    buffer = []
+    f = spin { loop { t.process { buffer << 1 } } }
+    sleep 0.02
+    f.stop
+    assert buffer.size >= 2
+    assert buffer.size <= 3
+  ensure
+    t.stop
+  end
+
+  def test_throttler_with_hash_of_rate
+    t = Polyphony::Throttler.new(rate: 100)
+    buffer = []
+    f = spin { loop { t.process { buffer << 1 } } }
+    sleep 0.02
+    f.stop
+    assert buffer.size >= 2
+    assert buffer.size <= 3
+  ensure
+    t.stop
+  end
+
+  def test_throttler_with_hash_of_interval
+    t = Polyphony::Throttler.new(interval: 0.01)
+    buffer = []
+    f = spin { loop { t.process { buffer << 1 } } }
+    sleep 0.02
+    f.stop
+    assert buffer.size >= 2
+    assert buffer.size <= 3
+  ensure
+    t.stop
+  end
+end

data/test/test_timer.rb

@@ -26,25 +26,31 @@ class TimerTest < MiniTest::Test
     }
     suspend
     assert_equal 3, count
+  ensure
+    t.stop
   end
 
   def test_that_repeating_timer_compensates_for_drift
     count = 0
-    t = Gyro::Timer.new(0.01, 0.01)
-    times = []
+    t = Gyro::Timer.new(0.1, 0.1)
+    deltas = []
     last = nil
     spin {
       last = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
       loop {
         t.await
-        times << ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
+        now = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
+        elapsed = (now - last)
+        deltas << elapsed
+        last = now
         count += 1
-        sleep 0.005
-        break if count >= 10
+        sleep 0.05
+        break if count >= 3
       }
     }
     suspend
-    deltas = times.each_with_object([]) { |t, a| a << t - last; last = t }
-    assert_equal 0, deltas.filter { |d| (d - 0.01).abs >= 0.006 }.size
+    assert_equal 0, deltas[1..-1].filter { |d| (d - 0.1).abs >= 0.05 }.size
+  ensure
+    t.stop
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: '0.26'
+  version: '0.27'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-12 00:00:00.000000000 Z
+date: 2020-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: modulation
@@ -203,6 +203,9 @@ files:
 - examples/core/xx-extended_fibers.rb
 - examples/core/xx-forking.rb
 - examples/core/xx-move_on.rb
+- examples/core/xx-mt-scheduler.rb
+- examples/core/xx-queue-async.rb
+- examples/core/xx-readpartial.rb
 - examples/core/xx-recurrent-timer.rb
 - examples/core/xx-resource_cancel.rb
 - examples/core/xx-resource_delegate.rb
@@ -210,7 +213,10 @@ files:
 - examples/core/xx-sleeping.rb
 - examples/core/xx-spin_error_backtrace.rb
 - examples/core/xx-supervisors.rb
-- examples/core/xx-thread_cancel.rb
+- examples/core/xx-thread-selector-sleep.rb
+- examples/core/xx-thread-selector-snooze.rb
+- examples/core/xx-thread-sleep.rb
+- examples/core/xx-thread-snooze.rb
 - examples/core/xx-thread_pool.rb
 - examples/core/xx-throttling.rb
 - examples/core/xx-timeout.rb
@@ -241,11 +247,11 @@ files:
 - examples/performance/multi_snooze.rb
 - examples/performance/snooze.rb
 - examples/performance/snooze_raw.rb
+- examples/performance/thread-vs-fiber/polyphony_mt_server.rb
 - examples/performance/thread-vs-fiber/polyphony_server.rb
 - examples/performance/thread-vs-fiber/threaded_server.rb
 - examples/performance/thread-vs-fiber/xx-httparty_multi.rb
 - examples/performance/thread-vs-fiber/xx-httparty_threaded.rb
-- examples/performance/thread.rb
 - examples/performance/thread_pool_perf.rb
 - ext/gyro/async.c
 - ext/gyro/child.c
@@ -256,8 +262,11 @@ files:
 - ext/gyro/io.c
 - ext/gyro/libev.c
 - ext/gyro/libev.h
+- ext/gyro/queue.c
+- ext/gyro/selector.c
 - ext/gyro/signal.c
 - ext/gyro/socket.c
+- ext/gyro/thread.c
 - ext/gyro/timer.c
 - ext/libev/Changes
 - ext/libev/LICENSE
@@ -283,7 +292,6 @@ files:
 - lib/polyphony/core/resource_pool.rb
 - lib/polyphony/core/supervisor.rb
 - lib/polyphony/core/sync.rb
-- lib/polyphony/core/thread.rb
 - lib/polyphony/core/thread_pool.rb
 - lib/polyphony/core/throttler.rb
 - lib/polyphony/extensions/core.rb
@@ -291,6 +299,7 @@ files:
 - lib/polyphony/extensions/io.rb
 - lib/polyphony/extensions/openssl.rb
 - lib/polyphony/extensions/socket.rb
+- lib/polyphony/extensions/thread.rb
 - lib/polyphony/fs.rb
 - lib/polyphony/line_reader.rb
 - lib/polyphony/net.rb
@@ -313,6 +322,8 @@ files:
 - test/test_resource_pool.rb
 - test/test_signal.rb
 - test/test_supervisor.rb
+- test/test_thread.rb
+- test/test_throttler.rb
 - test/test_timer.rb
 homepage: https://dfab.gitbook.io/polyphony/
 licenses:
@@ -339,7 +350,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: 'Polyphony: Fiber-based Concurrency for Ruby'

data/examples/core/xx-thread_cancel.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-require 'bundler/setup'
-require 'polyphony'
-
-@op_count = 0
-
-def lengthy_op
-  100.times do
-    orig_sleep 0.01
-    @op_count += 1
-  end
-  @op_count
-end
-
-spin do
-  cancel_after(0.1) do
-    data = Polyphony::Thread.process { lengthy_op }
-    puts "slept #{data} times"
-  end
-rescue Exception => e
-  puts "error: #{e}"
-ensure
-  sleep 0.1
-  puts "slept #{@op_count} times"
-end
-
-suspend

data/examples/performance/thread.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-require 'bundler/setup'
-require 'polyphony'
-
-def lengthy_op
-  10.times { IO.orig_read(__FILE__) }
-end
-
-X = 1000
-
-def blocking
-  t0 = Time.now
-  data = lengthy_op
-  X.times { lengthy_op }
-  puts "read blocking (#{Time.now - t0}s)"
-end
-
-def threaded
-  t0 = Time.now
-  data = Polyphony::Thread.process { lengthy_op }
-  X.times { Polyphony::Thread.process { lengthy_op } }
-  puts "read threaded (#{Time.now - t0}s)"
-end
-
-blocking
-threaded

data/lib/polyphony/core/thread.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-export :process
-
-Exceptions = import('./exceptions')
-
-def process(&block)
-  watcher = Gyro::Async.new
-  thread = Thread.new { run_in_thread(watcher, &block) }
-  watcher.await
-ensure
-  thread.kill if thread.alive?
-end
-
-# Runs the given block, passing the result or exception to the given context
-# @param ctx [Hash] context
-# @return [void]
-def run_in_thread(watcher)
-  result = yield
-  watcher.signal!(result)
-rescue Exception => e
-  watcher.signal!(e)
-end