polyphony 0.87 → 0.91

data/ext/polyphony/polyphony.h

@@ -35,6 +35,9 @@
 
 #define BACKEND() (rb_ivar_get(rb_thread_current(), ID_ivar_backend))
 
+// SAFE is used to cast functions used in rb_ensure
+#define SAFE(f) (VALUE (*)(VALUE))(f)
+
 extern VALUE mPolyphony;
 extern VALUE cPipe;
 extern VALUE cQueue;
@@ -114,6 +117,10 @@ VALUE Backend_sleep(VALUE self, VALUE duration);
 VALUE Backend_splice(VALUE self, VALUE src, VALUE dest, VALUE maxlen);
 VALUE Backend_splice_to_eof(VALUE self, VALUE src, VALUE dest, VALUE chunksize);
 
+#ifdef POLYPHONY_BACKEND_LIBURING
+VALUE Backend_double_splice_to_eof(VALUE self, VALUE src, VALUE dest);
+#endif
+
 #ifdef POLYPHONY_LINUX
 VALUE Backend_tee(VALUE self, VALUE src, VALUE dest, VALUE maxlen);
 #endif

data/ext/polyphony/queue.c

@@ -210,7 +210,7 @@ VALUE Queue_capped_p(VALUE self) {
   Queue_t *queue;
   GetQueue(self, queue);
 
-  return queue->capacity ? UINT2NUM(queue->capacity) : Qnil;
+  return queue->capacity ? INT2FIX(queue->capacity) : Qnil;
 }
 
 VALUE Queue_clear(VALUE self) {
@@ -280,14 +280,14 @@ VALUE Queue_num_waiting(VALUE self) {
   Queue_t *queue;
   GetQueue(self, queue);
 
-  return INT2NUM(queue->shift_queue.count);
+  return INT2FIX(queue->shift_queue.count);
 }
 
 VALUE Queue_size_m(VALUE self) {
   Queue_t *queue;
   GetQueue(self, queue);
 
-  return INT2NUM(queue->values.count);
+  return INT2FIX(queue->values.count);
 }
 
 VALUE Queue_closed_p(VALUE self) {

data/ext/polyphony/socket_extensions.c

@@ -6,13 +6,13 @@ VALUE Socket_send(VALUE self, VALUE msg, VALUE flags) {
 
 VALUE Socket_write(int argc, VALUE *argv, VALUE self) {
   VALUE ary = rb_ary_new_from_values(argc, argv);
-  VALUE result = Backend_sendv(BACKEND(), self, ary, INT2NUM(0));
+  VALUE result = Backend_sendv(BACKEND(), self, ary, INT2FIX(0));
   RB_GC_GUARD(ary);
   return result;
 }
 
 VALUE Socket_double_chevron(VALUE self, VALUE msg) {
-  Backend_send(BACKEND(), self, msg, INT2NUM(0));
+  Backend_send(BACKEND(), self, msg, INT2FIX(0));
   return self;
 }
 

data/lib/polyphony/extensions/io.rb

@@ -83,6 +83,10 @@ class ::IO
     end
 
     if RUBY_PLATFORM =~ /linux/
+      def double_splice_to_eof(src, dest)
+        Polyphony.backend_double_splice_to_eof(src, dest)
+      end
+    
       def tee(src, dest, maxlen)
         Polyphony.backend_tee(src, dest, maxlen)
       end

data/lib/polyphony/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Polyphony
-  VERSION = '0.87'
+  VERSION = '0.91'
 end

data/test/stress.rb

@@ -3,7 +3,7 @@
 count = ARGV[0] ? ARGV[0].to_i : 100
 test_name = ARGV[1]
 
-$test_cmd = +'ruby test/run.rb  --name test_cross_thread_send_receive'
+$test_cmd = +'ruby test/run.rb  --name test_signal_handler_trace'
 if test_name
   $test_cmd << " --name #{test_name}"
 end

data/test/test_io.rb

@@ -368,6 +368,31 @@ class IOTest < MiniTest::Test
     end
   end
 
+  def test_double_splice_to_eof
+    if Thread.current.backend.kind == :io_uring
+      skip "IO.double_splice_to_eof available only with io_uring"
+    end
+
+    src = Polyphony.pipe
+    dest = Polyphony.pipe
+    ret = nil
+    data = 'foobar' * 10
+
+    f1 = spin {
+      ret = IO.double_splice_to_eof(src, dest)
+      dest.close
+    }
+
+    src << data
+    src.close
+
+    f1.await
+
+    spliced = dest.read
+    assert_equal data, spliced
+    assert_equal data.bytesize, ret
+  end
+
   def test_tee_from
     skip "tested only on Linux" unless RUBY_PLATFORM =~ /linux/
     
@@ -656,19 +681,75 @@ class IOExtensionsTest < MiniTest::Test
     i, o = IO.pipe
     r, w = IO.pipe
 
-    spin {
-      IO.deflate(i, w)
+    ret = nil
+    f = spin {
+      ret = IO.deflate(i, w)
       w.close
     }
 
     o << 'foobar' * 20
     o.close
 
+    f.await
+    assert_equal 17, ret
+
     data = r.read
     msg = Zlib::Inflate.inflate(data)
     assert_equal 'foobar' * 20, msg
   end
 
+  def test_deflate_to_string
+    i, o = IO.pipe
+    r, w = IO.pipe
+    str = +''
+
+    ret = nil
+    f = spin {
+      ret = IO.deflate(i, str)
+      w << str
+      w.close
+    }
+
+    o << 'foobar' * 20
+    o.close
+
+    f.await
+    assert_equal 17, ret
+
+    data = r.read
+    msg = Zlib::Inflate.inflate(data)
+    assert_equal 'foobar' * 20, msg
+  end
+
+  def test_deflate_to_frozen_string
+    i, o = IO.pipe
+    str = '' # frozen
+
+    f = spin {
+      o << 'foobar' * 20
+      o.close
+    }
+
+    assert_raises(FrozenError) { IO.deflate(i, str) }
+  end
+
+  def test_deflate_from_string
+    r, w = IO.pipe
+    str = 'foobar' * 10000
+    ret = nil
+    
+    f = spin {
+      ret = IO.deflate(str, w)
+      w.close
+    }
+    f.await
+    assert_equal 118, ret
+
+    data = r.read
+    msg = Zlib::Inflate.inflate(data)
+    assert_equal str, msg
+  end
+
   def test_inflate
     i, o = IO.pipe
     r, w = IO.pipe
@@ -679,7 +760,35 @@ class IOExtensionsTest < MiniTest::Test
       o.close
     }
 
-    IO.inflate(i, w)
+    ret = IO.inflate(i, w)
+    assert_equal 6, ret
+    w.close
+    msg = r.read
+    assert_equal 'foobar', msg
+  end
+
+  def test_inflate_to_string
+    i, o = IO.pipe
+    str = +''
+
+    spin {
+      data = Zlib::Deflate.deflate('foobar', 9)
+      o << data
+      o.close
+    }
+
+    ret = IO.inflate(i, str)
+    assert_equal 6, ret
+    assert_equal 6, str.bytesize
+    assert_equal 'foobar', str
+  end
+
+  def test_inflate_from_string
+    r, w = IO.pipe
+    str = Zlib::Deflate.deflate('foobar', 9)
+
+    ret = IO.inflate(str, w)
+    assert_equal 6, ret
     w.close
     msg = r.read
     assert_equal 'foobar', msg
@@ -690,7 +799,7 @@ class IOExtensionsTest < MiniTest::Test
     dest = Polyphony.pipe
     now = nil
 
-    spin {
+    f = spin {
       now = Time.now
       IO.gzip(src, dest)
       dest.close
@@ -698,6 +807,32 @@ class IOExtensionsTest < MiniTest::Test
 
     src << IO.read(__FILE__)
     src.close
+    f.await
+
+    gz = Zlib::GzipReader.new(dest)
+    data = gz.read
+    assert_equal IO.read(__FILE__), data
+    assert_in_range (now-2)..(now+1), gz.mtime
+    assert_nil gz.orig_name
+    assert_nil gz.comment
+  end
+
+  def test_gzip_to_string
+    src = Polyphony.pipe
+    dest = Polyphony.pipe
+    str = +''
+    now = nil
+
+    f = spin {
+      now = Time.now
+      IO.gzip(src, str)
+      dest << str
+      dest.close
+    }
+
+    src << IO.read(__FILE__)
+    src.close
+    f.await
 
     gz = Zlib::GzipReader.new(dest)
     data = gz.read
@@ -707,6 +842,39 @@ class IOExtensionsTest < MiniTest::Test
     assert_nil gz.comment
   end
 
+  def test_gzip_from_string
+    str = IO.read(__FILE__)
+    dest = Polyphony.pipe
+    now = nil
+
+    IO.gzip(str, dest)
+    dest.close
+
+    gz = Zlib::GzipReader.new(dest)
+    data = gz.read
+    assert_equal IO.read(__FILE__), data
+  end
+
+  def test_gzip_return_value
+    src = Polyphony.pipe
+    dest = Polyphony.pipe
+    now = nil
+    ret = nil
+
+    f = spin {
+      now = Time.now
+      ret = IO.gzip(src, dest)
+      dest.close
+    }
+
+    src << IO.read(__FILE__)
+    src.close
+    f.await
+
+    gzipped = dest.read
+    assert_equal gzipped.bytesize, ret
+  end
+
   def test_gzip_with_mtime_int
     src = Polyphony.pipe
     dest = Polyphony.pipe
@@ -801,19 +969,51 @@ class IOExtensionsTest < MiniTest::Test
   def test_gunzip
     src = Polyphony.pipe
     dest = Polyphony.pipe
+    ret = nil
 
-    spin {
-      IO.gunzip(src, dest)
+    f = spin {
+      ret = IO.gunzip(src, dest)
       dest.close
     }
 
     gz = Zlib::GzipWriter.new(src, 9)
-    gz << 'foobar'#IO.read(__FILE__)
+    gz << IO.read(__FILE__)
     gz.close
+    f.await
 
     data = dest.read
-    # assert_equal IO.read(__FILE__), data
-    assert_equal 'foobar', data
+    assert_equal IO.read(__FILE__).bytesize, ret
+    assert_equal IO.read(__FILE__), data
+  end
+
+  def test_gunzip_to_string
+    src = Polyphony.pipe
+    str = +''
+    ret = nil
+
+    f = spin {
+      ret = IO.gunzip(src, str)
+    }
+
+    gz = Zlib::GzipWriter.new(src, 9)
+    gz << IO.read(__FILE__)
+    gz.close
+    f.await
+
+    assert_equal IO.read(__FILE__).bytesize, ret
+    assert_equal IO.read(__FILE__), str
+  end
+
+  def test_gunzip_from_string
+    src_data = 'foobar' * 1000
+    str = Zlib.gzip(src_data, level: 9)
+    dest = Polyphony.pipe
+    ret = IO.gunzip(str, dest)
+    dest.close
+
+    dest_data = dest.read
+    assert_equal src_data.bytesize, ret
+    assert_equal src_data, dest_data
   end
 
   def test_gunzip_multi
@@ -893,4 +1093,24 @@ class IOExtensionsTest < MiniTest::Test
     assert_equal 'foo.bar', dest_info[:orig_name]
     assert_equal 'hello!', dest_info[:comment]
   end
+
+  def test_deflate_inflate_strings
+    src_data = IO.read(__FILE__)
+    deflated = +''
+    IO.deflate(src_data, deflated)
+    inflated = +''
+    IO.inflate(deflated, inflated)
+
+    assert_equal src_data, inflated
+  end
+
+  def test_gzip_gunzip_strings
+    src_data = IO.read(__FILE__)
+    gzipped = +''
+    IO.gzip(src_data, gzipped)
+    gunzipped = +''
+    IO.gunzip(gzipped, gunzipped)
+
+    assert_equal src_data, gunzipped
+  end
 end

data/test/test_signal.rb

@@ -32,11 +32,15 @@ class SignalTrapTest < Minitest::Test
       trap ('SIGINT') { raise Interrupt }
     end
 
+    # remove [:spin, :oob], [:schedule, :oob], since they are generated inside
+    # the signal handler, which occur while the trace proc is running.
+    events = events.reject do |e|
+      e == [:spin, :oob] || e == [:schedule, :oob]
+    end
+
     expected = [
       [:block, :main],
       [:enter_poll, :main],
-      [:spin, :oob],
-      [:schedule, :oob],
       [:leave_poll, :main],
       [:unblock, :oob],
       [:terminate, :oob],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: '0.87'
+  version: '0.91'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-17 00:00:00.000000000 Z
+date: 2022-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -305,6 +305,12 @@ files:
 - examples/performance/thread-vs-fiber/threaded_server.rb
 - examples/performance/thread_pool_perf.rb
 - examples/performance/thread_switch.rb
+- examples/pipes/echo_server.rb
+- examples/pipes/gunzip.rb
+- examples/pipes/gzip.rb
+- examples/pipes/gzip_http_server.rb
+- examples/pipes/tcp_proxy.rb
+- examples/pipes/tee.rb
 - ext/libev/Changes
 - ext/libev/LICENSE
 - ext/libev/README