uringmachine 0.23.1 → 0.24.0

data/test/test_stream.rb

@@ -175,10 +175,26 @@ class StreamRespTest < StreamBaseTest
     assert_equal "$6\r\nfoobar\r\n",  s.resp_encode(+'', 'foobar')
     assert_equal "$10\r\nפובאר\r\n",  s.resp_encode(+'', 'פובאר')
 
+    assert_equal "*2\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",
+      s.resp_encode(+'', ['foo', 'bar'])
+
     assert_equal "*2\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",
       s.resp_encode(+'', ['foo', 'bar'])
 
     assert_equal "%2\r\n$3\r\nfoo\r\n$3\r\nbar\r\n$3\r\nbaz\r\n:42\r\n",
       s.resp_encode(+'', { 'foo' => 'bar', 'baz' => 42 })
   end
+
+  def test_resp_encode_cmd
+    s = UM::Stream
+
+    assert_equal "*2\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",
+      s.resp_encode_cmd(+'', 'foo', 'bar')
+
+    assert_equal "*2\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",
+      s.resp_encode_cmd(+'', 'foo', :bar)
+
+    assert_equal "*2\r\n$3\r\nfoo\r\n$3\r\n123\r\n",
+      s.resp_encode_cmd(+'', 'foo', 123)
+  end
 end

data/test/test_um.rb

@@ -12,20 +12,46 @@ class UringMachineTest < Minitest::Test
 end
 
 class SizeTest < Minitest::Test
-  def test_default_size
+  def test_size_opt_default
     m = UM.new
     assert_equal 4096, m.size
   end
 
-  def test_custom_size_value
-    m = UM.new(13)
+  def test_size_opt_custom
+    m = UM.new(size: 13)
     assert_equal 13, m.size
   end
+
+  def test_size_opt_effective_sq_size
+    m = UM.new(size: 1)
+    r, w = UM.pipe
+    m.close_async(r)
+    assert_equal 1, m.metrics[:ops_unsubmitted]
+    assert_raises(UM::Error) { m.close_async(w) }
+
+    m.submit
+    m.close_async(w)
+    assert_equal 1, m.metrics[:ops_unsubmitted]
+
+    m.submit
+    assert_equal 0, m.metrics[:ops_unsubmitted]
+  end
 end
 
 class SQPOLLTest < Minitest::Test
+  def test_sqpoll_mode
+    m = UM.new()
+    assert_equal false, m.sqpoll_mode?
+
+    m = UM.new(sqpoll: true)
+    assert_equal true, m.sqpoll_mode?
+
+    m = UM.new(sqpoll: 1)
+    assert_equal true, m.sqpoll_mode?
+  end
+
   def test_sqpoll_timeout
-    m = UM.new(10, 0.05)
+    m = UM.new(sqpoll: 0.05)
 
     r, w = UM.pipe
 
@@ -46,7 +72,7 @@ class SQPOLLTest < Minitest::Test
   end
 
   def test_sqpoll_timeout_with_submit
-    m = UM.new(10, 0.05)
+    m = UM.new(sqpoll: 0.05)
 
     r, w = UM.pipe
 
@@ -69,6 +95,16 @@ class SQPOLLTest < Minitest::Test
   end
 end
 
+class SidecarTest < Minitest::Test
+  def test_sidecar_mode
+    m = UM.new()
+    assert_equal false, m.sidecar_mode?
+
+    m = UM.new(sidecar: true)
+    assert_equal true, m.sidecar_mode?
+  end
+end
+
 class SubmitTest < UMBaseTest
   def test_submit
     _r, w = UM.pipe
@@ -819,7 +855,7 @@ class WritevTest < UMBaseTest
         buf = +''
         res = machine.read(r, buf, 8192)
         break if res == 0
-        
+
         reads << buf
       }
     }
@@ -1171,7 +1207,7 @@ class AcceptEachTest < UMBaseTest
   end
 
   def teardown
-    @server&.close
+    @server&.close rescue nil
     super
   end
 
@@ -1221,8 +1257,37 @@ class AcceptEachTest < UMBaseTest
     s.close
   end
 
+  def test_accept_each_closed
+    count = 0
+    done = nil
+    f = @machine.spin do
+      machine.accept_each(@server.fileno) do |fd|
+        count += 1
+      end
+    ensure
+      done = true
+    end
+
+    s = TCPSocket.new('127.0.0.1', @port)
+    @machine.sleep(0.01)
+
+    assert_equal 1, count
+    refute done
+
+    machine.close(@server.fileno)
+    @machine.sleep(0.01)
+    refute done
+
+    s = TCPSocket.new('127.0.0.1', @port)
+    @machine.sleep(0.01)
+
+    assert_equal 2, count
+    refute done
+  ensure
+    s.close rescue nil
+  end
+
   def test_accept_each_bad_fd
-    queue = UM::Queue.new
     assert_raises(Errno::ENOTSOCK) { machine.accept_each(STDOUT.fileno) }
   end
 end
@@ -1264,7 +1329,6 @@ class AcceptIntoQueueTest < UMBaseTest
   end
 
   def test_accept_into_queue_interrupted
-    count = 0
     terminated = nil
     queue = UM::Queue.new
     f = @machine.spin do
@@ -1792,12 +1856,13 @@ class QueueTest < UMBaseTest
     assert_equal 1, q.count
     machine.snooze
     assert_equal 1, machine.metrics[:ops_pending]
+    machine.snooze
     assert_equal [[1, :foo]], buf
 
     machine.push(q, :bar)
     assert_equal 1, q.count
 
-    machine.snooze
+    2.times { machine.snooze }
     assert_equal [[1, :foo], [2, :bar]], buf
     assert_equal 0, q.count
   end
@@ -1851,7 +1916,7 @@ class QueueTest < UMBaseTest
     assert_equal [[1, :foo]], buf
 
     machine.push(q, :bar)
-    machine.snooze
+    2.times { machine.snooze }
     assert_equal [[1, :foo], [2, :bar]], buf
   end
 
@@ -2028,7 +2093,9 @@ end
 
 class PidfdTest < UMBaseTest
   def test_pidfd_open
+    # machine.sidecar_stop
     pid = fork { exit 13 }
+    # machine.sidecar_start
     fd = UM.pidfd_open(pid)
     assert_kind_of Integer, fd
 
@@ -2121,6 +2188,7 @@ class SelectTest < UMBaseTest
     machine.spin do
       events << 1
       events << machine.select([rfd1, rfd2], [], [])
+      machine.snooze
       events << 2
       events << machine.select([rfd1, rfd2], [], [])
       events << 3
@@ -2134,14 +2202,13 @@ class SelectTest < UMBaseTest
 
     machine.write(wfd1, 'foo')
     machine.snooze
-    assert_equal [1, [[rfd1], [], []], 2], events
+    assert_equal [1, [[rfd1], [], []]], events
 
     machine.write(wfd2, 'foo')
-
-    machine.snooze
+    2.times { machine.snooze }
     assert_equal [1, [[rfd1], [], []], 2, [[rfd1, rfd2], [], []], 3], events
 
-    machine.snooze
+    2.times { machine.snooze }
 
     assert_equal [
       1, [[rfd1], [], []],
@@ -2522,7 +2589,10 @@ class MetricsTest < UMBaseTest
   end
 
   def test_metrics_size
-    m = UM.new(13)
+    m = UM.new
+    assert_equal 4096, m.metrics[:size]
+
+    m = UM.new(size: 13)
     assert_equal 13, m.metrics[:size]
   end
 
@@ -2602,8 +2672,6 @@ class MetricsTest < UMBaseTest
     f = machine.spin { machine.sleep(0.001) }
     assert_equal [0, 0, 1, 255, 0], ops_metrics
     machine.snooze
-    assert_equal [1, 1, 0, 256, 0], ops_metrics
-    machine.submit
     assert_equal [1, 0, 0, 256, 0], ops_metrics
     machine.join(f)
     assert_equal [0, 0, 0, 256, 0], ops_metrics
@@ -2626,22 +2694,22 @@ end
 
 class ProfileModeTest < UMBaseTest
   def test_profile_mode_empty
-    assert_equal false, machine.profile?
+    assert_equal false, machine.profile_mode?
     assert_equal([
       :size, :total_ops, :total_switches, :total_waits, :ops_pending,
       :ops_unsubmitted, :ops_runqueue, :ops_free, :ops_transient
     ], machine.metrics.keys)
 
-    machine.profile(true)
-    assert_equal true, machine.profile?
+    machine.profile_mode = true
+    assert_equal true, machine.profile_mode?
     assert_equal([
       :size, :total_ops, :total_switches, :total_waits, :ops_pending,
       :ops_unsubmitted, :ops_runqueue, :ops_free, :ops_transient,
       :time_total_cpu, :time_total_wait,
     ], machine.metrics.keys)
 
-    machine.profile(false)
-    assert_equal false, machine.profile?
+    machine.profile_mode = false
+    assert_equal false, machine.profile_mode?
     assert_equal([
       :size, :total_ops, :total_switches, :total_waits, :ops_pending,
       :ops_unsubmitted, :ops_runqueue, :ops_free, :ops_transient
@@ -2649,7 +2717,9 @@ class ProfileModeTest < UMBaseTest
   end
 
   def test_profile_mode_total_times
-    machine.profile(true)
+    skip "TODO: make profile mode usable in in sidecar mode"
+
+    machine.profile_mode = true
     machine.sleep(0.01)
     assert_in_range 0.0..0.0005, machine.metrics[:time_total_cpu]
     assert_in_range 0.01..0.015, machine.metrics[:time_total_wait]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uringmachine
 version: !ruby/object:Gem::Version
-  version: 0.23.1
+  version: 0.24.0
 platform: ruby
 authors:
 - Sharon Rosner
@@ -106,9 +106,15 @@ files:
 - benchmark/bm_pg_client.rb
 - benchmark/bm_queue.rb
 - benchmark/chart_all.png
+- benchmark/chart_bm_io_pipe_x.png
 - benchmark/common.rb
 - benchmark/dns_client.rb
 - benchmark/http_parse.rb
+- benchmark/http_server_accept_queue.rb
+- benchmark/http_server_multi_accept.rb
+- benchmark/http_server_multi_ractor.rb
+- benchmark/http_server_single_thread.rb
+- benchmark/ips_io_pipe.rb
 - benchmark/mutex.rb
 - benchmark/mutex_single.rb
 - benchmark/read_each.rb
@@ -117,8 +123,12 @@ files:
 - benchmark/snooze.rb
 - benchmark/sqlite.rb
 - benchmark/write.rb
+- docs/design/buffer_pool.md
+- docs/um_api.md
 - examples/echo_server.rb
 - examples/fiber_scheduler_demo.rb
+- examples/fiber_scheduler_file_io.rb
+- examples/fiber_scheduler_file_io_async.rb
 - examples/fiber_scheduler_fork.rb
 - examples/http_server.rb
 - examples/inout.rb
@@ -141,10 +151,12 @@ files:
 - ext/um/um_mutex_class.c
 - ext/um/um_op.c
 - ext/um/um_queue_class.c
+- ext/um/um_sidecar.c
 - ext/um/um_stream.c
 - ext/um/um_stream_class.c
 - ext/um/um_sync.c
 - ext/um/um_utils.c
+- grant-2025/interim-report.md
 - grant-2025/journal.md
 - grant-2025/tasks.md
 - lib/uringmachine.rb
@@ -720,7 +732,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.1
+rubygems_version: 4.0.3
 specification_version: 4
 summary: A lean, mean io_uring machine
 test_files: []