uringmachine 0.28.3 → 0.29.0

data/test/test_um.rb

@@ -1222,63 +1222,63 @@ end
 class ShutdownTest < UMBaseTest
   def test_shutdown
     c_fd, s_fd = UM.socketpair(UM::AF_UNIX, UM::SOCK_STREAM, 0)
-    res = @machine.send(c_fd, 'abc', 3, 0)
+    res = machine.send(c_fd, 'abc', 3, 0)
     assert_equal 3, res
 
     buf = +''
-    res = @machine.recv(s_fd, buf, 256, 0)
+    res = machine.recv(s_fd, buf, 256, 0)
     assert_equal 3, res
     assert_equal 'abc', buf
 
-    res = @machine.shutdown(c_fd, UM::SHUT_WR)
+    res = machine.shutdown(c_fd, UM::SHUT_WR)
     assert_equal 0, res
 
-    assert_raises(Errno::EPIPE) { @machine.send(c_fd, 'abc', 3, 0) }
+    assert_raises(Errno::EPIPE) { machine.send(c_fd, 'abc', 3, 0) }
 
-    res = @machine.shutdown(s_fd, UM::SHUT_RD)
+    res = machine.shutdown(s_fd, UM::SHUT_RD)
     assert_equal 0, res
 
-    res = @machine.recv(s_fd, buf, 256, 0)
+    res = machine.recv(s_fd, buf, 256, 0)
     assert_equal 0, res
 
-    res = @machine.shutdown(c_fd, UM::SHUT_RDWR)
+    res = machine.shutdown(c_fd, UM::SHUT_RDWR)
     assert_equal 0, res
 
-    assert_raises(Errno::EINVAL) { @machine.shutdown(c_fd, -9999) }
+    assert_raises(Errno::EINVAL) { machine.shutdown(c_fd, -9999) }
   ensure
-    @machine.close(c_fd)
-    @machine.close(s_fd)
+    machine.close(c_fd)
+    machine.close(s_fd)
   end
 end
 
 class ShutdownAsyncTest < UMBaseTest
   def test_shutdown_async
     c_fd, s_fd = UM.socketpair(UM::AF_UNIX, UM::SOCK_STREAM, 0)
-    res = @machine.send(c_fd, 'abc', 3, 0)
+    res = machine.send(c_fd, 'abc', 3, 0)
     assert_equal 3, res
 
     buf = +''
-    res = @machine.recv(s_fd, buf, 256, 0)
+    res = machine.recv(s_fd, buf, 256, 0)
     assert_equal 3, res
     assert_equal 'abc', buf
 
-    res = @machine.shutdown_async(c_fd, UM::SHUT_WR)
+    res = machine.shutdown_async(c_fd, UM::SHUT_WR)
     assert_equal c_fd, res
 
     machine.sleep(0.01)
-    assert_raises(Errno::EPIPE) { @machine.send(c_fd, 'abc', 3, 0) }
+    assert_raises(Errno::EPIPE) { machine.send(c_fd, 'abc', 3, 0) }
 
-    res = @machine.shutdown_async(s_fd, UM::SHUT_RD)
+    res = machine.shutdown_async(s_fd, UM::SHUT_RD)
     assert_equal s_fd, res
 
-    res = @machine.recv(s_fd, buf, 256, 0)
+    res = machine.recv(s_fd, buf, 256, 0)
     assert_equal 0, res
 
-    res = @machine.shutdown_async(c_fd, UM::SHUT_RDWR)
+    res = machine.shutdown_async(c_fd, UM::SHUT_RDWR)
     assert_equal c_fd, res
   ensure
-    @machine.close(c_fd)
-    @machine.close(s_fd)
+    machine.close(c_fd)
+    machine.close(s_fd)
   end
 end
 
@@ -1345,7 +1345,7 @@ class AcceptEachTest < UMBaseTest
   def test_accept_each_interrupted
     count = 0
     terminated = nil
-    f = @machine.spin do
+    f = machine.spin do
       machine.accept_each(@server.fileno) do |fd|
         count += 1
         break if count == 3
@@ -1355,13 +1355,13 @@ class AcceptEachTest < UMBaseTest
     end
 
     s = TCPSocket.new('127.0.0.1', @port)
-    @machine.sleep(0.01)
+    machine.sleep(0.01)
 
     assert_equal 1, count
     refute terminated
 
-    @machine.schedule(f, UM::Terminate.new)
-    @machine.sleep(0.01)
+    machine.schedule(f, UM::Terminate.new)
+    machine.sleep(0.01)
 
     assert f.done?
     assert terminated
@@ -1375,7 +1375,7 @@ class AcceptEachTest < UMBaseTest
   def test_accept_each_closed
     count = 0
     done = nil
-    @machine.spin do
+    machine.spin do
       machine.accept_each(@server.fileno) do |fd|
         count += 1
       end
@@ -1384,17 +1384,17 @@ class AcceptEachTest < UMBaseTest
     end
 
     s = TCPSocket.new('127.0.0.1', @port)
-    @machine.sleep(0.01)
+    machine.sleep(0.01)
 
     assert_equal 1, count
     refute done
 
     machine.close(@server.fileno)
-    @machine.sleep(0.01)
+    machine.sleep(0.01)
     refute done
 
     s = TCPSocket.new('127.0.0.1', @port)
-    @machine.sleep(0.01)
+    machine.sleep(0.01)
 
     assert_equal 2, count
     refute done
@@ -1402,6 +1402,35 @@ class AcceptEachTest < UMBaseTest
     s.close rescue nil
   end
 
+  def test_accept_each_shutdown
+    count = 0
+    done = nil
+    e = nil
+    machine.spin do
+      machine.accept_each(@server.fileno) do |fd|
+        count += 1
+      end
+    rescue => e
+    ensure
+      done = true
+    end
+
+    s = TCPSocket.new('127.0.0.1', @port)
+    machine.sleep(0.01)
+
+    assert_equal 1, count
+    refute done
+
+    machine.shutdown(@server.fileno, UM::SHUT_RD)
+    machine.sleep(0.01)
+    assert_equal true, done
+    assert_nil e
+
+    assert_raises(Errno::ECONNREFUSED) { TCPSocket.new('127.0.0.1', @port) }
+  ensure
+    s.close rescue nil
+  end
+
   def test_accept_each_bad_fd
     assert_raises(Errno::ENOTSOCK) { machine.accept_each(STDOUT.fileno) }
 
@@ -1451,20 +1480,20 @@ class AcceptIntoQueueTest < UMBaseTest
   def test_accept_into_queue_interrupted
     terminated = nil
     queue = UM::Queue.new
-    f = @machine.spin do
+    f = machine.spin do
       machine.accept_into_queue(@server_fd, queue)
     rescue UM::Terminate
       terminated = true
     end
 
     s = TCPSocket.new('127.0.0.1', @port)
-    @machine.sleep(0.01)
+    machine.sleep(0.01)
 
     assert_equal 1, queue.count
     refute terminated
 
-    @machine.schedule(f, UM::Terminate.new)
-    @machine.sleep(0.01)
+    machine.schedule(f, UM::Terminate.new)
+    machine.sleep(0.01)
 
     assert f.done?
     assert terminated
@@ -1475,6 +1504,36 @@ class AcceptIntoQueueTest < UMBaseTest
     s.close
   end
 
+  def test_accept_into_queue_shutdown
+    done = nil
+    err = nil
+    queue = UM::Queue.new
+    f = machine.spin do
+      machine.accept_into_queue(@server_fd, queue)
+    rescue => err
+    ensure
+      done = true
+    end
+
+    s = TCPSocket.new('127.0.0.1', @port)
+    machine.sleep(0.01)
+
+    assert_equal 1, queue.count
+    refute done
+
+    machine.shutdown(@server_fd, UM::SHUT_RD)
+    machine.sleep(0.01)
+
+    assert f.done?
+    assert done
+    assert_nil err
+
+    assert_equal 0, machine.metrics[:ops_pending]
+    assert_equal 256, machine.metrics[:ops_free]
+  ensure
+    s.close
+  end
+
   def test_accept_into_queue_bad_fd
     queue = UM::Queue.new
     assert_raises(Errno::ENOTSOCK) { machine.accept_into_queue(STDOUT.fileno, queue) }
@@ -1664,8 +1723,8 @@ class SendvTest < UMBaseTest
   end
 
   def teardown
-    @machine.close(@s1)
-    @machine.close(@s2)
+    machine.close(@s1)
+    machine.close(@s2)
     super
   end
 
@@ -2082,7 +2141,7 @@ class SendRecvFdTest < UMBaseTest
     end
 
     buf = +''
-    
+
     machine.send(@s1_fd, 'coocoo', 6, 0)
     machine.recv(@s1_fd, buf, 128, 0)
     assert_equal 'coocoo', buf
@@ -2116,7 +2175,7 @@ class SendRecvFdTest < UMBaseTest
   def test_recv_fd_bad_msg
     buf = "\0" * 1000
     machine.write(@s1_fd, buf)
-    
+
     assert_raises(Errno::EINVAL) {
       res = machine.recv_fd(@s2_fd)
       p res: res
@@ -2968,7 +3027,7 @@ class StatxTest < UMBaseTest
   end
 
   def test_statx_mask
-    fd = @machine.open(__FILE__, UM::O_RDONLY)
+    fd = machine.open(__FILE__, UM::O_RDONLY)
     ustat = machine.statx(fd, nil, UM::AT_EMPTY_PATH, UM::STATX_MTIME | UM::STATX_SIZE)
     rstat = File.stat(__FILE__)
 
@@ -2977,7 +3036,7 @@ class StatxTest < UMBaseTest
     assert_equal 0, machine.metrics[:ops_pending]
     assert_equal 256, machine.metrics[:ops_free]
   ensure
-    @machine.close_async(fd)
+    machine.close_async(fd)
   end
 
   def test_statx_bad_path
@@ -3082,15 +3141,20 @@ end
 class MetricsTest < UMBaseTest
   def test_metrics_empty
     assert_equal({
-      size:             4096,
-      total_ops:        0,
-      total_switches:   0,
-      total_waits:      0,
-      ops_pending:      0,
-      ops_unsubmitted:  0,
-      ops_runqueue:     0,
-      ops_free:         0,
-      ops_transient:    0
+      size:                   4096,
+      total_ops:              0,
+      total_switches:         0,
+      total_waits:            0,
+      ops_pending:            0,
+      ops_unsubmitted:        0,
+      ops_runqueue:           0,
+      ops_free:               0,
+      ops_transient:          0,
+      buffers_allocated:      0,
+      buffers_free:           0,
+      segments_free:          0,
+      buffer_space_allocated: 0,
+      buffer_space_commited:  0
     }, machine.metrics)
   end
 
@@ -3203,7 +3267,9 @@ class ProfileModeTest < UMBaseTest
     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
+      :ops_unsubmitted, :ops_runqueue, :ops_free, :ops_transient,
+      :buffers_allocated, :buffers_free, :segments_free,
+      :buffer_space_allocated, :buffer_space_commited
     ], machine.metrics.keys)
 
     machine.profile_mode = true
@@ -3211,6 +3277,8 @@ class ProfileModeTest < UMBaseTest
     assert_equal([
       :size, :total_ops, :total_switches, :total_waits, :ops_pending,
       :ops_unsubmitted, :ops_runqueue, :ops_free, :ops_transient,
+      :buffers_allocated, :buffers_free, :segments_free,
+      :buffer_space_allocated, :buffer_space_commited,
       :time_total_cpu, :time_total_wait,
     ], machine.metrics.keys)
 
@@ -3218,7 +3286,9 @@ class ProfileModeTest < UMBaseTest
     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
+      :ops_unsubmitted, :ops_runqueue, :ops_free, :ops_transient,
+      :buffers_allocated, :buffers_free, :segments_free,
+      :buffer_space_allocated, :buffer_space_commited
     ], machine.metrics.keys)
   end
 
@@ -3390,7 +3460,7 @@ class SetChildSubreaperTest < Minitest::Test
   def test_pr_set_child_subreaper
     r, w = IO.pipe
     UM.pr_set_child_subreaper(true)
-    
+
     child_pid = fork {
       r2, w2 = IO.pipe
       pid = fork {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uringmachine
 version: !ruby/object:Gem::Version
-  version: 0.28.3
+  version: 0.29.0
 platform: ruby
 authors:
 - Sharon Rosner
@@ -24,7 +24,7 @@ extra_rdoc_files:
 - ext/um/um.h
 - ext/um/um_async_op.c
 - ext/um/um_async_op_class.c
-- ext/um/um_buffer.c
+- ext/um/um_buffer_pool.c
 - ext/um/um_class.c
 - ext/um/um_const.c
 - ext/um/um_ext.c
@@ -66,6 +66,7 @@ files:
 - benchmark/chart_bm_io_pipe_x.png
 - benchmark/common.rb
 - benchmark/dns_client.rb
+- benchmark/gets.rb
 - benchmark/http_parse.rb
 - benchmark/http_server_accept_queue.rb
 - benchmark/http_server_multi_accept.rb
@@ -76,7 +77,7 @@ files:
 - benchmark/mutex_single.rb
 - benchmark/openssl.rb
 - benchmark/openssl_socketpair.rb
-- benchmark/read_each.rb
+- benchmark/output.rb
 - benchmark/run_bm.rb
 - benchmark/send.rb
 - benchmark/snooze.rb
@@ -104,7 +105,7 @@ files:
 - ext/um/um.h
 - ext/um/um_async_op.c
 - ext/um/um_async_op_class.c
-- ext/um/um_buffer.c
+- ext/um/um_buffer_pool.c
 - ext/um/um_class.c
 - ext/um/um_const.c
 - ext/um/um_ext.c

data/ext/um/um_buffer.c

@@ -1,49 +0,0 @@
-#include "um.h"
-
-inline long buffer_size(long len) {
-  len--;
-  len |= len >> 1;
-  len |= len >> 2;
-  len |= len >> 4;
-  len |= len >> 8;
-  len |= len >> 16;
-  len++;
-  return (len > 4096) ? len : 4096;
-}
-
-inline struct um_buffer *um_buffer_checkout(struct um *machine, int len) {
-  struct um_buffer *buffer = machine->buffer_freelist;
-  if (buffer)
-    machine->buffer_freelist = buffer->next;
-  else {
-    buffer = malloc(sizeof(struct um_buffer));
-    memset(buffer, 0, sizeof(struct um_buffer));
-  }
-
-  if (buffer->len < len) {
-    if (buffer->ptr) {
-      free(buffer->ptr);
-      buffer->ptr = NULL;
-    }
-
-    buffer->len = buffer_size(len);
-    if (posix_memalign(&buffer->ptr, 4096, buffer->len))
-      um_raise_internal_error("Failed to allocate buffer");
-  }
-  return buffer;
-}
-
-inline void um_buffer_checkin(struct um *machine, struct um_buffer *buffer) {
-  buffer->next = machine->buffer_freelist;
-  machine->buffer_freelist = buffer;
-}
-
-inline void um_free_buffer_linked_list(struct um *machine) {
-  struct um_buffer *buffer = machine->buffer_freelist;
-  while (buffer) {
-    struct um_buffer *next = buffer->next;
-    if (buffer->ptr) free(buffer->ptr);
-    free(buffer);
-    buffer = next;
-  }
-}