uringmachine 0.8.1 → 0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fdbc29b1e4c910d05eef327345a52faafd92566d7bdddaad81396bcf1f4767d
-  data.tar.gz: 4729a2ca7640fd58d0d83cc008db6e3431edfcdf04e396bce9981465a8e4e0a9
+  metadata.gz: 85de1c3c67da5ef2a64b64a0370312208009683e9a42504bfbd7577bb6bee9f7
+  data.tar.gz: 13a34495c1987c85891ee5db9c196fbf09b6ebcd9a2221026341023e63e5a8e8
 SHA512:
-  metadata.gz: 56c03563909bd5acd8466a0ef255cd2a791c9907e7fa9ab0a88d9be22f4db895cfb85f0ed5fc0883d0e583c216e238e954a74623f6d231f38c51de2f65316af8
-  data.tar.gz: 1471eea52c8edb8bab45e4fa058191c13e1c88a39bd728c1be5f72998058724ab7fb8a699d279fe5ace36fec6dc5eaca5361a4265b909d078cf5549dd3a19af2
+  metadata.gz: 7b10f6a2c6e4d0bccaebb75c50e702ca0126eeb712a25ac32631b21ddcafd550dcceab2028a4f1a9b380538aa19067e0fa08346137a760307193af0acef64ed1
+  data.tar.gz: 0dc3949e9256f139cc1caab14b2de6b63e16af61c569de59b761153d8d05a2030bad0e299ca9044452cc628fd25accff8fe3e89c59e6d4c053f049339ddce2c3

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# 2025-05-05 Version 0.10
+
+- Add `Thread#machine`
+- Add `Fiber#mailbox`
+
+# 2025-05-05 Version 0.9
+
+- Add `#statx`
+
+# 2025-05-05 Version 0.8.2
+
+- Correctly deal with -EAGAIN when waiting for CQEs
+
 # 2025-05-05 Version 0.8.1
 
 - Fix `#snooze` to not block waiting for CQE

data/TODO.md

@@ -10,7 +10,6 @@
 - poll_add / poll_remove / poll_multishot / poll_update
 - fsync
 - mkdir / mkdirat
-- statx
 - link / linkat / unlink / unlinkat / symlink
 - rename / renameat
 - fadvise

data/ext/um/um.c

@@ -156,8 +156,20 @@ static inline void um_wait_for_and_process_ready_cqes(struct um *machine, int wa
   struct wait_for_cqe_ctx ctx = { .machine = machine, .cqe = NULL, .wait_nr = wait_nr };
   rb_thread_call_without_gvl(um_wait_for_cqe_without_gvl, (void *)&ctx, RUBY_UBF_IO, 0);
 
-  if (unlikely(ctx.result < 0 && ctx.result != -EINTR))
-    rb_syserr_fail(-ctx.result, strerror(-ctx.result));
+  if (unlikely(ctx.result < 0)) {
+    // the internal calls to (maybe submit) and wait for cqes may fail with:
+    // -EINTR (interrupted by signal)
+    // -EAGAIN (apparently can be returned when wait_nr = 0)
+    // both should not raise an exception.
+    switch (ctx.result) {
+      case -EINTR:
+      case -EAGAIN:
+        // do nothing
+        break;
+      default:
+        rb_syserr_fail(-ctx.result, strerror(-ctx.result));
+    }
+  }
 
   if (ctx.cqe) {
     um_process_cqe(machine, ctx.cqe);
@@ -509,7 +521,7 @@ VALUE um_setsockopt(struct um *machine, int fd, int level, int opt, int value) {
 
 #ifdef HAVE_IO_URING_PREP_CMD_SOCK
   struct um_op op;
-  um_prep_op(machine, &op, OP_GETSOCKOPT);
+  um_prep_op(machine, &op, OP_SETSOCKOPT);
   struct io_uring_sqe *sqe = um_get_sqe(machine, &op);
   io_uring_prep_cmd_sock(sqe, SOCKET_URING_OP_SETSOCKOPT, fd, level, opt, &value, sizeof(value));
 
@@ -545,7 +557,7 @@ VALUE um_shutdown(struct um *machine, int fd, int how) {
 
 VALUE um_open(struct um *machine, VALUE pathname, int flags, int mode) {
   struct um_op op;
-  um_prep_op(machine, &op, OP_BIND);
+  um_prep_op(machine, &op, OP_OPEN);
   struct io_uring_sqe *sqe = um_get_sqe(machine, &op);
   io_uring_prep_open(sqe, StringValueCStr(pathname), flags, mode);
 
@@ -559,7 +571,7 @@ VALUE um_open(struct um *machine, VALUE pathname, int flags, int mode) {
 
 VALUE um_waitpid(struct um *machine, int pid, int options) {
   struct um_op op;
-  um_prep_op(machine, &op, OP_BIND);
+  um_prep_op(machine, &op, OP_WAITPID);
   struct io_uring_sqe *sqe = um_get_sqe(machine, &op);
 
   siginfo_t infop;
@@ -575,6 +587,52 @@ VALUE um_waitpid(struct um *machine, int pid, int options) {
   return rb_ary_new_from_args(2, INT2NUM(infop.si_pid), INT2NUM(infop.si_status));
 }
 
+#define hash_set(h, sym, v) rb_hash_aset(h, ID2SYM(rb_intern(sym)), v)
+
+VALUE statx_to_hash(struct statx *stat) {
+  VALUE hash = rb_hash_new();
+
+  hash_set(hash, "dev",         UINT2NUM(stat->stx_dev_major << 8 | stat->stx_dev_minor));
+  hash_set(hash, "rdev",        UINT2NUM(stat->stx_rdev_major << 8 | stat->stx_rdev_minor));
+  hash_set(hash, "blksize",     UINT2NUM(stat->stx_blksize));
+  hash_set(hash, "attributes",  UINT2NUM(stat->stx_attributes));
+  hash_set(hash, "nlink",       UINT2NUM(stat->stx_nlink));
+  hash_set(hash, "uid",         UINT2NUM(stat->stx_uid));
+  hash_set(hash, "gid",         UINT2NUM(stat->stx_gid));
+  hash_set(hash, "mode",        UINT2NUM(stat->stx_mode));
+  hash_set(hash, "ino",         UINT2NUM(stat->stx_ino));
+  hash_set(hash, "size",        UINT2NUM(stat->stx_size));
+  hash_set(hash, "blocks",      UINT2NUM(stat->stx_blocks));
+  hash_set(hash, "atime",       DBL2NUM(um_timestamp_to_double(stat->stx_atime.tv_sec, stat->stx_atime.tv_nsec)));
+  hash_set(hash, "btime",       DBL2NUM(um_timestamp_to_double(stat->stx_btime.tv_sec, stat->stx_btime.tv_nsec)));
+  hash_set(hash, "ctime",       DBL2NUM(um_timestamp_to_double(stat->stx_ctime.tv_sec, stat->stx_ctime.tv_nsec)));
+  hash_set(hash, "mtime",       DBL2NUM(um_timestamp_to_double(stat->stx_mtime.tv_sec, stat->stx_mtime.tv_nsec)));
+  return hash;
+}
+
+VALUE um_statx(struct um *machine, int dirfd, VALUE path, int flags, unsigned int mask) {
+  struct um_op op;
+  um_prep_op(machine, &op, OP_STATX);
+  struct io_uring_sqe *sqe = um_get_sqe(machine, &op);
+
+  struct statx stat;
+  memset(&stat, 0, sizeof(stat));
+
+  if (NIL_P(path))
+    path = rb_str_new_literal("");
+
+  io_uring_prep_statx(sqe, dirfd, StringValueCStr(path), flags, mask, &stat);
+
+  VALUE ret = um_fiber_switch(machine);
+  if (um_check_completion(machine, &op))
+    ret = INT2NUM(op.result.res);
+
+  RB_GC_GUARD(ret);
+  raise_if_exception(ret);
+
+  return statx_to_hash(&stat);
+}
+
 /*******************************************************************************
                             multishot ops
 *******************************************************************************/

data/ext/um/um.h

@@ -25,9 +25,12 @@ enum op_kind {
   OP_SCHEDULE,
 
   OP_SLEEP,
+  OP_OPEN,
   OP_READ,
   OP_WRITE,
   OP_CLOSE,
+  OP_STATX,
+
   OP_ACCEPT,
   OP_RECV,
   OP_SEND,
@@ -38,6 +41,8 @@ enum op_kind {
   OP_GETSOCKOPT,
   OP_SETSOCKOPT,
   OP_SHUTDOWN,
+  
+  OP_WAITPID,
 
   OP_FUTEX_WAIT,
   OP_FUTEX_WAKE,
@@ -176,6 +181,7 @@ void um_buffer_checkin(struct um *machine, struct um_buffer *buffer);
 void um_free_buffer_linked_list(struct um *machine);
 
 struct __kernel_timespec um_double_to_timespec(double value);
+double um_timestamp_to_double(__s64 tv_sec, __u32 tv_nsec);
 int um_value_is_exception_p(VALUE v);
 VALUE um_raise_exception(VALUE v);
 
@@ -209,6 +215,7 @@ VALUE um_write(struct um *machine, int fd, VALUE str, int len);
 VALUE um_close(struct um *machine, int fd);
 VALUE um_open(struct um *machine, VALUE pathname, int flags, int mode);
 VALUE um_waitpid(struct um *machine, int pid, int options);
+VALUE um_statx(struct um *machine, int dirfd, VALUE path, int flags, unsigned int mask);
 
 VALUE um_accept(struct um *machine, int fd);
 VALUE um_accept_each(struct um *machine, int fd);

data/ext/um/um_class.c

@@ -130,6 +130,11 @@ VALUE UM_write(int argc, VALUE *argv, VALUE self) {
   return um_write(machine, NUM2INT(fd), buffer, bytes);
 }
 
+VALUE UM_statx(VALUE self, VALUE dirfd, VALUE path, VALUE flags, VALUE mask) {
+  struct um *machine = um_get_machine(self);
+  return um_statx(machine, NUM2INT(dirfd), path, NUM2INT(flags), NUM2UINT(mask));
+}
+
 VALUE UM_close(VALUE self, VALUE fd) {
   struct um *machine = um_get_machine(self);
   return um_close(machine, NUM2INT(fd));
@@ -342,6 +347,7 @@ void Init_UM(void) {
   rb_define_method(cUM, "sleep", UM_sleep, 1);
   rb_define_method(cUM, "periodically", UM_periodically, 1);
   rb_define_method(cUM, "write", UM_write, -1);
+  rb_define_method(cUM, "statx", UM_statx, 4);
 
   rb_define_method(cUM, "waitpid", UM_waitpid, 2);
 

data/ext/um/um_const.c

@@ -1,6 +1,7 @@
 #include "ruby.h"
 
 #include <fcntl.h>
+#include <sys/stat.h>
 #include <sys/wait.h>
 
 #include <arpa/inet.h>
@@ -16,6 +17,41 @@
 #define DEF_CONST_INT(mod, v) rb_define_const(mod, #v, INT2NUM(v))
 
 void um_define_net_constants(VALUE mod) {
+  DEF_CONST_INT(mod, AT_FDCWD);
+  DEF_CONST_INT(mod, AT_EMPTY_PATH);
+  DEF_CONST_INT(mod, AT_NO_AUTOMOUNT);
+  DEF_CONST_INT(mod, AT_SYMLINK_NOFOLLOW);
+  DEF_CONST_INT(mod, AT_STATX_SYNC_AS_STAT);
+  DEF_CONST_INT(mod, AT_STATX_FORCE_SYNC);
+  DEF_CONST_INT(mod, AT_STATX_DONT_SYNC);
+
+  DEF_CONST_INT(mod, STATX_TYPE);
+  DEF_CONST_INT(mod, STATX_MODE);
+  DEF_CONST_INT(mod, STATX_NLINK);
+  DEF_CONST_INT(mod, STATX_UID);
+  DEF_CONST_INT(mod, STATX_GID);
+  DEF_CONST_INT(mod, STATX_ATIME);
+  DEF_CONST_INT(mod, STATX_MTIME);
+  DEF_CONST_INT(mod, STATX_CTIME);
+  DEF_CONST_INT(mod, STATX_INO);
+  DEF_CONST_INT(mod, STATX_SIZE);
+  DEF_CONST_INT(mod, STATX_BLOCKS);
+  DEF_CONST_INT(mod, STATX_BASIC_STATS);
+  DEF_CONST_INT(mod, STATX_BTIME);
+  DEF_CONST_INT(mod, STATX_ALL);
+  DEF_CONST_INT(mod, STATX_MNT_ID);
+  DEF_CONST_INT(mod, STATX_DIOALIGN);
+  DEF_CONST_INT(mod, STATX_MNT_ID_UNIQUE);
+#ifdef STATX_SUBVOL
+  DEF_CONST_INT(mod, STATX_SUBVOL);
+#endif
+#ifdef STATX_WRITE_ATOMIC
+  DEF_CONST_INT(mod, STATX_WRITE_ATOMIC);
+#endif
+#ifdef STATX_DIO_READ_ALIGN
+  DEF_CONST_INT(mod, STATX_DIO_READ_ALIGN);
+#endif
+
   DEF_CONST_INT(mod, MSG_CONFIRM);
   DEF_CONST_INT(mod, MSG_DONTROUTE);
   DEF_CONST_INT(mod, MSG_DONTWAIT);

data/ext/um/um_utils.c

@@ -11,6 +11,10 @@ inline struct __kernel_timespec um_double_to_timespec(double value) {
   return ts;
 }
 
+inline double um_timestamp_to_double(__s64 tv_sec, __u32 tv_nsec) {
+  return (double)tv_sec + ((double)tv_nsec) / 1000000000;
+}
+
 #define RAISE_EXCEPTION(e) rb_funcall(e, ID_invoke, 0);
 
 inline int um_value_is_exception_p(VALUE v) {

data/lib/uringmachine/actor.rb

@@ -15,7 +15,7 @@ class UringMachine
     target = Object.new.extend(mod)
     mailbox = UM::Queue.new
     actor = Actor.new
-    thread = Thread.new do
+    Thread.new do
       actor.run(machine, target, mailbox)
     end
     target.setup(*a, **k)

data/lib/uringmachine/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class UringMachine
-  VERSION = '0.8.1'
+  VERSION = '0.10'
 end

data/lib/uringmachine.rb

@@ -88,9 +88,23 @@ class UringMachine
     def add_done_listener(queue)
       (@done_listeners ||= []) << queue
     end
+
+    def mailbox
+      @mailbox ||= UM::Queue.new
+    end
   end
 
   class ::Fiber
-    include UringMachine::FiberExtensions
+    include FiberExtensions
+  end
+
+  module ThreadExtensions
+    def machine
+      @machine ||= UM.new
+    end
+  end
+
+  class ::Thread
+    include ThreadExtensions
   end
 end

data/test/test_fiber.rb

@@ -63,7 +63,7 @@ class FiberTerminateTest < UMBaseTest
   end
 end
 
-class JoinTest < UMBaseTest
+class FiberJoinTest < UMBaseTest
   def test_join
     q = UM::Queue.new
     x = nil
@@ -151,14 +151,14 @@ class ScopeTest < UMBaseTest
 
     t0 = monotonic_clock
     machine.scope do
-      f1 = machine.spin do
+      machine.spin do
         x1 = 1
         machine.sleep 0.01
       ensure
         x1 = 0
       end
 
-      f2 = machine.spin do
+      machine.spin do
         x2 = 1
         machine.sleep 0.03
       ensure
@@ -172,3 +172,23 @@ class ScopeTest < UMBaseTest
     assert_equal 0, x2
   end
 end
+
+class FiberMailboxTest < UMBaseTest
+  def test_fiber_mailbox
+    m = Fiber.current.mailbox
+    assert_kind_of UM::Queue, m
+
+    m2 = Fiber.current.mailbox
+    assert_equal m, m2
+  end
+end
+
+class ThreadMachineTest < UMBaseTest
+  def test_thread_machine
+    m = Thread.current.machine
+    assert_kind_of UM, m
+
+    m2 = Thread.current.machine
+    assert_equal m, m2
+  end
+end

data/test/test_um.rb

@@ -29,7 +29,7 @@ end
 
 class SnoozeTest < UMBaseTest
   def test_snooze_while_sleeping_fiber
-    f = machine.spin do
+    machine.spin do
       machine.sleep(0.1)
     end
 
@@ -655,7 +655,6 @@ class AcceptEachTest < UMBaseTest
   end
 
   def test_accept_each_interrupted
-    conns = []
     count = 0
     terminated = nil
     f = @machine.spin do
@@ -678,6 +677,8 @@ class AcceptEachTest < UMBaseTest
 
     assert f.done?
     assert terminated
+  ensure
+    s.close
   end
 end
 
@@ -1231,3 +1232,46 @@ class WaitTest < UMBaseTest
     assert_raises(Errno::ECHILD) { machine.waitpid(1, UM::WEXITED) }
   end
 end
+
+class StatxTest < UMBaseTest
+  def test_statx
+    io = File.open(__FILE__, 'r')
+    ustat = machine.statx(io.fileno, nil, UM::AT_EMPTY_PATH, UM::STATX_ALL)
+    rstat = File.stat(__FILE__)
+
+    assert_equal rstat.dev,         ustat[:dev]
+    assert_equal rstat.ino,         ustat[:ino]
+    assert_equal rstat.mode,        ustat[:mode]
+    assert_equal rstat.nlink,       ustat[:nlink]
+    assert_equal rstat.uid,         ustat[:uid]
+    assert_equal rstat.gid,         ustat[:gid]
+    assert_equal rstat.rdev,        ustat[:rdev]
+    assert_equal rstat.size,        ustat[:size]
+    assert_equal rstat.blksize,     ustat[:blksize]
+    assert_equal rstat.blocks,      ustat[:blocks]
+    assert_equal rstat.atime.to_i,  ustat[:atime].to_i
+    assert_equal rstat.ctime.to_i,  ustat[:ctime].to_i
+    assert_equal rstat.mtime.to_i,  ustat[:mtime].to_i
+
+    ustat2 = machine.statx(UM::AT_FDCWD, __FILE__, 0, UM::STATX_ALL)
+    assert_equal rstat.dev,         ustat2[:dev]
+    assert_equal rstat.ino,         ustat2[:ino]
+    assert_equal rstat.mode,        ustat2[:mode]
+    assert_equal rstat.nlink,       ustat2[:nlink]
+    assert_equal rstat.uid,         ustat2[:uid]
+    assert_equal rstat.gid,         ustat2[:gid]
+    assert_equal rstat.rdev,        ustat2[:rdev]
+    assert_equal rstat.size,        ustat2[:size]
+    assert_equal rstat.blksize,     ustat2[:blksize]
+    assert_equal rstat.blocks,      ustat2[:blocks]
+    assert_equal rstat.atime.to_i,  ustat2[:atime].to_i
+    assert_equal rstat.ctime.to_i,  ustat2[:ctime].to_i
+    assert_equal rstat.mtime.to_i,  ustat2[:mtime].to_i
+  ensure
+    io.close
+  end
+
+  def test_statx_bad_path
+    assert_raises(Errno::ENOENT) { machine.statx(UM::AT_FDCWD, 'foobar', 0, UM::STATX_ALL) }
+  end
+end

data/uringmachine.gemspec

@@ -22,7 +22,5 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency  'rake-compiler',        '1.2.9'
   s.add_development_dependency  'minitest',             '5.25.4'
-  s.add_development_dependency  'http_parser.rb',       '0.8.0'
   s.add_development_dependency  'benchmark-ips',        '2.14.0'
-  s.add_development_dependency  'localhost',            '1.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uringmachine
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: '0.10'
 platform: ruby
 authors:
 - Sharon Rosner
@@ -37,20 +37,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 5.25.4
-- !ruby/object:Gem::Dependency
-  name: http_parser.rb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
@@ -65,20 +51,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.14.0
-- !ruby/object:Gem::Dependency
-  name: localhost
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.1
 email: sharon@noteflakes.com
 executables: []
 extensions: