uringmachine 0.28.0 → 0.28.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c42e434298bf496752efc6fe6a4cc81d04857f28f1151cfc3165ac3c288ec6a2
-  data.tar.gz: ec176b165f129aa7d1b6d0bdbc5f4b7e55d5e553569061d89956d0b1aee68503
+  metadata.gz: 21a7c3c4503c06967ae77b6b3c8da3fb0f19eae3373efccb018ff111dc6d2aa8
+  data.tar.gz: 5376adb14245278692e634fdb6843080239a7a806b13032706b91036a9483c1a
 SHA512:
-  metadata.gz: 1760b892d6ae21c7007fd0a109a78d631da4ae9a79667ad85bc4740ac0e339802ca9cb0bc34114570bf7e6113e4dab704a1c9f40513a196e840b759a494a35b9
-  data.tar.gz: 7dfe1426f96ecd1e99af4224c34d3b3173858b5d6c156b949314a0e80c34b836ae738e930ed26662319bc6700401cd0b369028e172ed1b70982cee64fb13f7a1
+  metadata.gz: 0b00614b471f51e8c3e31c77b2844284c371a4c0a73b30c0016969421ee20777ce2ca5ee215201a1a31aec189f7f703f39a0884c262c3ffc5c36ccbbae73a6f1
+  data.tar.gz: 26efdd3e98c013e9edd0962cc0fcab3bd9454485743fabc05a1d181200ad256aeb649618193048451850b39623f48cd69e9563f21defb8a178c5dcc300f24eb5

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 0.28.2 2026-02-20
+
+- Fix `Stream#get_string`
+
+# 0.28.1 2026-02-20
+
+- Add `Stream#machine`, `Stream#fd`
+
 # 0.28.0 2026-02-19
 
 - Add `#terminate`

data/TODO.md

@@ -2,6 +2,8 @@
 
 - Add tests for support for Set in `machine#await_fibers`
 - Add tests for support for Set, Array in `machine#join`
+- Add `#read_file` for reading entire file
+- Add `#write_file` for writing entire file
 
 - (?) Fix all futex value (Queue, Mutex) to be properly aligned
 
@@ -110,3 +112,36 @@ stream.read_to_eof(buf)
 # defaults:
 stream.read_to_eof(nil)
 ```
+
+## Syntax / pattern for launching multiple operations
+
+```ruby
+results = machine.concurrently(
+  -> { machine.read(fd1, ...) },
+  -> { machine.read(fd2, ...) }
+  -> { ... }
+)
+
+# or maybe:
+jobs = (1..100).map { |i| -> { machine.read_file("/file_#{i}.csv") } }
+machine.join(jobs)
+
+# or maybe:
+jobs = (1..100).map { |i|
+  -> {
+    pipe  { machine.read_file("/file_#{i}.csv") }
+      >   { csv_to_pdf(it) }
+      >   { machine.write_file("/file_#{i}.pdf", it) }
+  }
+}
+
+# or otherwise
+jobs = (1..100).map { |i|
+  -> {
+    csv = machine.read_file("/file_#{i}.csv")
+    pdf = csv_to_pdf(csv)
+    machine.write_file("/file_#{i}.pdf", pdf)
+  }
+}
+machine.join(jobs)
+```

data/ext/um/um_stream.c

@@ -56,8 +56,8 @@ static inline void str_copy_bytes(VALUE dest, const char *src, ssize_t len) {
 }
 
 VALUE stream_get_line(struct um_stream *stream, VALUE buf, ssize_t maxlen) {
-  char *start = RSTRING_PTR(stream->buffer) + stream->pos;
   while (true) {
+    char *start = RSTRING_PTR(stream->buffer) + stream->pos;
     ssize_t pending_len = stream->len - stream->pos;
     ssize_t search_len = pending_len;
     ssize_t absmax_len = labs(maxlen);
@@ -76,32 +76,31 @@ VALUE stream_get_line(struct um_stream *stream, VALUE buf, ssize_t maxlen) {
       return buf;
     }
     else if (should_limit_len && pending_len > search_len)
-      // maxlen
+      // hit maxlen
       return Qnil;
 
     if (!stream_read_more(stream))
       return Qnil;
-    else
-      // update start ptr (it might have changed after reading)
-      start = RSTRING_PTR(stream->buffer) + stream->pos;
   }
 }
 
 VALUE stream_get_string(struct um_stream *stream, VALUE buf, ssize_t len) {
   size_t abslen = labs(len);
-  while (stream->len - stream->pos < abslen)
+  while (stream->len - stream->pos < abslen) {
     if (!stream_read_more(stream)) {
-      if (len > 0) return Qnil;
+      if (len > 0)
+        return Qnil;
 
       abslen = stream->len - stream->pos;
     }
+  }
 
   char *start = RSTRING_PTR(stream->buffer) + stream->pos;
   stream->pos += abslen;
 
   if (NIL_P(buf)) return rb_utf8_str_new(start, abslen);
 
-  str_copy_bytes(buf, start, len);
+  str_copy_bytes(buf, start, abslen);
   return buf;
 }
 

data/ext/um/um_stream_class.c

@@ -51,6 +51,16 @@ VALUE Stream_initialize(VALUE self, VALUE machine, VALUE fd) {
   return self;
 }
 
+VALUE Stream_machine(VALUE self) {
+  struct um_stream *stream = Stream_data(self);
+  return stream->machine->self;
+}
+
+VALUE Stream_fd(VALUE self) {
+  struct um_stream *stream = Stream_data(self);
+  return ULONG2NUM(stream->fd);
+}
+
 VALUE Stream_get_line(VALUE self, VALUE buf, VALUE limit) {
   struct um_stream *stream = Stream_data(self);
   if (unlikely(stream->eof)) return Qnil;
@@ -109,6 +119,8 @@ void Init_Stream(void) {
   rb_define_alloc_func(cStream, Stream_allocate);
 
   rb_define_method(cStream, "initialize", Stream_initialize, 2);
+  rb_define_method(cStream, "machine", Stream_machine, 0);
+  rb_define_method(cStream, "fd", Stream_fd, 0);
 
   rb_define_method(cStream, "get_line", Stream_get_line, 2);
   rb_define_method(cStream, "get_string", Stream_get_string, 2);

data/lib/uringmachine/version.rb

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

data/test/test_stream.rb

@@ -11,6 +11,14 @@ class StreamBaseTest < UMBaseTest
 end
 
 class StreamTest < StreamBaseTest
+  def test_stream_machine
+    assert_equal @machine, @stream.machine
+  end
+
+  def test_stream_fd
+    assert_equal @rfd, @stream.fd
+  end
+
   def test_get_line
     machine.write(@wfd, "foo\nbar\r\nbaz")
     machine.close(@wfd)
@@ -226,3 +234,20 @@ class StreamRespTest < StreamBaseTest
       s.resp_encode_cmd(+'', :set, 'foobar', :nx, :xx)
   end
 end
+
+class StreamHTTPTest < StreamBaseTest
+  def test_stream_http_etc
+    machine.write(@wfd, "GET / HTTP/1.1\r\n\r\nblahblah")
+    machine.close(@wfd)
+
+    l = @stream.get_line(nil, 0)
+    assert_equal "GET / HTTP/1.1", l
+
+    l = @stream.get_line(nil, 0)
+    assert_equal '', l
+
+    l = @stream.get_string(nil, -50)
+    assert_equal 'blahblah', l
+  end
+end
+

data/test/test_um.rb

@@ -2103,26 +2103,6 @@ class SendRecvFdTest < UMBaseTest
     machine.close(w_fd) rescue nil
   end
 
-  def test_send_recv_fd_fork_inverse
-    pid = fork do
-      m = UM.new
-      r, w = UM.pipe
-      m.send_fd(@s2_fd, r)
-
-      buf = +''
-      m.read(r, buf, 128)
-      m.send(@s2_fd, buf)
-    end
-
-    assert_raises(Errno::EINVAL) { machine.recv_fd(@s1_fd) }
-  ensure
-    if pid
-      Process.kill('KILL', pid) rescue nil
-      Process.wait(pid) rescue nil
-    end
-    machine.close(w) rescue nil
-  end
-
   def test_send_fd_bad_sock_fd
     _r_fd, w_fd = UM.pipe
     assert_raises(Errno::ENOTSOCK) { machine.send_fd(0, w_fd) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uringmachine
 version: !ruby/object:Gem::Version
-  version: 0.28.0
+  version: 0.28.2
 platform: ruby
 authors:
 - Sharon Rosner