uringmachine 0.29.2 → 0.31.0

data/test/test_ssl.rb

@@ -82,4 +82,31 @@ class SSLTest < UMBaseTest
     sock1&.close rescue nil
     sock2&.close rescue nil
   end
+
+  def test_ssl_write_0
+    sock1, sock2 = UNIXSocket.pair
+
+    s1 = OpenSSL::SSL::SSLSocket.new(sock1, @server_ctx)
+    s1.sync_close = true
+    s2 = OpenSSL::SSL::SSLSocket.new(sock2, OpenSSL::SSL::SSLContext.new)
+    s2.sync_close = true
+
+    @machine.ssl_set_bio(s2)
+    assert_equal true, s2.instance_variable_get(:@__um_bio__)
+
+    t = Thread.new { s1.accept rescue nil }
+
+    assert_equal 0, @machine.metrics[:total_ops]
+    s2.connect
+    refute_equal 0, @machine.metrics[:total_ops]
+
+    assert_equal 6, @machine.ssl_write(s1, 'foobar', 0)
+    buf = +''
+    assert_equal 6, @machine.ssl_read(s2, buf, 6)
+    assert_equal 'foobar', buf
+  ensure
+    t&.join(0.1)
+    sock1&.close rescue nil
+    sock2&.close rescue nil
+  end
 end

data/test/test_um.rb

@@ -3506,54 +3506,211 @@ class SetChildSubreaperTest < Minitest::Test
   end
 end
 
-class StreamMethodTest < UMBaseTest
+class ConnectionMethodTest < UMBaseTest
   def setup
     super
     @rfd, @wfd = UM.pipe
   end
 
   def teardown
-    @stream = nil
+    @conn = nil
     machine.close(@rfd) rescue nil
     machine.close(@wfd) rescue nil
     super
   end
 
-  def test_stream_method
+  def test_connection_method
     machine.write(@wfd, "foobar")
     machine.close(@wfd)
 
-    stream = machine.stream(@rfd)
-    assert_kind_of UM::Stream, stream
+    conn = machine.connection(@rfd)
+    assert_kind_of UM::Connection, conn
 
-    buf = stream.get_string(3)
+    buf = conn.read(3)
     assert_equal 'foo', buf
 
-    buf = stream.get_string(-6)
+    buf = conn.read(-6)
     assert_equal 'bar', buf
-    assert stream.eof?
+    assert conn.eof?
 
-    stream.clear
+    conn.clear
   end
 
-  def test_stream_method_with_block
+  def test_connection_method_with_block
     machine.write(@wfd, "foobar")
     machine.close(@wfd)
 
     bufs = []
-    stream_obj = nil
-    res = machine.stream(@rfd) do |s|
-      stream_obj = s
+    conn_obj = nil
+    res = machine.connection(@rfd) do |s|
+      conn_obj = s
 
-      bufs << s.get_string(3)
-      bufs << s.get_string(-6)
+      bufs << s.read(3)
+      bufs << s.read(-6)
 
       :foo
     end
 
-    assert_kind_of UM::Stream, stream_obj
-    assert stream_obj.eof?
+    assert_kind_of UM::Connection, conn_obj
+    assert conn_obj.eof?
     assert_equal ['foo', 'bar'], bufs
     assert_equal :foo, res
   end
+end
+
+class TCPHelperMethodsTest < UMBaseTest
+  def setup
+    super
+    @port = assign_port
+  end
+
+  def test_tcp_listen
+    server_fd = machine.tcp_listen('0.0.0.0', @port)
+    assert_kind_of Integer, server_fd
+
+    fd_c = machine.socket(UM::AF_INET, UM::SOCK_STREAM, 0, 0)
+    machine.connect(fd_c, '127.0.0.1', @port)
+
+    fd_s = machine.accept(server_fd)
+    assert_equal 3, machine.send(fd_s, 'foo', 3, 0)
+
+    buf = +''
+    machine.recv(fd_c, buf, 8192, 0)
+    assert_equal 'foo', buf
+  ensure
+    machine.close(fd_s) rescue nil
+    machine.close(fd_c) rescue nil
+    machine.close(server_fd) rescue nil
+  end
+
+  def test_tcp_listen_invalid_args
+    assert_raises(TypeError) { machine.tcp_listen('0.0.0.0', :foo) }
+    assert_raises(TypeError) { machine.tcp_listen(1234, 5678) }
+  end
+
+  def test_tcp_connect
+    server_fd = machine.tcp_listen('0.0.0.0', @port)
+    assert_kind_of Integer, server_fd
+
+    fd_c = machine.tcp_connect('127.0.0.1', @port)
+    assert_kind_of Integer, fd_c
+
+    fd_s = machine.accept(server_fd)
+    assert_equal 3, machine.send(fd_s, 'foo', 3, 0)
+
+    buf = +''
+    machine.recv(fd_c, buf, 8192, 0)
+    assert_equal 'foo', buf
+  ensure
+    machine.close(fd_s) rescue nil
+    machine.close(fd_c) rescue nil
+    machine.close(server_fd) rescue nil
+  end
+
+  def test_tcp_connect_invalid_args
+    server_fd = machine.tcp_listen('0.0.0.0', @port)
+
+    assert_raises(Errno::ECONNREFUSED) {
+      machine.tcp_connect('127.0.0.1', @port + 1)
+    }
+    assert_raises(TypeError) { machine.tcp_connect('127.0.0.1', :foo) }
+    assert_raises(TypeError) { machine.tcp_connect(1234, 5678) }
+  ensure
+    machine.close(server_fd)
+  end
+end
+
+class SpliceTest < UMBaseTest
+  def test_splice
+    i1, o1 = UM.pipe
+    i2, o2 = UM.pipe
+    len = nil
+
+    f = machine.spin do
+      len = machine.splice(i1, o2, 1000)
+    ensure
+      machine.close(o2)
+    end
+
+    machine.write(o1, 'foobar')
+    buf = +''
+    machine.read(i2, buf, 1000)
+
+    assert_equal 'foobar', buf
+    assert_equal 6, len
+  ensure
+    machine.terminate(f)
+    machine.join(f)
+    [i1, o1, i2, o2].each { machine.close(it) rescue nil }
+  end
+
+  def test_splice_bad_args
+    fn = "/tmp/um_#{SecureRandom.hex}"
+    IO.write(fn, 'foo')
+    f1 = machine.open(fn, UM::O_RDWR)
+    f2 = machine.open(fn, UM::O_RDWR)
+    assert_raises(Errno::EINVAL) { machine.splice(f1, f2, 1000) }
+
+    i1, o1 = UM.pipe
+    i2, o2 = UM.pipe
+    machine.write(o1, 'foo')
+
+    assert_raises(Errno::EBADF) { machine.splice(i1, o2 + 1, 1000) }
+  ensure
+    [f1, f2, i1, o1, i2, o2].each { machine.close(it) rescue nil }
+  end
+end
+
+class TeeTest < UMBaseTest
+  def test_tee
+    i_src, o_src = UM.pipe
+    i_dest1, o_dest1 = UM.pipe
+    i_dest2, o_dest2 = UM.pipe
+
+    len1 = len2 = nil
+
+    f = machine.spin do
+      len1 = machine.tee(i_src, o_dest1, 1000)
+      len2 = machine.splice(i_src, o_dest2, 1000)
+    ensure
+      machine.close(o_dest1)
+      machine.close(o_dest2)
+    end
+
+    machine.write(o_src, 'foobar')
+    machine.close(o_src)
+    result1 = +''
+    machine.read(i_dest1, result1, 1000)
+    result2 = +''
+    machine.read(i_dest2, result2, 1000)
+
+    assert_equal 'foobar', result1
+    assert_equal 6, len1
+
+    assert_equal 'foobar', result2
+    assert_equal 6, len2
+  ensure
+    machine.terminate(f)
+    machine.join(f)
+    [i_src, o_src, i_dest1, o_dest1, i_dest2, o_dest2].each {
+      machine.close(it) rescue nil
+    }
+  end
+end
+
+class FsyncTest < UMBaseTest
+  def test_fsync
+    fn = "/tmp/um_#{SecureRandom.hex}"
+    fd = machine.open(fn, UM::O_CREAT | UM::O_WRONLY)
+
+    machine.write(fd, 'foo')
+    assert_equal 0, machine.fsync(fd)
+  ensure
+    machine.close(fd)
+    FileUtils.rm(fn) rescue nil
+  end
+
+  def test_fsync_bad_args
+    assert_raises(Errno::EINVAL) { machine.fsync(1) }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uringmachine
 version: !ruby/object:Gem::Version
-  version: 0.29.2
+  version: 0.31.0
 platform: ruby
 authors:
 - Sharon Rosner
@@ -26,6 +26,8 @@ extra_rdoc_files:
 - ext/um/um_async_op_class.c
 - ext/um/um_buffer_pool.c
 - ext/um/um_class.c
+- ext/um/um_connection.c
+- ext/um/um_connection_class.c
 - ext/um/um_const.c
 - ext/um/um_ext.c
 - ext/um/um_mutex_class.c
@@ -33,8 +35,6 @@ extra_rdoc_files:
 - ext/um/um_queue_class.c
 - ext/um/um_sidecar.c
 - ext/um/um_ssl.c
-- ext/um/um_stream.c
-- ext/um/um_stream_class.c
 - ext/um/um_sync.c
 - ext/um/um_utils.c
 - lib/uringmachine.rb
@@ -58,10 +58,12 @@ files:
 - benchmark/README.md
 - benchmark/bm_io_pipe.rb
 - benchmark/bm_io_socketpair.rb
+- benchmark/bm_io_ssl.rb
 - benchmark/bm_mutex_cpu.rb
 - benchmark/bm_mutex_io.rb
 - benchmark/bm_pg_client.rb
 - benchmark/bm_queue.rb
+- benchmark/bm_redis_client.rb
 - benchmark/chart_all.png
 - benchmark/chart_bm_io_pipe_x.png
 - benchmark/common.rb
@@ -88,12 +90,16 @@ files:
 - docs/um_api.md
 - docs/wroclove.rb.md
 - examples/echo_server.rb
+- examples/fiber_concurrency_io.rb
+- examples/fiber_concurrency_naive.rb
+- examples/fiber_concurrency_runqueue.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
+- examples/io_uring_simple.c
 - examples/nc.rb
 - examples/nc_ssl.rb
 - examples/pg.rb
@@ -108,6 +114,8 @@ files:
 - ext/um/um_async_op_class.c
 - ext/um/um_buffer_pool.c
 - ext/um/um_class.c
+- ext/um/um_connection.c
+- ext/um/um_connection_class.c
 - ext/um/um_const.c
 - ext/um/um_ext.c
 - ext/um/um_mutex_class.c
@@ -115,10 +123,9 @@ files:
 - ext/um/um_queue_class.c
 - ext/um/um_sidecar.c
 - ext/um/um_ssl.c
-- ext/um/um_stream.c
-- ext/um/um_stream_class.c
 - ext/um/um_sync.c
 - ext/um/um_utils.c
+- grant-2025/final-report.md
 - grant-2025/interim-report.md
 - grant-2025/journal.md
 - grant-2025/tasks.md
@@ -132,10 +139,10 @@ files:
 - test/run.rb
 - test/test_actor.rb
 - test/test_async_op.rb
+- test/test_connection.rb
 - test/test_fiber.rb
 - test/test_fiber_scheduler.rb
 - test/test_ssl.rb
-- test/test_stream.rb
 - test/test_um.rb
 - uringmachine.gemspec
 - vendor/liburing/.github/actions/codespell/stopwords