polyphony 0.91 → 0.92

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1b4a68e893c4cdca8e308cf3297fbf2549f70c0a7038f7c492f5c7c0a6ca6b4
-  data.tar.gz: 65a1cd1b10fa1a29c37c24972c0a47c324f744ff0ddba6e67464000da2a2707e
+  metadata.gz: 73f54eb3c5d34b89d6f24b7e66ba330e6d5345fb94a59f5f6c29efa9d6f6c695
+  data.tar.gz: 03ceb137c92d641d90daea57fc40eeababc86996c0f50df5e4c5246b79e134fc
 SHA512:
-  metadata.gz: 316969779f3e2ce5a055c886ee89448b1908e57dcfb06775f5aa01491e895b450cfdaa3ec3d1f72f3a59017326dd7c3478b21e85cb7914a8bf2c17544bd47de7
-  data.tar.gz: 0a5badc5927cac1b111a13dd65eac242e2c2a7436dbf9a42e2376c4b321d042e27012e7d6b3906bf1d434d62a85bbfa8651700f2d4585475cbf89bc52de64569
+  metadata.gz: cd04383a8ec148ac7c8d79d9d2ba3cd3d53c4eeb459a0bf91d8aa6b5e97523a7a414dac8ca79d81f0182f6be3db741f7eac0d6eb4f9f405f568fea61c0b5ce5e
+  data.tar.gz: bd4fe45c1bc1a014f0c395580f2975e7273f621f43979fa6a59cefd64388ce371631846b29e30589928071532ddebfa5e0c4cbbb9c2fb57bd384648b092d1621

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.92 2022-04-04
+
+- Fix plice on non-Linux OS
+- Integrate functionality of `IO.splice_to_eof` into `IO.splice` (#87)
+
 ## 0.91 2022-03-23
 
 - Add pipe examples

data/Gemfile.lock

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

data/examples/io/splice_echo_server.rb

@@ -7,8 +7,8 @@ require 'polyphony'
 
 def handle_echo_client(conn)
   buffer = Polyphony.pipe
-  spin { buffer.splice_to_eof_from(conn) }
-  spin { conn.splice_to_eof_from(buffer) }
+  spin { buffer.splice_from(conn, -1000) }
+  spin { conn.splice_from(buffer, -1000) }
 end
 
 puts "Serving echo on port 1234..."

data/examples/io/tcp_proxy.rb

@@ -15,7 +15,7 @@ f1 = spin {
   client1 = server1.accept
   loop do
     if client2
-      Thread.current.backend.splice_to_eof(client1, client2)
+      Thread.current.backend.splice(client1, client2, -1000)
     end
   end
 }
@@ -24,7 +24,7 @@ f2 = spin {
   client2 = server2.accept
   loop do
     if client1
-      Thread.current.backend.splice_to_eof(client2, client1)
+      Thread.current.backend.splice(client2, client1, -1000)
     end
   end
 }

data/examples/pipes/echo_server.rb

@@ -5,12 +5,15 @@ require 'polyphony'
 
 def handle_client(conn)
   spin do
-    buffer = Polyphony.pipe
-    spin { IO.splice_to_eof(conn, buffer) }
-    IO.splice_to_eof(buffer, conn)
+    IO.double_splice(conn, conn)
+    # buffer = Polyphony.pipe
+    # spin { IO.splice(conn, buffer, -1000) }
+    # IO.splice(buffer, conn, -1000)
+  rescue SystemCallError
+    # ignore
+  ensure
+    conn.close rescue nil
   end
-rescue SystemCallError
-  # ignore
 end
 
 puts "Serving echo on port 1234..."

data/examples/pipes/tcp_proxy.rb

@@ -8,21 +8,33 @@ DESTINATION = ['127.0.0.1', 1234]
 def handle_client(conn)
   spin do
     dest = TCPSocket.new(*DESTINATION)
-    w_buffer = Polyphony.pipe
-    r_buffer = Polyphony.pipe
+    # 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(conn, w_buffer, -1000) }
+    # spin { IO.splice(w_buffer, dest, -1000) }
 
-    spin { IO.splice_to_eof(dest, r_buffer) }
-    spin { IO.splice_to_eof(r_buffer, conn) }
+    # spin { IO.splice(dest, r_buffer, -1000) }
+    # spin { IO.splice(r_buffer, conn, -1000) }
 
-    Fiber.current.await_all_children
+    # Fiber.current.await_all_children
+
+    f = spin do
+      IO.double_splice(conn, dest)
+      raise EOFError
+    end
+    IO.double_splice(dest, conn)
+    f.await
+  rescue EOFError, SystemCallError
+    # ignore
+  ensure
+    conn.close rescue nil
+    dest.close rescue nil
   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) }
+server = TCPServer.new('127.0.0.1', 4321)
+while (conn = server.accept)
+  handle_client(conn)
+end

data/ext/polyphony/backend_io_uring.c

@@ -937,13 +937,15 @@ VALUE Backend_accept_loop(VALUE self, VALUE server_socket, VALUE socket_class) {
   return self;
 }
 
-VALUE io_uring_backend_splice(Backend_t *backend, VALUE src, VALUE dest, VALUE maxlen, int loop) {
+VALUE io_uring_backend_splice(Backend_t *backend, VALUE src, VALUE dest, int maxlen) {
   int src_fd;
   int dest_fd;
   rb_io_t *src_fptr;
   rb_io_t *dest_fptr;
   int total = 0;
   VALUE resume_value = Qnil;
+  int splice_to_eof = maxlen < 0;
+  if (splice_to_eof) maxlen = -maxlen;
 
   src_fd = fd_from_io(src, &src_fptr, 0, 0);
   dest_fd = fd_from_io(dest, &dest_fptr, 1, 0);
@@ -954,7 +956,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, FIX2INT(maxlen), 0);
+    io_uring_prep_splice(sqe, src_fd, -1, dest_fd, -1, maxlen, 0);
 
     result = io_uring_backend_defer_submit_and_await(backend, sqe, ctx, &resume_value);
     completed = context_store_release(&backend->store, ctx);
@@ -965,7 +967,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 INT2FIX(total);
+    if (!result || !splice_to_eof) return INT2FIX(total);
   }
 
   RB_GC_GUARD(resume_value);
@@ -974,14 +976,7 @@ VALUE io_uring_backend_splice(Backend_t *backend, VALUE src, VALUE dest, VALUE m
 VALUE Backend_splice(VALUE self, VALUE src, VALUE dest, VALUE maxlen) {
   Backend_t *backend;
   GetBackend(self, backend);
-  return io_uring_backend_splice(backend, src, dest, maxlen, 0);
-}
-
-VALUE Backend_splice_to_eof(VALUE self, VALUE src, VALUE dest, VALUE chunksize) {
-  Backend_t *backend;
-  GetBackend(self, backend);
-
-  return io_uring_backend_splice(backend, src, dest, chunksize, 1);
+  return io_uring_backend_splice(backend, src, dest, FIX2INT(maxlen));
 }
 
 struct double_splice_ctx {
@@ -1011,7 +1006,7 @@ static inline void io_uring_backend_cancel(Backend_t *backend, op_context_t *ctx
   io_uring_prep_cancel(sqe, (__u64)ctx, 0);
 }
 
-VALUE double_splice_to_eof_safe(struct double_splice_ctx *ctx) {
+VALUE double_splice_safe(struct double_splice_ctx *ctx) {
   int src_fd;
   int dest_fd;
   rb_io_t *src_fptr;
@@ -1073,20 +1068,20 @@ VALUE double_splice_to_eof_safe(struct double_splice_ctx *ctx) {
   return INT2FIX(total);
 }
 
-VALUE double_splice_to_eof_cleanup(struct double_splice_ctx *ctx) {
+VALUE double_splice_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) {
+VALUE Backend_double_splice(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
+    SAFE(double_splice_safe), (VALUE)&ctx,
+    SAFE(double_splice_cleanup), (VALUE)&ctx
   );
 }
 
@@ -1801,8 +1796,7 @@ void Init_Backend() {
   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, "double_splice", Backend_double_splice, 2);
   rb_define_method(cBackend, "tee", Backend_tee, 3);
 
   rb_define_method(cBackend, "timeout", Backend_timeout, -1);

data/ext/polyphony/backend_libev.c

@@ -860,50 +860,10 @@ VALUE Backend_splice(VALUE self, VALUE src, VALUE dest, VALUE maxlen) {
   rb_io_t *src_fptr;
   rb_io_t *dest_fptr;
   int len;
-
-  GetBackend(self, backend);
-  src_fd = fd_from_io(src, &src_fptr, 0, 0);
-  dest_fd = fd_from_io(dest, &dest_fptr, 1, 0);
-  watcher.ctx.fiber = Qnil;
-
-  while (1) {
-    backend->base.op_count++;
-    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));
-
-      switchpoint_result = libev_wait_rw_fd_with_watcher(backend, src_fd, dest_fd, &watcher);
-      if (TEST_EXCEPTION(switchpoint_result)) goto error;
-    }
-    else {
-      break;
-    }
-  }
-
-  if (watcher.ctx.fiber == Qnil) {
-    switchpoint_result = backend_snooze(&backend->base);
-    if (TEST_EXCEPTION(switchpoint_result)) goto error;
-  }
-
-  RB_GC_GUARD(watcher.ctx.fiber);
-  RB_GC_GUARD(switchpoint_result);
-
-  return INT2FIX(len);
-error:
-  return RAISE_EXCEPTION(switchpoint_result);
-}
-
-VALUE Backend_splice_to_eof(VALUE self, VALUE src, VALUE dest, VALUE maxlen) {
-  Backend_t *backend;
-  struct libev_rw_io watcher;
-  VALUE switchpoint_result = Qnil;
-  int src_fd;
-  int dest_fd;
-  rb_io_t *src_fptr;
-  rb_io_t *dest_fptr;
-  int len;
   int total = 0;
+  int maxlen_i = FIX2INT(maxlen);
+  int splice_to_eof = maxlen_i < 0;
+  if (splice_to_eof) maxlen_i = -maxlen_i;
 
   GetBackend(self, backend);
   src_fd = fd_from_io(src, &src_fptr, 0, 0);
@@ -912,7 +872,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, FIX2INT(maxlen), 0);
+    len = splice(src_fd, 0, dest_fd, 0, maxlen_i, 0);
     if (len < 0) {
       int e = errno;
       if ((e != EWOULDBLOCK && e != EAGAIN)) rb_syserr_fail(e, strerror(e));
@@ -920,11 +880,9 @@ VALUE Backend_splice_to_eof(VALUE self, VALUE src, VALUE dest, VALUE maxlen) {
       switchpoint_result = libev_wait_rw_fd_with_watcher(backend, src_fd, dest_fd, &watcher);
       if (TEST_EXCEPTION(switchpoint_result)) goto error;
     }
-    else if (len == 0) {
-      break;
-    }
     else {
       total += len;
+      if (!len || !splice_to_eof) break;
     }
   }
 
@@ -983,9 +941,7 @@ VALUE Backend_tee(VALUE self, VALUE src, VALUE dest, VALUE maxlen) {
 error:
   return RAISE_EXCEPTION(switchpoint_result);
 }
-
 #else
-
 VALUE Backend_splice(VALUE self, VALUE src, VALUE dest, VALUE maxlen) {
   Backend_t *backend;
   struct libev_io watcher;
@@ -994,77 +950,13 @@ 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 = FIX2INT(maxlen);
-  VALUE str = rb_str_new(0, len);
-  char *buf = RSTRING_PTR(str);
   int left = 0;
   int total = 0;
-
-  GetBackend(self, backend);
-  src_fd = fd_from_io(src, &src_fptr, 0, 0);
-  dest_fd = fd_from_io(dest, &dest_fptr, 1, 0);
-  watcher.fiber = Qnil;
-
-  while (1) {
-    backend->base.op_count++;
-    ssize_t n = read(src_fd, buf, len);
-    if (n < 0) {
-      int e = errno;
-      if ((e != EWOULDBLOCK && e != EAGAIN)) rb_syserr_fail(e, strerror(e));
-
-      switchpoint_result = libev_wait_fd_with_watcher(backend, src_fd, &watcher, EV_READ);
-      if (TEST_EXCEPTION(switchpoint_result)) goto error;
-    }
-    else {
-      total = left = n;
-      break;
-    }
-  }
-
-  while (left > 0) {
-    backend->base.op_count++;
-    ssize_t n = write(dest_fd, buf, left);
-    if (n < 0) {
-      int e = errno;
-      if ((e != EWOULDBLOCK && e != EAGAIN)) rb_syserr_fail(e, strerror(e));
-
-      switchpoint_result = libev_wait_fd_with_watcher(backend, dest_fd, &watcher, EV_WRITE);
-
-      if (TEST_EXCEPTION(switchpoint_result)) goto error;
-    }
-    else {
-      buf += n;
-      left -= n;
-    }
-  }
-
-  if (watcher.fiber == Qnil) {
-    switchpoint_result = backend_snooze(&backend->base);
-    if (TEST_EXCEPTION(switchpoint_result)) goto error;
-  }
-
-  RB_GC_GUARD(watcher.fiber);
-  RB_GC_GUARD(switchpoint_result);
-  RB_GC_GUARD(str);
-
-  return INT2FIX(total);
-error:
-  return RAISE_EXCEPTION(switchpoint_result);
-}
-
-VALUE Backend_splice_to_eof(VALUE self, VALUE src, VALUE dest, VALUE maxlen) {
-  Backend_t *backend;
-  struct libev_io watcher;
-  VALUE switchpoint_result = Qnil;
-  int src_fd;
-  int dest_fd;
-  rb_io_t *src_fptr;
-  rb_io_t *dest_fptr;
-  int len = FIX2INT(maxlen);
-  VALUE str = rb_str_new(0, len);
+  int maxlen_i = FIX2INT(maxlen);
+  int splice_to_eof = maxlen_i < 0;
+  if (splice_to_eof) maxlen_i = -maxlen_i;
+  VALUE str = rb_str_new(0, maxlen_i);
   char *buf = RSTRING_PTR(str);
-  int left = 0;
-  int total = 0;
 
   GetBackend(self, backend);
   src_fd = fd_from_io(src, &src_fptr, 0, 0);
@@ -1072,10 +964,10 @@ VALUE Backend_splice_to_eof(VALUE self, VALUE src, VALUE dest, VALUE maxlen) {
   watcher.fiber = Qnil;
 
   while (1) {
-    char *ptr = buf;
+    int done;
     while (1) {
       backend->base.op_count++;
-      ssize_t n = read(src_fd, ptr, len);
+      ssize_t n = read(src_fd, buf, maxlen_i);
       if (n < 0) {
         int e = errno;
         if ((e != EWOULDBLOCK && e != EAGAIN)) rb_syserr_fail(e, strerror(e));
@@ -1083,32 +975,32 @@ VALUE Backend_splice_to_eof(VALUE self, VALUE src, VALUE dest, VALUE maxlen) {
         switchpoint_result = libev_wait_fd_with_watcher(backend, src_fd, &watcher, EV_READ);
         if (TEST_EXCEPTION(switchpoint_result)) goto error;
       }
-      else if (n == 0) goto done;
       else {
-        total += n;
-        left = n;
+        total += left = n;
+        done = !n || !splice_to_eof;
         break;
       }
     }
 
     while (left > 0) {
       backend->base.op_count++;
-      ssize_t n = write(dest_fd, ptr, left);
+      ssize_t n = write(dest_fd, buf, left);
       if (n < 0) {
         int e = errno;
         if ((e != EWOULDBLOCK && e != EAGAIN)) rb_syserr_fail(e, strerror(e));
 
         switchpoint_result = libev_wait_fd_with_watcher(backend, dest_fd, &watcher, EV_WRITE);
+
         if (TEST_EXCEPTION(switchpoint_result)) goto error;
       }
       else {
-        ptr += n;
+        buf += n;
         left -= n;
       }
     }
+    if (done) break;
   }
 
-done:
   if (watcher.fiber == Qnil) {
     switchpoint_result = backend_snooze(&backend->base);
     if (TEST_EXCEPTION(switchpoint_result)) goto error;
@@ -1122,6 +1014,10 @@ done:
 error:
   return RAISE_EXCEPTION(switchpoint_result);
 }
+
+VALUE Backend_tee(VALUE self, VALUE src, VALUE dest, VALUE maxlen) {
+  return self;
+}
 #endif
 
 VALUE Backend_wait_io(VALUE self, VALUE io, VALUE write) {
@@ -1644,7 +1540,6 @@ void Init_Backend() {
   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);
   #ifdef POLYPHONY_LINUX
   rb_define_method(cBackend, "tee", Backend_tee, 3);
   #endif

data/ext/polyphony/polyphony.c

@@ -90,13 +90,9 @@ VALUE Polyphony_backend_splice(VALUE self, VALUE src, VALUE dest, VALUE maxlen)
   return Backend_splice(BACKEND(), src, dest, maxlen);
 }
 
-VALUE Polyphony_backend_splice_to_eof(VALUE self, VALUE src, VALUE dest, VALUE chunksize) {
-  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);
+VALUE Polyphony_backend_double_splice(VALUE self, VALUE src, VALUE dest) {
+  return Backend_double_splice(BACKEND(), src, dest);
 }
 #endif
 
@@ -191,10 +187,9 @@ void Init_Polyphony() {
   rb_define_singleton_method(mPolyphony, "backend_sendv", Polyphony_backend_sendv, 3);
   rb_define_singleton_method(mPolyphony, "backend_sleep", Polyphony_backend_sleep, 1);
   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);
+  rb_define_singleton_method(mPolyphony, "backend_double_splice", Polyphony_backend_double_splice, 2);
   #endif
 
   #ifdef POLYPHONY_LINUX

data/ext/polyphony/polyphony.h

@@ -115,10 +115,9 @@ VALUE Backend_send(VALUE self, VALUE io, VALUE msg, VALUE flags);
 VALUE Backend_sendv(VALUE self, VALUE io, VALUE ary, VALUE flags);
 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);
+VALUE Backend_double_splice(VALUE self, VALUE src, VALUE dest);
 #endif
 
 #ifdef POLYPHONY_LINUX

data/lib/polyphony/extensions/io.rb

@@ -78,13 +78,9 @@ class ::IO
       Polyphony.backend_splice(src, dest, maxlen)
     end
 
-    def splice_to_eof(src, dest, chunk_size = 8192)
-      Polyphony.backend_splice_to_eof(src, dest, chunk_size)
-    end
-
     if RUBY_PLATFORM =~ /linux/
-      def double_splice_to_eof(src, dest)
-        Polyphony.backend_double_splice_to_eof(src, dest)
+      def double_splice(src, dest)
+        Polyphony.backend_double_splice(src, dest)
       end
     
       def tee(src, dest, maxlen)
@@ -283,11 +279,9 @@ class ::IO
     Polyphony.backend_splice(src, self, maxlen)
   end
 
-  def splice_to_eof_from(src, chunksize = 8192)
-    Polyphony.backend_splice_to_eof(src, self, chunksize)
-  end
-
-  def tee_from(src, maxlen)
-    Polyphony.backend_tee(src, self, maxlen)
+  if RUBY_PLATFORM =~ /linux/
+    def tee_from(src, maxlen)
+      Polyphony.backend_tee(src, self, maxlen)
+    end
   end
 end

data/lib/polyphony/extensions/pipe.rb

@@ -165,11 +165,9 @@ class Polyphony::Pipe
     Polyphony.backend_splice(src, self, maxlen)
   end
 
-  def splice_to_eof_from(src, chunksize = 8192)
-    Polyphony.backend_splice_to_eof(src, self, chunksize)
-  end
-
-  def tee_from(src, maxlen)
-    Polyphony.backend_tee(src, self, maxlen)
+  if RUBY_PLATFORM =~ /linux/
+    def tee_from(src, maxlen)
+      Polyphony.backend_tee(src, self, maxlen)
+    end
   end
 end

data/lib/polyphony/version.rb

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

data/test/test_backend.rb

@@ -191,8 +191,10 @@ class BackendTest < MiniTest::Test
   Net = Polyphony::Net
 
   def test_accept
+    port = rand(1234..4321)
+
     server = Net.send(
-      :listening_socket_from_options, '127.0.0.1', 1234, reuse_addr: true
+      :listening_socket_from_options, '127.0.0.1', port, reuse_addr: true
     )
 
     clients = []
@@ -201,12 +203,12 @@ class BackendTest < MiniTest::Test
       clients << c
     end
 
-    c1 = TCPSocket.new('127.0.0.1', 1234)
+    c1 = TCPSocket.new('127.0.0.1', port)
     sleep 0.01
 
     assert_equal 1, clients.size
 
-    c2 = TCPSocket.new('127.0.0.1', 1234)
+    c2 = TCPSocket.new('127.0.0.1', port)
     sleep 0.01
 
     assert_equal 2, clients.size
@@ -220,8 +222,9 @@ class BackendTest < MiniTest::Test
   end
 
   def test_accept_loop
+    port = rand(1234..4321)
     server = Net.send(
-      :listening_socket_from_options, '127.0.0.1', 1235, reuse_addr: true
+      :listening_socket_from_options, '127.0.0.1', port, reuse_addr: true
     )
 
     clients = []
@@ -229,12 +232,12 @@ class BackendTest < MiniTest::Test
       @backend.accept_loop(server, TCPSocket) { |c| clients << c }
     end
 
-    c1 = TCPSocket.new('127.0.0.1', 1235)
+    c1 = TCPSocket.new('127.0.0.1', port)
     sleep 0.01
 
     assert_equal 1, clients.size
 
-    c2 = TCPSocket.new('127.0.0.1', 1235)
+    c2 = TCPSocket.new('127.0.0.1', port)
     sleep 0.01
 
     assert_equal 2, clients.size

data/test/test_io.rb

@@ -314,13 +314,13 @@ class IOTest < MiniTest::Test
     assert_equal 6, len
   end
 
-  def test_splice_to_eof_from
+  def test_splice_from_to_eof
     i1, o1 = IO.pipe
     i2, o2 = IO.pipe
     len = nil
 
     f = spin {
-      len = o2.splice_to_eof_from(i1, 1000)
+      len = o2.splice_from(i1, -1000)
       o2.close
     }
 
@@ -341,13 +341,13 @@ class IOTest < MiniTest::Test
     end
   end
 
-  def test_splice_to_eof_class_method
+  def test_splice_class_method_to_eof
     i1, o1 = IO.pipe
     i2, o2 = IO.pipe
     len = nil
 
     f = spin {
-      len = IO.splice_to_eof(i1, o2, 1000)
+      len = IO.splice(i1, o2, -1000)
       o2.close
     }
 
@@ -368,9 +368,9 @@ 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"
+  def test_double_splice
+    if Thread.current.backend.kind != :io_uring
+      skip "IO.double_splice available only on io_uring backend"
     end
 
     src = Polyphony.pipe
@@ -379,7 +379,7 @@ class IOTest < MiniTest::Test
     data = 'foobar' * 10
 
     f1 = spin {
-      ret = IO.double_splice_to_eof(src, dest)
+      ret = IO.double_splice(src, dest)
       dest.close
     }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: '0.91'
+  version: '0.92'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-23 00:00:00.000000000 Z
+date: 2022-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler