uringmachine 0.28.3 → 0.29.1

data/test/test_fiber.rb

@@ -109,6 +109,34 @@ class FiberJoinTest < UMBaseTest
     assert_equal [:foo, :bar, :baz], res
   end
 
+  def test_join_array
+    f1 = machine.spin do
+      :foo
+    end
+
+    f2 = machine.spin do
+      machine.sleep(0.001)
+      :bar
+    end
+
+    f3 = machine.spin do
+      :baz
+    end
+
+    res = machine.join([f1, f2, f3])
+    assert_equal [:foo, :bar, :baz], res
+  end
+
+  def test_join_procs
+    res = machine.join(
+      ->(_) { machine.snooze;      :f1 },
+      ->(_) { machine.sleep(0.01); :f2 },
+      ->(_) { machine.sleep(0.02); :f3 }
+    )
+    assert_equal [:f1, :f2, :f3], res
+    assert machine.fiber_set.empty?
+  end
+
   def test_join_cross_thread
     q = UM::Queue.new
 
@@ -142,7 +170,7 @@ class FiberJoinTest < UMBaseTest
 end
 
 class WaitFibersTest < UMBaseTest
-  def test_await_fibers
+  def test_await
     q = UM::Queue.new
     x = nil
 
@@ -163,19 +191,40 @@ class WaitFibersTest < UMBaseTest
       machine.push q, 2
     end
 
-    res = machine.await_fibers([f])
+    res = machine.await([f])
     assert_equal 0, x
     assert_equal 3, machine.shift(q)
     assert_equal 1, res
 
     done = nil
     f = machine.spin { machine.snooze; done = true }
-    res = machine.await_fibers(f)
+    res = machine.await(f)
     assert done
     assert_equal 1, res
   end
 
-  def test_await_fibers_multiple
+  def test_await_multiple
+    f1 = machine.spin do
+      :foo
+    end
+
+    f2 = machine.spin do
+      machine.sleep(0.001)
+      :bar
+    end
+
+    f3 = machine.spin do
+      :baz
+    end
+
+    res = machine.await([f1, f2, f3])
+    assert_equal 3, res
+    assert_equal true, f1.done?
+    assert_equal true, f2.done?
+    assert_equal true, f3.done?
+  end
+
+  def test_await_multiple_splat
     f1 = machine.spin do
       :foo
     end
@@ -189,11 +238,43 @@ class WaitFibersTest < UMBaseTest
       :baz
     end
 
-    res = machine.await_fibers([f1, f2, f3])
+    res = machine.await(f1, f2, f3)
+    assert_equal 3, res
+    assert_equal true, f1.done?
+    assert_equal true, f2.done?
+    assert_equal true, f3.done?
+  end
+
+  def test_await_procs
+    buf = []
+    res = machine.await(
+      ->(_) { machine.snooze;      buf << :f1 },
+      ->(_) { machine.sleep(0.01); buf << :f2 },
+      ->(_) { machine.sleep(0.02); buf << :f3 }
+    )
+    assert_equal 3, res
+    assert_equal [:f1, :f2, :f3], buf
+  end
+
+  def test_await_mixed
+    buf = []
+
+    f1 = machine.spin do
+      machine.sleep(0.01)
+      buf << :f1
+    end
+    f2 = ->(_) { buf << :f2_in; machine.sleep(0.02); buf << :f2_out }
+    f3 = machine.spin do
+      machine.sleep(0.005)
+      buf << :f3
+    end
+
+    res = machine.await(f1, f2, f3)
     assert_equal 3, res
+    assert_equal [:f2_in, :f3, :f1, :f2_out], buf
   end
 
-  def test_await_fibers_cross_thread
+  def test_await_cross_thread
     q = UM::Queue.new
 
     t2 = Thread.new do
@@ -203,32 +284,32 @@ class WaitFibersTest < UMBaseTest
         m2.snooze
         :foo
       end
-      m2.await_fibers(f)
+      m2.await(f)
     end
 
     f = machine.shift(q)
     assert_kind_of Fiber, f
-    res = machine.await_fibers(f)
+    res = machine.await(f)
     assert_equal 1, res
   ensure
     t2.join
   end
 
-  def test_await_fibers_with_exception
+  def test_await_with_exception
     f = machine.spin do
       raise "Foobar"
     end
 
-    res = machine.await_fibers(f)
+    res = machine.await(f)
     assert_equal 1, res
   end
 
-  def test_await_fibers_terminate
+  def test_await_terminate
     f1 = machine.spin { machine.sleep(1) }
     f2 = machine.spin { machine.sleep(1) }
     done = false
     a = machine.spin do
-      machine.await_fibers([f1, f2])
+      machine.await([f1, f2])
     rescue UM::Terminate
       done = true
     end

data/test/test_fiber_scheduler.rb

@@ -6,6 +6,7 @@ require 'securerandom'
 require 'socket'
 require 'net/http'
 require 'json'
+require 'timeout'
 
 class MethodCallAuditor
   attr_reader :calls
@@ -235,7 +236,6 @@ class FiberSchedulerTest < UMBaseTest
     assert_equal 'oba', buf
     assert_equal({
       fiber: 1,
-      blocking_operation_wait: 1,
       io_pread: 1,
       io_close: 1,
       join: 1
@@ -261,7 +261,6 @@ class FiberSchedulerTest < UMBaseTest
     assert_equal 'fobazr', IO.read(fn)
     assert_equal({
       fiber: 1,
-      blocking_operation_wait: 1,
       io_pwrite: 1,
       io_close: 1,
       join: 1
@@ -402,7 +401,6 @@ class FiberSchedulerTest < UMBaseTest
     assert_equal 'foobar', buf
     assert_equal({
       fiber: 2,
-      blocking_operation_wait: 2,
       io_write: 1,
       io_read: 2,
       io_close: 2,
@@ -425,12 +423,11 @@ class FiberSchedulerTest < UMBaseTest
       sleep 0.001
       File.open(fn, 'r') { buf = it.read  }
     end
-    assert_equal 2, machine.metrics[:total_ops]
     @scheduler.join
+    assert_equal 8, machine.metrics[:total_ops]
     assert_equal 'foobar', buf
     assert_equal({
       fiber: 2,
-      blocking_operation_wait: 2,
       io_write: 1,
       io_read: 2,
       io_close: 2,
@@ -452,7 +449,6 @@ class FiberSchedulerTest < UMBaseTest
     assert_equal 'foo', IO.read(fn)
     assert_equal({
       fiber: 1,
-      blocking_operation_wait: 1,
       io_write: 1,
       io_close: 1,
       join: 1
@@ -472,7 +468,6 @@ class FiberSchedulerTest < UMBaseTest
     assert_equal 'foobar', IO.read(fn)
     assert_equal({
       fiber: 1,
-      blocking_operation_wait: 1,
       io_write: 2,
       io_close: 1,
       join: 1
@@ -492,7 +487,6 @@ class FiberSchedulerTest < UMBaseTest
     # assert_equal 'foo', IO.read(fn)
     assert_equal({
       fiber: 1,
-      blocking_operation_wait: 1, # open
       io_write: 1,
       io_close: 1,
       join: 1
@@ -667,7 +661,6 @@ class FiberSchedulerTest < UMBaseTest
       fiber: 1,
       io_write: 2,
       io_read: 1,
-      blocking_operation_wait: 1,
       process_wait: 1,
       join: 1
     }, scheduler_calls_tally)
@@ -718,7 +711,6 @@ class FiberSchedulerTest < UMBaseTest
       fiber: 1,
       io_read: 2,
       io_close: 1,
-      blocking_operation_wait: 1,
       address_resolve: 1,
       join: 1
     }, scheduler_calls_tally)
@@ -727,16 +719,15 @@ class FiberSchedulerTest < UMBaseTest
   def test_fiber_scheduler_timeout_after
     res = nil
     Fiber.schedule do
-      Timeout.timeout(0.05) do
+      Timeout.timeout(0.1) do
         sleep 1
       end
       res = true
-    rescue => e
-      res = e
+    rescue => res
     end
     @scheduler.join
-    assert_equal 3, machine.metrics[:total_ops]
     assert_kind_of Timeout::Error, res
+    assert_equal 3, machine.metrics[:total_ops]
     assert_equal({
       fiber: 1,
       timeout_after: 1,
@@ -764,30 +755,6 @@ class FiberSchedulerTest < UMBaseTest
     r.close rescue nil
     w.close rescue nil
   end
-
-  def test_fiber_scheduler_blocking_operation_wait_single_issuer
-    buf = []
-    (1..10).each { |i|
-      op = -> { i * 10}
-      buf << @scheduler.blocking_operation_wait(op)
-      sleep 0.01
-      @machine.snooze
-    }
-    assert_equal (1..10).map { it * 10 }, buf
-
-    buf = []
-    (1..20).each { |i|
-      op = -> { i * 10}
-      Fiber.schedule do
-        sleep 0.001
-        buf << @scheduler.blocking_operation_wait(op)
-        sleep 0.001
-      end
-    }
-    @scheduler.join
-
-    assert_equal (1..20).map { it * 10 }, buf.sort
-  end
 end
 
 class FiberSchedulerIOClassMethodsTest < UMBaseTest
@@ -816,7 +783,6 @@ class FiberSchedulerIOClassMethodsTest < UMBaseTest
     assert_equal({
       fiber: 1,
       io_read: 2,
-      blocking_operation_wait: 1,
       io_close: 1,
       join: 1
     }, scheduler_calls_tally)
@@ -832,7 +798,6 @@ class FiberSchedulerIOClassMethodsTest < UMBaseTest
     assert_equal '==***', IO.read(@fn)
     assert_equal({
       fiber: 1,
-      blocking_operation_wait: 1,
       io_write: 1,
       io_close: 1,
       join: 1
@@ -850,7 +815,6 @@ class FiberSchedulerIOClassMethodsTest < UMBaseTest
     assert_equal '===', IO.read(fn2)
     assert_equal({
       fiber: 1,
-      blocking_operation_wait: 3,
       io_close: 2,
       join: 1
     }, scheduler_calls_tally)
@@ -868,7 +832,6 @@ class FiberSchedulerIOClassMethodsTest < UMBaseTest
     assert_equal({
       fiber: 1,
       io_read: 3,
-      blocking_operation_wait: 1,
       io_close: 1,
       join: 1
     }, scheduler_calls_tally)
@@ -899,7 +862,6 @@ class FiberSchedulerIOClassMethodsTest < UMBaseTest
     assert_equal({
       fiber: 1,
       io_read: 2,
-      blocking_operation_wait: 1,
       io_close: 1,
       join: 1
     }, scheduler_calls_tally)
@@ -915,7 +877,6 @@ class FiberSchedulerIOClassMethodsTest < UMBaseTest
     assert_equal({
       fiber: 1,
       io_read: 3,
-      blocking_operation_wait: 1,
       io_close: 1,
       join: 1
     }, scheduler_calls_tally)
@@ -948,7 +909,6 @@ class FiberSchedulerIOClassMethodsTest < UMBaseTest
     assert_equal '==***', IO.read(@fn)
     assert_equal({
       fiber: 1,
-      blocking_operation_wait: 1,
       io_write: 1,
       io_close: 1,
       join: 1
@@ -1459,7 +1419,6 @@ class FiberSchedulerNetHTTPTest < UMBaseTest
     assert_equal C, calls[:fiber]
     assert_equal C, calls[:io_close]
     assert_in_range (C * 2)..(C * 4), calls[:io_wait]
-    assert_in_range (C * 7)..(C * 20), calls[:blocking_operation_wait]
   end
 end
 
@@ -1534,9 +1493,9 @@ class FiberSchedulerMultiTCPTest < UMBaseTest
     W.times {
       fibers << Fiber.schedule { run_client(port) }
     }
-    @machine.await_fibers(fibers)
+    @machine.await(fibers)
     server.close
-    @machine.await_fibers(server_fiber)
+    @machine.await(server_fiber)
   rescue Exception => e
     p test_run_server: e
     p e.backtrace
@@ -1598,7 +1557,7 @@ class FiberSchedulerMultiTCPTest < UMBaseTest
         run_server(port)
       end
     end
-    @machine.await_fibers(fibers)
+    @machine.await(fibers)
     @calls = scheduler_calls_tally
   ensure
     # p ensure: ios
@@ -1653,7 +1612,6 @@ class FiberSchedulerErrorTest < UMBaseTest
     assert_equal({
       fiber: 1,
       io_read: 1,
-      blocking_operation_wait: 3,
       io_close: 1,
       join: 1
     }, scheduler_calls_tally)