polyphony 0.90 → 0.91

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9f125403a124d0374ebef23adfd4fe7f553767797003d63513ef780a248370b
-  data.tar.gz: 682134740af1614ac5e31d49c7d6a8ac8b881bbc26e5911e2f12a81f5ea52b27
+  metadata.gz: d1b4a68e893c4cdca8e308cf3297fbf2549f70c0a7038f7c492f5c7c0a6ca6b4
+  data.tar.gz: 65a1cd1b10fa1a29c37c24972c0a47c324f744ff0ddba6e67464000da2a2707e
 SHA512:
-  metadata.gz: d6292c9f2ddd6faf3d8df9565f8e6dce3be9ecd64fff95201bd2907cfacdb46eac5ef87a9281a3e88324471951493b6ebaa150dad40afb6a19958dd1e5992c0c
-  data.tar.gz: 10f8e607a0bd403664318e03abd4bbb4ab16704a69d1c0858ce5c9269c5c883e081dd95c51488dce7732ae471bf04cd139c0cbfb9623d6751a857551304e60f5
+  metadata.gz: 316969779f3e2ce5a055c886ee89448b1908e57dcfb06775f5aa01491e895b450cfdaa3ec3d1f72f3a59017326dd7c3478b21e85cb7914a8bf2c17544bd47de7
+  data.tar.gz: 0a5badc5927cac1b111a13dd65eac242e2c2a7436dbf9a42e2376c4b321d042e27012e7d6b3906bf1d434d62a85bbfa8651700f2d4585475cbf89bc52de64569

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.91 2022-03-23
+
+- Add pipe examples
+- Implement `Backend#double_splice_to_eof` (io_ring only)
+- Improve safety of tracing
+
 ## 0.90 2022-03-21
 
 - Fix possible compilation error on Ruby 2.7.5 (#79)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    polyphony (0.90)
+    polyphony (0.91)
 
 GEM
   remote: https://rubygems.org/

data/examples/pipes/echo_server.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony'
+
+def handle_client(conn)
+  spin do
+    buffer = Polyphony.pipe
+    spin { IO.splice_to_eof(conn, buffer) }
+    IO.splice_to_eof(buffer, conn)
+  end
+rescue SystemCallError
+  # ignore
+end
+
+puts "Serving echo on port 1234..."
+TCPServer.new('127.0.0.1', 1234).accept_loop { |c| handle_client(c) }

data/examples/pipes/gunzip.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony'
+
+IO.gunzip(STDIN, STDOUT)

data/examples/pipes/gzip.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony'
+
+IO.gzip(STDIN, STDOUT)

data/examples/pipes/gzip_http_server.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'bundler/inline'
+
+gemfile do
+  gem 'h1p'
+  gem 'polyphony', path: '.'
+end
+
+require 'polyphony'
+require 'h1p'
+
+def handle_client(conn)
+  spin do
+    parser = H1P::Parser.new(conn, :server)
+    
+    while true # assuming persistent connection
+      headers = parser.parse_headers
+      break unless headers
+
+      raw_buffer = Polyphony.pipe
+      gzip_buffer = Polyphony.pipe
+      
+      # splice request body to buffer
+      spin do
+        parser.splice_body_to(raw_buffer)
+        raw_buffer.close
+      end
+
+      # zip data from buffer into gzip buffer
+      spin do
+        IO.gzip(raw_buffer, gzip_buffer)
+        gzip_buffer.close
+      end
+
+      # send headers and splice response from gzip buffer
+      conn << "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n\r\n"
+      IO.http1_splice_chunked(gzip_buffer, conn, 65535)
+    end
+  rescue H1P::Error
+    puts 'Got invalid request, closing connection...'
+  ensure
+    conn.close
+  end
+end
+
+puts "Serving echo on port 1234..."
+TCPServer.new('127.0.0.1', 1234).accept_loop { |c| handle_client(c) }
+

data/examples/pipes/tcp_proxy.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony'
+
+DESTINATION = ['127.0.0.1', 1234]
+
+def handle_client(conn)
+  spin do
+    dest = TCPSocket.new(*DESTINATION)
+    w_buffer = Polyphony.pipe
+    r_buffer = Polyphony.pipe
+    
+    spin { IO.splice_to_eof(conn, w_buffer) }
+    spin { IO.splice_to_eof(w_buffer, dest) }
+
+    spin { IO.splice_to_eof(dest, r_buffer) }
+    spin { IO.splice_to_eof(r_buffer, conn) }
+
+    Fiber.current.await_all_children
+  end
+rescue SystemCallError
+  dest.close rescue nil
+  # ignore
+end
+
+puts "Serving TCP proxy on port 4321..."
+TCPServer.new('127.0.0.1', 4321).accept_loop { |c| handle_client(c) }

data/examples/pipes/tee.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony'
+
+chunk_size = 1 << 16
+file_path = ARGV[0]
+
+File.open(file_path, 'w+') do |f|
+  loop do
+    len = IO.tee(STDIN, STDOUT, chunk_size)
+    break if len == 0
+    IO.splice(STDIN, f, len)
+  end
+end

data/ext/polyphony/backend_common.c

@@ -140,7 +140,9 @@ inline void backend_base_unpark_fiber(struct Backend_base *base, VALUE fiber) {
 inline void backend_trace(struct Backend_base *base, int argc, VALUE *argv) {
   if (base->trace_proc == Qnil || base->in_trace_proc) return;
 
+  base->in_trace_proc = 1;
   rb_funcallv(base->trace_proc, ID_call, argc, argv);
+  base->in_trace_proc = 0;
 }
 
 #ifdef POLYPHONY_USE_PIDFD_OPEN
@@ -416,13 +418,13 @@ VALUE Backend_stats(VALUE self) {
   struct backend_stats backend_stats = backend_get_stats(self);
 
   VALUE stats = rb_hash_new();
-  rb_hash_aset(stats, SYM_runqueue_size, INT2NUM(backend_stats.runqueue_size));
-  rb_hash_aset(stats, SYM_runqueue_length, INT2NUM(backend_stats.runqueue_length));
-  rb_hash_aset(stats, SYM_runqueue_max_length, INT2NUM(backend_stats.runqueue_max_length));
-  rb_hash_aset(stats, SYM_op_count, INT2NUM(backend_stats.op_count));
-  rb_hash_aset(stats, SYM_switch_count, INT2NUM(backend_stats.switch_count));
-  rb_hash_aset(stats, SYM_poll_count, INT2NUM(backend_stats.poll_count));
-  rb_hash_aset(stats, SYM_pending_ops, INT2NUM(backend_stats.pending_ops));
+  rb_hash_aset(stats, SYM_runqueue_size, INT2FIX(backend_stats.runqueue_size));
+  rb_hash_aset(stats, SYM_runqueue_length, INT2FIX(backend_stats.runqueue_length));
+  rb_hash_aset(stats, SYM_runqueue_max_length, INT2FIX(backend_stats.runqueue_max_length));
+  rb_hash_aset(stats, SYM_op_count, INT2FIX(backend_stats.op_count));
+  rb_hash_aset(stats, SYM_switch_count, INT2FIX(backend_stats.switch_count));
+  rb_hash_aset(stats, SYM_poll_count, INT2FIX(backend_stats.poll_count));
+  rb_hash_aset(stats, SYM_pending_ops, INT2FIX(backend_stats.pending_ops));
   RB_GC_GUARD(stats);
   return stats;
 }

data/ext/polyphony/backend_io_uring.c

@@ -364,7 +364,7 @@ VALUE Backend_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_eof,
   int fd;
   rb_io_t *fptr;
   struct io_buffer buffer = get_io_buffer(str);
-  long buf_pos = NUM2INT(pos);
+  long buf_pos = FIX2INT(pos);
   int shrinkable_string = 0;
   int expandable_buffer = 0;
   long total = 0;
@@ -456,7 +456,7 @@ VALUE Backend_read_loop(VALUE self, VALUE io, VALUE maxlen) {
   rb_io_t *fptr;
   VALUE str;
   long total;
-  long len = NUM2INT(maxlen);
+  long len = FIX2INT(maxlen);
   int shrinkable;
   char *buf;
 
@@ -584,7 +584,7 @@ VALUE Backend_write(VALUE self, VALUE io, VALUE str) {
     }
   }
 
-  return INT2NUM(buffer.len);
+  return INT2FIX(buffer.len);
 }
 
 VALUE Backend_writev(VALUE self, VALUE io, int argc, VALUE *argv) {
@@ -652,7 +652,7 @@ VALUE Backend_writev(VALUE self, VALUE io, int argc, VALUE *argv) {
   }
 
   free(iov);
-  return INT2NUM(total_written);
+  return INT2FIX(total_written);
 }
 
 VALUE Backend_write_m(int argc, VALUE *argv, VALUE self) {
@@ -669,7 +669,7 @@ VALUE Backend_recv(VALUE self, VALUE io, VALUE str, VALUE length, VALUE pos) {
   int fd;
   rb_io_t *fptr;
   struct io_buffer buffer = get_io_buffer(str);
-  long buf_pos = NUM2INT(pos);
+  long buf_pos = FIX2INT(pos);
   int shrinkable_string = 0;
   int expandable_buffer = 0;
   long total = 0;
@@ -742,7 +742,7 @@ VALUE Backend_recv_loop(VALUE self, VALUE io, VALUE maxlen) {
   rb_io_t *fptr;
   VALUE str;
   long total;
-  long len = NUM2INT(maxlen);
+  long len = FIX2INT(maxlen);
   int shrinkable;
   char *buf;
 
@@ -838,7 +838,7 @@ VALUE Backend_send(VALUE self, VALUE io, VALUE str, VALUE flags) {
 
   struct io_buffer buffer = get_io_buffer(str);
   long left = buffer.len;
-  int flags_int = NUM2INT(flags);
+  int flags_int = FIX2INT(flags);
 
   GetBackend(self, backend);
   fd = fd_from_io(io, &fptr, 1, 0);
@@ -869,7 +869,7 @@ VALUE Backend_send(VALUE self, VALUE io, VALUE str, VALUE flags) {
     }
   }
 
-  return INT2NUM(buffer.len);
+  return INT2FIX(buffer.len);
 }
 
 VALUE io_uring_backend_accept(Backend_t *backend, VALUE server_socket, VALUE socket_class, int loop) {
@@ -954,7 +954,7 @@ VALUE io_uring_backend_splice(Backend_t *backend, VALUE src, VALUE dest, VALUE m
     int result;
     int completed;
 
-    io_uring_prep_splice(sqe, src_fd, -1, dest_fd, -1, NUM2INT(maxlen), 0);
+    io_uring_prep_splice(sqe, src_fd, -1, dest_fd, -1, FIX2INT(maxlen), 0);
 
     result = io_uring_backend_defer_submit_and_await(backend, sqe, ctx, &resume_value);
     completed = context_store_release(&backend->store, ctx);
@@ -965,7 +965,7 @@ VALUE io_uring_backend_splice(Backend_t *backend, VALUE src, VALUE dest, VALUE m
       rb_syserr_fail(-result, strerror(-result));
 
     total += result;
-    if (result == 0 || !loop) return INT2NUM(total);
+    if (result == 0 || !loop) return INT2FIX(total);
   }
 
   RB_GC_GUARD(resume_value);
@@ -984,6 +984,112 @@ VALUE Backend_splice_to_eof(VALUE self, VALUE src, VALUE dest, VALUE chunksize)
   return io_uring_backend_splice(backend, src, dest, chunksize, 1);
 }
 
+struct double_splice_ctx {
+  Backend_t *backend;
+  VALUE src;
+  VALUE dest;
+  int pipefd[2];
+};
+
+#define DOUBLE_SPLICE_MAXLEN (1 << 16)
+
+static inline op_context_t *prepare_double_splice_ctx(Backend_t *backend, int src_fd, int dest_fd) {
+  op_context_t *ctx = context_store_acquire(&backend->store, OP_SPLICE);
+  struct io_uring_sqe *sqe = io_uring_backend_get_sqe(backend);
+  io_uring_prep_splice(sqe, src_fd, -1, dest_fd, -1, DOUBLE_SPLICE_MAXLEN, 0);
+  io_uring_sqe_set_data(sqe, ctx);
+  io_uring_sqe_set_flags(sqe, IOSQE_ASYNC);
+  backend->base.op_count += 1;
+  backend->pending_sqes += 1;
+
+  return ctx;
+}
+
+static inline void io_uring_backend_cancel(Backend_t *backend, op_context_t *ctx) {
+  struct io_uring_sqe *sqe = io_uring_backend_get_sqe(backend);
+  ctx->result = -ECANCELED;
+  io_uring_prep_cancel(sqe, (__u64)ctx, 0);
+}
+
+VALUE double_splice_to_eof_safe(struct double_splice_ctx *ctx) {
+  int src_fd;
+  int dest_fd;
+  rb_io_t *src_fptr;
+  rb_io_t *dest_fptr;
+  int total = 0;
+  VALUE resume_value = Qnil;
+
+  src_fd = fd_from_io(ctx->src, &src_fptr, 0, 0);
+  dest_fd = fd_from_io(ctx->dest, &dest_fptr, 1, 0);
+
+  op_context_t *ctx_src = prepare_double_splice_ctx(ctx->backend, src_fd, ctx->pipefd[1]);
+  op_context_t *ctx_dest = prepare_double_splice_ctx(ctx->backend, ctx->pipefd[0], dest_fd);
+
+  if (ctx->backend->pending_sqes >= ctx->backend->prepared_limit)
+    io_uring_backend_immediate_submit(ctx->backend);
+
+  while (1) {
+    resume_value = backend_await((struct Backend_base *)ctx->backend);
+
+    if ((ctx_src && ctx_src->ref_count == 2 && ctx_dest && ctx_dest->ref_count == 2) || TEST_EXCEPTION(resume_value)) {
+      if (ctx_src) {
+        context_store_release(&ctx->backend->store, ctx_src);
+        io_uring_backend_cancel(ctx->backend, ctx_src);
+      }
+      if (ctx_dest) {
+        context_store_release(&ctx->backend->store, ctx_dest);
+        io_uring_backend_cancel(ctx->backend, ctx_dest);
+      }
+      io_uring_backend_immediate_submit(ctx->backend);
+      RAISE_IF_EXCEPTION(resume_value);
+      return resume_value;
+    }
+
+    if (ctx_src && ctx_src->ref_count == 1) {
+      context_store_release(&ctx->backend->store, ctx_src);
+      if (ctx_src->result == 0) {
+        // close write end of pipe
+        close(ctx->pipefd[1]);
+        ctx_src = NULL;
+      }
+      else {
+        ctx_src = prepare_double_splice_ctx(ctx->backend, src_fd, ctx->pipefd[1]);
+      }
+    }
+    if (ctx_dest && ctx_dest->ref_count == 1) {
+      context_store_release(&ctx->backend->store, ctx_dest);
+      if (ctx_dest->result == 0)
+        break;
+      else {
+        total += ctx_dest->result;
+        ctx_dest = prepare_double_splice_ctx(ctx->backend, ctx->pipefd[0], dest_fd);
+      }
+    }
+
+    if (ctx->backend->pending_sqes >= ctx->backend->prepared_limit)
+      io_uring_backend_immediate_submit(ctx->backend);
+  }
+  RB_GC_GUARD(resume_value);
+  return INT2FIX(total);
+}
+
+VALUE double_splice_to_eof_cleanup(struct double_splice_ctx *ctx) {
+  if (ctx->pipefd[0]) close(ctx->pipefd[0]);
+  if (ctx->pipefd[1]) close(ctx->pipefd[1]);
+  return Qnil;
+}
+
+VALUE Backend_double_splice_to_eof(VALUE self, VALUE src, VALUE dest) {
+  struct double_splice_ctx ctx = { NULL, src, dest, 0, 0 };
+  GetBackend(self, ctx.backend);
+  if (pipe(ctx.pipefd) == -1) rb_syserr_fail(errno, strerror(errno));
+
+  return rb_ensure(
+    SAFE(double_splice_to_eof_safe), (VALUE)&ctx,
+    SAFE(double_splice_to_eof_cleanup), (VALUE)&ctx
+  );
+}
+
 VALUE Backend_tee(VALUE self, VALUE src, VALUE dest, VALUE maxlen) {
   Backend_t *backend;
   GetBackend(self, backend);
@@ -1003,7 +1109,7 @@ VALUE Backend_tee(VALUE self, VALUE src, VALUE dest, VALUE maxlen) {
     int result;
     int completed;
 
-    io_uring_prep_tee(sqe, src_fd, dest_fd, NUM2INT(maxlen), 0);
+    io_uring_prep_tee(sqe, src_fd, dest_fd, FIX2INT(maxlen), 0);
 
     result = io_uring_backend_defer_submit_and_await(backend, sqe, ctx, &resume_value);
     completed = context_store_release(&backend->store, ctx);
@@ -1013,7 +1119,7 @@ VALUE Backend_tee(VALUE self, VALUE src, VALUE dest, VALUE maxlen) {
     if (result < 0)
       rb_syserr_fail(-result, strerror(-result));
 
-    return INT2NUM(result);
+    return INT2FIX(result);
   }
 
   RB_GC_GUARD(resume_value);
@@ -1222,7 +1328,7 @@ VALUE Backend_timeout(int argc, VALUE *argv, VALUE self) {
 }
 
 VALUE Backend_waitpid(VALUE self, VALUE pid) {
-  int pid_int = NUM2INT(pid);
+  int pid_int = FIX2INT(pid);
   int fd = pidfd_open(pid_int, 0);
   int status;
   pid_t ret;
@@ -1246,7 +1352,7 @@ VALUE Backend_waitpid(VALUE self, VALUE pid) {
     else
       rb_syserr_fail(e, strerror(e));
   }
-  return rb_ary_new_from_args(2, INT2NUM(ret), INT2NUM(WEXITSTATUS(status)));
+  return rb_ary_new_from_args(2, INT2FIX(ret), INT2FIX(WEXITSTATUS(status)));
 }
 
 /*
@@ -1324,7 +1430,7 @@ struct io_uring_sqe *Backend_chain_prepare_send(Backend_t *backend, VALUE io, VA
   fd = fd_from_io(io, &fptr, 1, 0);
 
   sqe = io_uring_backend_get_sqe(backend);
-  io_uring_prep_send(sqe, fd, StringValuePtr(str), RSTRING_LEN(str), NUM2INT(flags));
+  io_uring_prep_send(sqe, fd, StringValuePtr(str), RSTRING_LEN(str), FIX2INT(flags));
   return sqe;
 }
 
@@ -1338,7 +1444,7 @@ struct io_uring_sqe *Backend_chain_prepare_splice(Backend_t *backend, VALUE src,
   src_fd = fd_from_io(src, &src_fptr, 0, 0);
   dest_fd = fd_from_io(dest, &dest_fptr, 1, 0);
   sqe = io_uring_backend_get_sqe(backend);
-  io_uring_prep_splice(sqe, src_fd, -1, dest_fd, -1, NUM2INT(maxlen), 0);
+  io_uring_prep_splice(sqe, src_fd, -1, dest_fd, -1, FIX2INT(maxlen), 0);
   return sqe;
 }
 
@@ -1434,7 +1540,7 @@ VALUE Backend_chain(int argc,VALUE *argv, VALUE self) {
   }
 
   RB_GC_GUARD(resume_value);
-  return INT2NUM(result);
+  return INT2FIX(result);
 }
 
 VALUE Backend_idle_gc_period_set(VALUE self, VALUE period) {
@@ -1540,7 +1646,7 @@ VALUE Backend_splice_chunks(VALUE self, VALUE src, VALUE dest, VALUE prefix, VAL
   src_fd = fd_from_io(src, &src_fptr, 0, 0);
   dest_fd = fd_from_io(dest, &dest_fptr, 1, 0);
 
-  maxlen = NUM2INT(chunk_size);
+  maxlen = FIX2INT(chunk_size);
 
   if (pipe(pipefd) == -1) {
     err = errno;
@@ -1566,7 +1672,7 @@ VALUE Backend_splice_chunks(VALUE self, VALUE src, VALUE dest, VALUE prefix, VAL
     if (chunk_len == 0) break;
 
     total += chunk_len;
-    chunk_len_value = INT2NUM(chunk_len);
+    chunk_len_value = INT2FIX(chunk_len);
 
 
     if (chunk_prefix != Qnil) {
@@ -1605,7 +1711,7 @@ VALUE Backend_splice_chunks(VALUE self, VALUE src, VALUE dest, VALUE prefix, VAL
   RB_GC_GUARD(switchpoint_result);
   if (pipefd[0] != -1) close(pipefd[0]);
   if (pipefd[1] != -1) close(pipefd[1]);
-  return INT2NUM(total);
+  return INT2FIX(total);
 syscallerror:
   if (pipefd[0] != -1) close(pipefd[0]);
   if (pipefd[1] != -1) close(pipefd[1]);
@@ -1693,9 +1799,12 @@ void Init_Backend() {
   rb_define_method(cBackend, "send", Backend_send, 3);
   rb_define_method(cBackend, "sendv", Backend_sendv, 3);
   rb_define_method(cBackend, "sleep", Backend_sleep, 1);
+
   rb_define_method(cBackend, "splice", Backend_splice, 3);
   rb_define_method(cBackend, "splice_to_eof", Backend_splice_to_eof, 3);
+  rb_define_method(cBackend, "double_splice_to_eof", Backend_double_splice_to_eof, 2);
   rb_define_method(cBackend, "tee", Backend_tee, 3);
+
   rb_define_method(cBackend, "timeout", Backend_timeout, -1);
   rb_define_method(cBackend, "timer_loop", Backend_timer_loop, 1);
   rb_define_method(cBackend, "wait_event", Backend_wait_event, 1);

data/ext/polyphony/backend_libev.c

@@ -291,7 +291,7 @@ VALUE Backend_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_eof,
   rb_io_t *fptr;
 
   struct io_buffer buffer = get_io_buffer(str);
-  long buf_pos = NUM2INT(pos);
+  long buf_pos = FIX2INT(pos);
   int shrinkable_string = 0;
   int expandable_buffer = 0;
   long total = 0;
@@ -389,7 +389,7 @@ VALUE Backend_read_loop(VALUE self, VALUE io, VALUE maxlen) {
   rb_io_t *fptr;
   VALUE str;
   long total;
-  long len = NUM2INT(maxlen);
+  long len = FIX2INT(maxlen);
   int shrinkable;
   char *buf;
   VALUE switchpoint_result = Qnil;
@@ -519,7 +519,7 @@ VALUE Backend_write(VALUE self, VALUE io, VALUE str) {
   RB_GC_GUARD(watcher.fiber);
   RB_GC_GUARD(switchpoint_result);
 
-  return INT2NUM(buffer.len);
+  return INT2FIX(buffer.len);
 error:
   return RAISE_EXCEPTION(switchpoint_result);
 }
@@ -590,7 +590,7 @@ VALUE Backend_writev(VALUE self, VALUE io, int argc, VALUE *argv) {
   RB_GC_GUARD(switchpoint_result);
 
   free(iov);
-  return INT2NUM(total_written);
+  return INT2FIX(total_written);
 error:
   free(iov);
   return RAISE_EXCEPTION(switchpoint_result);
@@ -763,7 +763,7 @@ VALUE Backend_send(VALUE self, VALUE io, VALUE str, VALUE flags) {
 
   struct io_buffer buffer = get_io_buffer(str);
   long left = buffer.len;
-  int flags_int = NUM2INT(flags);
+  int flags_int = FIX2INT(flags);
 
   GetBackend(self, backend);
   fd = fd_from_io(io, &fptr, 1, 0);
@@ -795,7 +795,7 @@ VALUE Backend_send(VALUE self, VALUE io, VALUE str, VALUE flags) {
   RB_GC_GUARD(watcher.fiber);
   RB_GC_GUARD(switchpoint_result);
 
-  return INT2NUM(buffer.len);
+  return INT2FIX(buffer.len);
 error:
   return RAISE_EXCEPTION(switchpoint_result);
 }
@@ -868,7 +868,7 @@ VALUE Backend_splice(VALUE self, VALUE src, VALUE dest, VALUE maxlen) {
 
   while (1) {
     backend->base.op_count++;
-    len = splice(src_fd, 0, dest_fd, 0, NUM2INT(maxlen), 0);
+    len = splice(src_fd, 0, dest_fd, 0, FIX2INT(maxlen), 0);
     if (len < 0) {
       int e = errno;
       if ((e != EWOULDBLOCK && e != EAGAIN)) rb_syserr_fail(e, strerror(e));
@@ -889,7 +889,7 @@ VALUE Backend_splice(VALUE self, VALUE src, VALUE dest, VALUE maxlen) {
   RB_GC_GUARD(watcher.ctx.fiber);
   RB_GC_GUARD(switchpoint_result);
 
-  return INT2NUM(len);
+  return INT2FIX(len);
 error:
   return RAISE_EXCEPTION(switchpoint_result);
 }
@@ -912,7 +912,7 @@ VALUE Backend_splice_to_eof(VALUE self, VALUE src, VALUE dest, VALUE maxlen) {
 
   while (1) {
     backend->base.op_count++;
-    len = splice(src_fd, 0, dest_fd, 0, NUM2INT(maxlen), 0);
+    len = splice(src_fd, 0, dest_fd, 0, FIX2INT(maxlen), 0);
     if (len < 0) {
       int e = errno;
       if ((e != EWOULDBLOCK && e != EAGAIN)) rb_syserr_fail(e, strerror(e));
@@ -936,7 +936,7 @@ VALUE Backend_splice_to_eof(VALUE self, VALUE src, VALUE dest, VALUE maxlen) {
   RB_GC_GUARD(watcher.ctx.fiber);
   RB_GC_GUARD(switchpoint_result);
 
-  return INT2NUM(total);
+  return INT2FIX(total);
 error:
   return RAISE_EXCEPTION(switchpoint_result);
 }
@@ -958,7 +958,7 @@ VALUE Backend_tee(VALUE self, VALUE src, VALUE dest, VALUE maxlen) {
 
   while (1) {
     backend->base.op_count++;
-    len = tee(src_fd, dest_fd, NUM2INT(maxlen), 0);
+    len = tee(src_fd, dest_fd, FIX2INT(maxlen), 0);
     if (len < 0) {
       int e = errno;
       if ((e != EWOULDBLOCK && e != EAGAIN)) rb_syserr_fail(e, strerror(e));
@@ -979,7 +979,7 @@ VALUE Backend_tee(VALUE self, VALUE src, VALUE dest, VALUE maxlen) {
   RB_GC_GUARD(watcher.ctx.fiber);
   RB_GC_GUARD(switchpoint_result);
 
-  return INT2NUM(len);
+  return INT2FIX(len);
 error:
   return RAISE_EXCEPTION(switchpoint_result);
 }
@@ -994,7 +994,7 @@ VALUE Backend_splice(VALUE self, VALUE src, VALUE dest, VALUE maxlen) {
   int dest_fd;
   rb_io_t *src_fptr;
   rb_io_t *dest_fptr;
-  int len = NUM2INT(maxlen);
+  int len = FIX2INT(maxlen);
   VALUE str = rb_str_new(0, len);
   char *buf = RSTRING_PTR(str);
   int left = 0;
@@ -1047,7 +1047,7 @@ VALUE Backend_splice(VALUE self, VALUE src, VALUE dest, VALUE maxlen) {
   RB_GC_GUARD(switchpoint_result);
   RB_GC_GUARD(str);
 
-  return INT2NUM(total);
+  return INT2FIX(total);
 error:
   return RAISE_EXCEPTION(switchpoint_result);
 }
@@ -1060,7 +1060,7 @@ VALUE Backend_splice_to_eof(VALUE self, VALUE src, VALUE dest, VALUE maxlen) {
   int dest_fd;
   rb_io_t *src_fptr;
   rb_io_t *dest_fptr;
-  int len = NUM2INT(maxlen);
+  int len = FIX2INT(maxlen);
   VALUE str = rb_str_new(0, len);
   char *buf = RSTRING_PTR(str);
   int left = 0;
@@ -1118,7 +1118,7 @@ done:
   RB_GC_GUARD(switchpoint_result);
   RB_GC_GUARD(str);
 
-  return INT2NUM(total);
+  return INT2FIX(total);
 error:
   return RAISE_EXCEPTION(switchpoint_result);
 }
@@ -1263,7 +1263,7 @@ VALUE Backend_timeout(int argc,VALUE *argv, VALUE self) {
 
 #ifdef POLYPHONY_USE_PIDFD_OPEN
 VALUE Backend_waitpid(VALUE self, VALUE pid) {
-  int pid_int = NUM2INT(pid);
+  int pid_int = FIX2INT(pid);
   int fd = pidfd_open(pid_int, 0);
   if (fd >= 0) {
     Backend_t *backend;
@@ -1286,7 +1286,7 @@ VALUE Backend_waitpid(VALUE self, VALUE pid) {
     int e = errno;
     rb_syserr_fail(e, strerror(e));
   }
-  return rb_ary_new_from_args(2, INT2NUM(ret), INT2NUM(WEXITSTATUS(status)));
+  return rb_ary_new_from_args(2, INT2FIX(ret), INT2FIX(WEXITSTATUS(status)));
 }
 #else
 struct libev_child {
@@ -1299,7 +1299,7 @@ void Backend_child_callback(EV_P_ ev_child *w, int revents) {
   int exit_status = WEXITSTATUS(w->rstatus);
   VALUE status;
 
-  status = rb_ary_new_from_args(2, INT2NUM(w->rpid), INT2NUM(exit_status));
+  status = rb_ary_new_from_args(2, INT2FIX(w->rpid), INT2FIX(exit_status));
   Fiber_make_runnable(watcher->fiber, status);
 }
 
@@ -1310,7 +1310,7 @@ VALUE Backend_waitpid(VALUE self, VALUE pid) {
   GetBackend(self, backend);
 
   watcher.fiber = rb_fiber_current();
-  ev_child_init(&watcher.child, Backend_child_callback, NUM2INT(pid), 0);
+  ev_child_init(&watcher.child, Backend_child_callback, FIX2INT(pid), 0);
   ev_child_start(backend->ev_loop, &watcher.child);
   backend->base.op_count++;
 
@@ -1491,7 +1491,7 @@ VALUE Backend_splice_chunks(VALUE self, VALUE src, VALUE dest, VALUE prefix, VAL
 
   struct libev_rw_io watcher;
   watcher.ctx.fiber = Qnil;
-  int maxlen = NUM2INT(chunk_size);
+  int maxlen = FIX2INT(chunk_size);
   VALUE str = Qnil;
   VALUE chunk_len_value = Qnil;
 
@@ -1515,7 +1515,7 @@ VALUE Backend_splice_chunks(VALUE self, VALUE src, VALUE dest, VALUE prefix, VAL
     if (chunk_len == 0) break;
 
     total += chunk_len;
-    chunk_len_value = INT2NUM(chunk_len);
+    chunk_len_value = INT2FIX(chunk_len);
 
     if (chunk_prefix != Qnil) {
       VALUE str = (TYPE(chunk_prefix) == T_STRING) ? chunk_prefix : rb_funcall(chunk_prefix, ID_call, 1, chunk_len_value);
@@ -1553,7 +1553,7 @@ VALUE Backend_splice_chunks(VALUE self, VALUE src, VALUE dest, VALUE prefix, VAL
   RB_GC_GUARD(result);
   if (pipefd[0] != -1) close(pipefd[0]);
   if (pipefd[1] != -1) close(pipefd[1]);
-  return INT2NUM(total);
+  return INT2FIX(total);
 syscallerror:
   if (pipefd[0] != -1) close(pipefd[0]);
   if (pipefd[1] != -1) close(pipefd[1]);

data/ext/polyphony/io_extensions.c

@@ -502,7 +502,6 @@ static inline VALUE z_stream_cleanup(struct z_stream_ctx *ctx) {
   return Qnil;
 }
 
-#define SAFE(f) (VALUE (*)(VALUE))(f)
 #define Z_STREAM_SAFE_IO_LOOP_WITH_CLEANUP(ctx) \
   rb_ensure(SAFE(z_stream_io_loop), (VALUE)&ctx, SAFE(z_stream_cleanup), (VALUE)&ctx)
 

data/ext/polyphony/polyphony.c

@@ -94,6 +94,12 @@ VALUE Polyphony_backend_splice_to_eof(VALUE self, VALUE src, VALUE dest, VALUE c
   return Backend_splice_to_eof(BACKEND(), src, dest, chunksize);
 }
 
+#ifdef POLYPHONY_BACKEND_LIBURING
+VALUE Polyphony_backend_double_splice_to_eof(VALUE self, VALUE src, VALUE dest) {
+  return Backend_double_splice_to_eof(BACKEND(), src, dest);
+}
+#endif
+
 #ifdef POLYPHONY_LINUX
 VALUE Polyphony_backend_tee(VALUE self, VALUE src, VALUE dest, VALUE chunksize) {
   return Backend_tee(BACKEND(), src, dest, chunksize);
@@ -126,7 +132,7 @@ VALUE Polyphony_backend_write(int argc, VALUE *argv, VALUE self) {
 
 VALUE Polyphony_with_raw_buffer(VALUE self, VALUE size) {
   struct raw_buffer buffer;
-  buffer.len = NUM2INT(size);
+  buffer.len = FIX2INT(size);
   buffer.ptr = malloc(buffer.len);
   if (!buffer.ptr)
     rb_raise(rb_eRuntimeError, "Failed to allocate buffer");
@@ -187,6 +193,10 @@ void Init_Polyphony() {
   rb_define_singleton_method(mPolyphony, "backend_splice", Polyphony_backend_splice, 3);
   rb_define_singleton_method(mPolyphony, "backend_splice_to_eof", Polyphony_backend_splice_to_eof, 3);
  
+  #ifdef POLYPHONY_BACKEND_LIBURING
+  rb_define_singleton_method(mPolyphony, "backend_double_splice_to_eof", Polyphony_backend_double_splice_to_eof, 2);
+  #endif
+
   #ifdef POLYPHONY_LINUX
   rb_define_singleton_method(mPolyphony, "backend_tee", Polyphony_backend_tee, 3);
   #endif

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.90'
+  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/
     

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.90'
+  version: '0.91'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-21 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