uringmachine 0.11 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8297cccb35ae1c8086889c2400db8bb884b0dfccdbef561caa0a4e9f80b21053
-  data.tar.gz: 990e84bb2f975de00739150cff966bbf97a551ba135714eb92bc3b86cd14b5d0
+  metadata.gz: ccb8488c3f313b7a3890ae110fc5cebc7ac0062bbaa9ef362fb7ff5b02c680b9
+  data.tar.gz: 41f2c23a9427609c4d01a6eef319cbd40d029cf85918fd6c8d00e5b502f83ef6
 SHA512:
-  metadata.gz: f66149736c1cf58f8df65d387b81ff070fd890e99aa7c8aa806a5afcb04b8248b78c95c1673d30b7d3270c81e05bc0b84afdb025d2a0a2f02beca5977196b321
-  data.tar.gz: 7b6e6c31193da3a1e3e9a6fa627c84ae0f4d35c36f5fa636595acf1a013b71cd419073bb78be04130333796bed05e0ce9d1bfa74ab195608346cd689ecf9abaf
+  metadata.gz: 9bd08ebae21a7a10407ff04102d9cbf491bfab65ebe601b6ab3a6b7790632c946873415af4f45321e959bd39e875ff386e8c85f74329743204a9c0c047ce5da0
+  data.tar.gz: 3cd63222c0b990ef83f2b324aa46b36bd142a7b43a1a273428a9b70a95cfe25e0a1b06a2985a7463fe51a995c78e82838e34ee20d3c332cc46278ffd738652dd

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2025-06-02 Version 0.11.1
+
+- Fix `UM::Stream` behaviour on GC
+
 # 2025-06-02 Version 0.11
 
 - Implement `UM::Stream` class for read streams

data/examples/bm_http_parse.rb

@@ -1,16 +1,17 @@
 # frozen_string_literal: true
 
-require 'bundler/inline'
+# require 'bundler/inline'
 
-gemfile do
-  source 'https://rubygems.org'
-  gem 'uringmachine', path: '..'
-  gem 'benchmark-ips'
-  gem 'http_parser.rb'
-end
+# gemfile do
+#   source 'https://rubygems.org'
+#   gem 'uringmachine', path: '..'
+#   gem 'benchmark-ips'
+#   gem 'http_parser.rb'
+# end
 
-require 'benchmark/ips'
+require 'bundler/setup'
 require 'uringmachine'
+require 'benchmark/ips'
 require 'http/parser'
 
 $machine = UM.new
@@ -19,6 +20,8 @@ HTTP_MSG = "GET /foo/bar HTTP/1.1\r\nServer: foobar.com\r\nFoo: bar\r\n\r\n"
 
 $count = 0
 
+STDOUT.sync = true
+
 def parse_http_parser
   current_fiber = Fiber.current
   $count += 1
@@ -45,10 +48,16 @@ def parse_http_parser
   end
 
   $machine.write(w.fileno, HTTP_MSG)
-  $machine.yield
+  ret = $machine.yield
+  ret
+rescue Exception => e
+  p e: e
+  exit
 ensure
-  $machine.close(r.fileno)
-  $machine.close(w.fileno)
+  r.close rescue nil
+  w.close rescue nil
+  # $machine.close(r.fileno) rescue nil
+  # $machine.close(w.fileno) rescue nil
 end
 
 require 'stringio'
@@ -100,50 +109,114 @@ def parse_headers(fd)
 end
 
 def parse_http_stringio
-  current_fiber = Fiber.current
-  r, w = IO.pipe
+  rfd, wfd = UM.pipe
+  queue = UM::Queue.new
 
   $machine.spin do
-    headers = parse_headers(r.fileno)
-    $machine.schedule(current_fiber, headers)
+    headers = parse_headers(rfd)
+    $machine.push(queue, headers)
   rescue Exception => e
     p e
     puts e.backtrace.join("\n")
     exit!
   end
 
-  $machine.write(w.fileno, HTTP_MSG)
-  $machine.yield
+  $machine.write(wfd, HTTP_MSG)
+  $machine.close(wfd)
+  $machine.shift(queue)
 ensure
-  $machine.close(r.fileno)
-  $machine.close(w.fileno)
+  ($machine.close(rfd) rescue nil) if rfd
+  ($machine.close(wfd) rescue nil) if wfd
 end
 
-# p parse_http_parser
-# p parse_http_stringio
-# exit
+def stream_parse_headers(fd)
+  stream = UM::Stream.new($machine, fd)
 
-GC.disable
+  headers = stream_get_request_line(stream)
+  return nil if !headers
 
-def alloc_count
-  count0 = ObjectSpace.count_objects[:TOTAL]
-  yield
-  count1 = ObjectSpace.count_objects[:TOTAL]
-  count1 - count0
+  while true
+    line = stream.get_line()
+    break if line.empty?
+
+    m = line.match(RE_HEADER_LINE)
+    raise "Invalid header" if !m
+
+    headers[m[1]] = m[2]
+  end
+
+  headers
 end
 
-X = 100
-p(
-  alloc_http_parser: alloc_count { X.times { parse_http_parser } },
-  alloc_stringio: alloc_count { X.times { parse_http_stringio } }
-)
-exit
+def stream_get_request_line(stream)
+  line = stream.get_line()
+
+  m = line.match(RE_REQUEST_LINE)
+  return nil if !m
+
+  {
+    'method'   => m[1].downcase,
+    'path'     => m[2],
+    'protocol' => m[3].downcase
+  }
+end
+
+def parse_http_stream
+  rfd, wfd = UM.pipe
+  queue = UM::Queue.new
+
+  $machine.spin do
+    headers = stream_parse_headers(rfd)
+    $machine.push(queue, headers)
+  rescue Exception => e
+    p e
+    puts e.backtrace.join("\n")
+    exit!
+  end
+
+  $machine.write(wfd, HTTP_MSG)
+  $machine.shift(queue)
+ensure
+  ($machine.close(rfd) rescue nil) if rfd
+  ($machine.close(wfd) rescue nil) if wfd
+end
+
+# 10000.times { parse_http_parser }
+# 10000.times { parse_http_stringio }
+# 10000.times { parse_http_stream }
+# exit
+
+# GC.disable
+
+# OS = ObjectSpace
+
+# def object_count
+#   counts = ObjectSpace.count_objects
+#   counts[:TOTAL] - counts[:FREE]
+# end
+
+# def alloc_count
+#   GC.start
+#   count0 = object_count
+#   yield
+#   count1 = object_count
+#   count1 - count0
+# end
+
+# X = 100
+# p(
+#   alloc_http_parser: alloc_count { X.times { parse_http_parser } },
+#   alloc_stringio: alloc_count { X.times { parse_http_stringio } },
+#   alloc_stream: alloc_count { X.times { parse_http_stream } }
+# )
+# exit
 
 Benchmark.ips do |x|
   x.config(:time => 5, :warmup => 3)
 
   x.report("http_parser") { parse_http_parser }
-  x.report("homegrown") { parse_http_stringio }
+  x.report("stringio") { parse_http_stringio }
+  x.report("stream") { parse_http_stream }
 
   x.compare!
 end

data/ext/um/um.h

@@ -271,7 +271,8 @@ VALUE um_queue_unshift(struct um *machine, struct um_queue *queue, VALUE value);
 VALUE um_queue_shift(struct um *machine, struct um_queue *queue);
 
 int stream_read_more(struct um_stream *stream);
-
+VALUE stream_get_line(struct um_stream *stream);
+VALUE stream_get_string(struct um_stream *stream, ulong len);
 VALUE resp_get_line(struct um_stream *stream, VALUE out_buffer);
 VALUE resp_get_string(struct um_stream *stream, ulong len, VALUE out_buffer);
 VALUE resp_decode(struct um_stream *stream, VALUE out_buffer);

data/ext/um/um_stream.c

@@ -1,5 +1,32 @@
 #include "um.h"
 
+VALUE stream_get_line(struct um_stream *stream) {
+  char *start = RSTRING_PTR(stream->buffer) + stream->pos;
+  while (true) {
+    char * lf_ptr = memchr(start, '\n', stream->len - stream->pos);
+    if (lf_ptr) {
+      ulong len = lf_ptr - start;
+      if (len && (start[len - 1] == '\r')) len -= 1;
+
+      VALUE str = rb_str_new(start, len);
+      stream->pos += lf_ptr - start + 1;
+      return str;
+    }
+
+    if (!stream_read_more(stream)) return Qnil;
+  }
+}
+
+VALUE stream_get_string(struct um_stream *stream, ulong len) {
+  while (stream->len - stream->pos < len)
+    if (!stream_read_more(stream)) return Qnil;
+  
+  char *start = RSTRING_PTR(stream->buffer) + stream->pos;
+  VALUE str = rb_utf8_str_new(start, len);
+  stream->pos += len;
+  return str;
+}
+
 static inline void stream_check_truncate_buffer(struct um_stream *stream) {
   if ((stream->pos == stream->len) && (stream->len >= 1 << 12)) {
     rb_str_modify(stream->buffer);
@@ -58,6 +85,7 @@ VALUE resp_get_line(struct um_stream *stream, VALUE out_buffer) {
         VALUE str = rb_str_new(start, len + 1);
         rb_str_set_len(str, len);
         RSTRING_PTR(str)[len] = 0;
+        RB_GC_GUARD(str);
         return str;
       }
 

data/ext/um/um_stream_class.c

@@ -37,6 +37,8 @@ static VALUE Stream_allocate(VALUE klass) {
 VALUE Stream_initialize(VALUE self, VALUE machine, VALUE fd) {
   struct um_stream *stream = RTYPEDDATA_DATA(self);
 
+  stream->self = self;
+  
   stream->machine = RTYPEDDATA_DATA(machine);
   stream->fd = NUM2ULONG(fd);
   stream->buffer = rb_utf8_str_new_literal("");
@@ -54,35 +56,14 @@ VALUE Stream_get_line(VALUE self) {
   struct um_stream *stream = RTYPEDDATA_DATA(self);
   if (unlikely(stream->eof)) return Qnil;
 
-  char *start = RSTRING_PTR(stream->buffer) + stream->pos;
-  while (true) {
-    char * lf_ptr = memchr(start, '\n', stream->len - stream->pos);
-    if (lf_ptr) {
-      ulong len = lf_ptr - start;
-      if (len && (start[len - 1] == '\r')) len -= 1;
-
-      VALUE str = rb_str_new(start, len);
-      stream->pos += lf_ptr - start + 1;
-      return str;
-    }
-
-    if (!stream_read_more(stream)) return Qnil;
-  }
+  return stream_get_line(stream);
 }
 
 VALUE Stream_get_string(VALUE self, VALUE len) {
   struct um_stream *stream = RTYPEDDATA_DATA(self);
   if (unlikely(stream->eof)) return Qnil;
 
-  ulong ulen = NUM2ULONG(len);
-
-  while (stream->len - stream->pos < ulen)
-    if (!stream_read_more(stream)) return Qnil;
-  
-  char *start = RSTRING_PTR(stream->buffer) + stream->pos;
-  VALUE str = rb_utf8_str_new(start, ulen);
-  stream->pos += ulen;
-  return str;
+  return stream_get_string(stream, NUM2ULONG(len));
 }
 
 VALUE Stream_resp_get_line(VALUE self) {

data/lib/uringmachine/version.rb

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

data/uringmachine.gemspec

@@ -23,4 +23,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  'benchmark-ips',        '2.14.0'
+  s.add_development_dependency  'http_parser.rb',       '0.8.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uringmachine
 version: !ruby/object:Gem::Version
-  version: '0.11'
+  version: 0.11.1
 platform: ruby
 authors:
 - Sharon Rosner
@@ -51,6 +51,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.14.0
+- !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
 email: sharon@noteflakes.com
 executables: []
 extensions: