uringmachine 0.7 → 0.8.1

data/test/test_actor.rb

@@ -7,7 +7,7 @@ require 'uringmachine/actor'
 class ActorTest < UMBaseTest
   module Counter
     def setup
-      @count = 0      
+      @count = 0
     end
 
     def incr
@@ -24,16 +24,17 @@ class ActorTest < UMBaseTest
   end
 
   def test_basic_actor_functionality
+    mailbox = UM::Queue.new
     actor = @machine.spin_actor(Counter)
-    
+
     assert_kind_of Fiber, actor
 
-    assert_equal 0, actor.call(:get)
-    assert_equal 1, actor.call(:incr)
+    assert_equal 0, actor.call(mailbox, :get)
+    assert_equal 1, actor.call(mailbox, :incr)
     assert_equal actor, actor.cast(:incr)
-    assert_equal 2, actor.call(:get)
+    assert_equal 2, actor.call(mailbox, :get)
     assert_equal actor, actor.cast(:reset)
-    assert_equal 0, actor.call(:get)
+    assert_equal 0, actor.call(mailbox, :get)
   end
 
   module Counter2
@@ -57,7 +58,8 @@ class ActorTest < UMBaseTest
 
   def test_actor_with_args
     actor = @machine.spin_actor(Counter2, 43)
-    
-    assert_equal 43, actor.call(:get)
+    mailbox = UM::Queue.new
+
+    assert_equal 43, actor.call(mailbox, :get)
   end
 end

data/test/test_async_op.rb

@@ -37,9 +37,9 @@ class AsyncOpTest < UMBaseTest
     assert_equal 1, machine.pending_count
     @op.cancel
     assert_equal false, @op.done?
-    
+
     machine.sleep(0.01)
-  
+
     assert_equal 0, machine.pending_count
     assert_equal true, @op.done?
     assert_equal (-ECANCELED), @op.result
@@ -52,7 +52,7 @@ class AsyncOpTest < UMBaseTest
     end
 
     res = @op.await
-  
+
     assert_equal 0, machine.pending_count
     assert_equal true, @op.done?
     assert_equal (-ECANCELED), res
@@ -63,7 +63,7 @@ class AsyncOpTest < UMBaseTest
 
   def test_async_op_await_with_timeout
     e = nil
-  
+
     begin
       machine.timeout(0.01, TOError) do
         @op.await
@@ -80,7 +80,7 @@ class AsyncOpTest < UMBaseTest
 
   def test_async_op_await_with_timeout2
     e = nil
-  
+
     begin
       machine.timeout(0.1, TOError) do
         @op.await

data/test/test_fiber.rb

@@ -0,0 +1,174 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+require 'socket'
+
+class FiberSpinTest < UMBaseTest
+  def test_spin
+    x = nil
+    f = machine.spin do
+      x = :foo
+    end
+
+    assert_kind_of Fiber, f
+    assert_nil x
+
+    machine.snooze
+
+    assert_equal :foo, x
+  end
+
+  def test_spin_with_initial_value
+    x = nil
+    f = machine.spin(42) do |v|
+      x = v
+    end
+
+    assert_kind_of Fiber, f
+    assert_nil x
+
+    machine.snooze
+    assert_equal 42, x
+  end
+
+  class MyFiber < Fiber
+  end
+
+  def test_spin_with_custom_class
+    f = machine.spin(nil, MyFiber) do
+    end
+
+    assert_kind_of MyFiber, f
+  end
+end
+
+class FiberTerminateTest < UMBaseTest
+  def test_terminate_fiber
+    x = nil
+    f = machine.spin do
+      x = 1
+      machine.sleep 0.01
+    ensure
+      x = 0
+    end
+
+    assert_nil x
+    machine.snooze
+    assert_equal 1, x
+
+    machine.schedule(f, UM::Terminate.new)
+    2.times { machine.snooze }
+
+    assert_equal 0, x
+  end
+end
+
+class JoinTest < UMBaseTest
+  def test_join
+    q = UM::Queue.new
+    x = nil
+
+    f = machine.spin do
+      x = 1
+      machine.push q, machine.shift(q) + 1
+      42
+    ensure
+      x = 0
+    end
+
+    assert_nil x
+    machine.snooze
+    assert_equal 1, x
+
+    machine.spin do
+      x = 2
+      machine.push q, 2
+    end
+
+    res = machine.join(f)
+    assert_equal 0, x
+    assert_equal 3, machine.shift(q)
+    assert_equal [42], res
+  end
+
+  def test_join_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.join(f1, f2, f3)
+    assert_equal [:foo, :bar, :baz], res
+  end
+
+  def test_join_cross_thread
+    q = UM::Queue.new
+
+    t2 = Thread.new do
+      m2 = UM.new
+      f = m2.spin do
+        m2.push(q, f)
+        m2.snooze
+        :foo
+      end
+      m2.join(f)
+    end
+
+    f = machine.shift(q)
+    assert_kind_of Fiber, f
+    res = machine.join(f)
+    assert_equal [:foo], res
+  ensure
+    t2.join
+  end
+
+  def test_join_with_exception
+    f = machine.spin do
+      raise "Foobar"
+    end
+
+    res = machine.join(f)
+    e = res.first
+    assert_kind_of RuntimeError, e
+    assert_equal 'Foobar', e.message
+  end
+end
+
+class ScopeTest < UMBaseTest
+  def test_scope
+    skip
+
+    x1 = nil
+    x2 = nil
+
+    t0 = monotonic_clock
+    machine.scope do
+      f1 = machine.spin do
+        x1 = 1
+        machine.sleep 0.01
+      ensure
+        x1 = 0
+      end
+
+      f2 = machine.spin do
+        x2 = 1
+        machine.sleep 0.03
+      ensure
+        x2 = 0
+      end
+    end
+    elapsed = monotonic_clock - t0
+    assert_in_range 0.03..0.05, elapsed
+
+    assert_equal 0, x1
+    assert_equal 0, x2
+  end
+end

data/test/test_um.rb

@@ -11,7 +11,7 @@ class UringMachineTest < Minitest::Test
   end
 end
 
-class FiberTest < UMBaseTest
+class SpinTest < UMBaseTest
   def test_spin
     x = nil
     f = machine.spin do
@@ -27,6 +27,24 @@ class FiberTest < UMBaseTest
   end
 end
 
+class SnoozeTest < UMBaseTest
+  def test_snooze_while_sleeping_fiber
+    f = machine.spin do
+      machine.sleep(0.1)
+    end
+
+    t0 = monotonic_clock
+    machine.snooze
+    t1 = monotonic_clock
+    assert_in_range 0..0.001, t1 - t0
+
+    t0 = monotonic_clock
+    machine.snooze
+    t1 = monotonic_clock
+    assert_in_range 0..0.001, t1 - t0
+  end
+end
+
 class ScheduleTest < UMBaseTest
   def test_schedule_and_yield
     buf = []
@@ -60,7 +78,7 @@ class ScheduleTest < UMBaseTest
       buf << e
       machine.yield
     end
-    
+
     machine.schedule(f, nil)
     # start the f fiber
     machine.snooze
@@ -80,7 +98,7 @@ class ScheduleTest < UMBaseTest
       machine.schedule(main, e)
       machine.yield
     end
-    
+
     machine.schedule(f, nil)
     t0 = monotonic_clock
 
@@ -234,7 +252,7 @@ class PeriodicallyTest < UMBaseTest
     t1 = monotonic_clock
     assert_in_range 0.05..0.09, t1 - t0
     assert_equal 5, count
-    assert_equal 1, cancel 
+    assert_equal 1, cancel
   end
 
   def test_periodically_with_timeout
@@ -258,7 +276,7 @@ class PeriodicallyTest < UMBaseTest
     t1 = monotonic_clock
     assert_in_range 0.05..0.08, t1 - t0
     assert_in_range 4..6, count
-    assert_equal 1, cancel 
+    assert_equal 1, cancel
 
   end
 end
@@ -331,7 +349,7 @@ class ReadTest < UMBaseTest
 
     buffer = +'foo'
     sio = StringIO.new(buffer)
-    
+
     r, w = IO.pipe
     w << 'bar'
 
@@ -366,7 +384,7 @@ class ReadEachTest < UMBaseTest
       w.close
       machine.yield
     end
-    
+
     machine.schedule(f, nil)
 
     machine.read_each(r.fileno, bgid) do |buf|
@@ -464,7 +482,7 @@ class ReadEachTest < UMBaseTest
       sleep 0.1
       w.close
     end
-    
+
     bufs = []
     machine.read_each(r.fileno, bgid) do |b|
       bufs << b
@@ -591,7 +609,7 @@ class AcceptTest < UMBaseTest
 
   def test_accept
     conn = TCPSocket.new('127.0.0.1', @port)
-    
+
     assert_equal 0, machine.pending_count
     fd = machine.accept(@server.fileno)
     assert_equal 0, machine.pending_count
@@ -635,6 +653,32 @@ class AcceptEachTest < UMBaseTest
   ensure
     t&.kill
   end
+
+  def test_accept_each_interrupted
+    conns = []
+    count = 0
+    terminated = nil
+    f = @machine.spin do
+      machine.accept_each(@server.fileno) do |fd|
+        count += 1
+        break if count == 3
+      end
+    rescue UM::Terminate
+      terminated = true
+    end
+
+    s = TCPSocket.new('127.0.0.1', @port)
+    @machine.sleep(0.01)
+
+    assert_equal 1, count
+    refute terminated
+
+    @machine.schedule(f, UM::Terminate.new)
+    @machine.sleep(0.01)
+
+    assert f.done?
+    assert terminated
+  end
 end
 
 class SocketTest < UMBaseTest
@@ -1041,10 +1085,9 @@ class QueueTest < UMBaseTest
     machine.schedule(f2, nil)
 
     machine.snooze
-
     assert_equal [[1, :foo]], buf
-    machine.push(q, :bar)
 
+    machine.push(q, :bar)
     machine.snooze
     assert_equal [[1, :foo], [2, :bar]], buf
   end
@@ -1076,6 +1119,30 @@ class QueueTest < UMBaseTest
     assert_equal :bar, machine.shift(q)
     assert_equal :foo, machine.shift(q)
   end
+
+  def test_cross_thread_push_shift
+    q = UM::Queue.new
+
+    t1 = Thread.new {
+      m = UM.new
+      3.times { m.push(q, it) }
+    }
+
+    items = []
+
+    t2 = Thread.new {
+      m = UM.new
+      3.times {
+        i = m.shift(q)
+        items << i
+        m.sleep(0.01)
+      }
+    }
+
+    [t1, t2].each(&:join)
+
+    assert_equal [0, 1, 2], items
+  end
 end
 
 class OpenTest < UMBaseTest
@@ -1119,7 +1186,7 @@ class PipeTest < UMBaseTest
     rfd, wfd = UM.pipe
     ret = machine.write(wfd, 'foo')
     assert_equal 3, ret
-    
+
     ret = machine.close(wfd)
     assert_equal wfd, ret
 
@@ -1161,6 +1228,6 @@ class WaitTest < UMBaseTest
   def test_waitpid_bad_pid
     skip if UM.kernel_version < 607
 
-    assert_raises(Errno::ECHILD) { machine.waitpid(1, UM::WEXITED) }    
+    assert_raises(Errno::ECHILD) { machine.waitpid(1, UM::WEXITED) }
   end
 end

data/uringmachine.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = ["README.md"]
   s.extensions = ["ext/um/extconf.rb"]
   s.require_paths = ["lib"]
-  s.required_ruby_version = '>= 3.3'
+  s.required_ruby_version = '>= 3.4'
 
   s.add_development_dependency  'rake-compiler',        '1.2.9'
   s.add_development_dependency  'minitest',             '5.25.4'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: uringmachine
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: 0.8.1
 platform: ruby
 authors:
 - Sharon Rosner
 bindir: bin
 cert_chain: []
-date: 2025-04-28 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -123,23 +123,18 @@ files:
 - ext/um/um_mutex_class.c
 - ext/um/um_op.c
 - ext/um/um_queue_class.c
-- ext/um/um_ssl.c
-- ext/um/um_ssl.h
-- ext/um/um_ssl_class.c
 - ext/um/um_sync.c
 - ext/um/um_utils.c
 - lib/uringmachine.rb
 - lib/uringmachine/actor.rb
 - lib/uringmachine/dns_resolver.rb
-- lib/uringmachine/ssl.rb
-- lib/uringmachine/ssl/context_builder.rb
 - lib/uringmachine/version.rb
 - supressions/ruby.supp
 - test/helper.rb
 - test/run.rb
 - test/test_actor.rb
 - test/test_async_op.rb
-- test/test_ssl.rb
+- test/test_fiber.rb
 - test/test_um.rb
 - uringmachine.gemspec
 - vendor/liburing/.github/actions/codespell/stopwords
@@ -453,14 +448,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.3'
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.8
 specification_version: 4
 summary: A lean, mean io_uring machine
 test_files: []