polyphony 1.4 → 1.5

data/ext/polyphony/backend_libev.c

@@ -42,21 +42,24 @@ thread.
 #define _GNU_SOURCE 1
 #endif
 
-#include <netdb.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
 #include <unistd.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
 #include <stdnoreturn.h>
 #include <sys/types.h>
+
+#ifdef POLYPHONY_USE_PIDFD_OPEN
 #include <sys/wait.h>
+#endif
+
 #include <fcntl.h>
 
 #include "polyphony.h"
 #include "../libev/ev.h"
 #include "ruby/io.h"
 
+#ifndef POLYPHONY_WINDOWS
+#include <sys/uio.h>
+#endif
+
 #include "../libev/ev.h"
 #include "backend_common.h"
 
@@ -267,21 +270,25 @@ VALUE libev_wait_fd(Backend_t *backend, int fd, int events, int raise_exception)
 }
 
 static inline int fd_from_io(VALUE io, rb_io_t **fptr, int write_mode, int rectify_file_pos) {
+  if (TYPE(io) == T_FIXNUM) {
+    *fptr = NULL;
+    return FIX2INT(io);
+  }
+  
   if (rb_obj_class(io) == cPipe) {
     *fptr = NULL;
     Pipe_verify_blocking_mode(io, Qfalse);
     return Pipe_get_fd(io, write_mode);
   }
-  else {
-    VALUE underlying_io = rb_ivar_get(io, ID_ivar_io);
-    if (underlying_io != Qnil) io = underlying_io;
-
-    GetOpenFile(io, *fptr);
-    int fd = rb_io_descriptor(io);
-    io_verify_blocking_mode(io, fd, Qfalse);
-    if (rectify_file_pos) rectify_io_file_pos(*fptr);
-    return fd;
-  }
+
+  VALUE underlying_io = rb_ivar_get(io, ID_ivar_io);
+  if (underlying_io != Qnil) io = underlying_io;
+
+  GetOpenFile(io, *fptr);
+  int fd = rb_io_descriptor(io);
+  io_verify_blocking_mode(io, fd, Qfalse);
+  if (rectify_file_pos) rectify_io_file_pos(*fptr);
+  return fd;
 }
 
 VALUE Backend_read(VALUE self, VALUE io, VALUE buffer, VALUE length, VALUE to_eof, VALUE pos) {
@@ -558,6 +565,7 @@ error:
   return RAISE_EXCEPTION(switchpoint_result);
 }
 
+#ifndef POLYPHONY_WINDOWS
 VALUE Backend_writev(VALUE self, VALUE io, int argc, VALUE *argv) {
   Backend_t *backend;
   struct libev_io watcher;
@@ -629,15 +637,23 @@ error:
   free(iov);
   return RAISE_EXCEPTION(switchpoint_result);
 }
+#endif
 
 VALUE Backend_write_m(int argc, VALUE *argv, VALUE self) {
   if (argc < 2)
     // TODO: raise ArgumentError
     rb_raise(rb_eRuntimeError, "(wrong number of arguments (expected 2 or more))");
 
+#ifdef POLYPHONY_WINDOWS
+  int total = 0;
+  for (int i = 1; i < argc; i++)
+    total += FIX2INT(Backend_write(self, argv[0], argv[i]));
+  return INT2FIX(total);
+#else
   return (argc == 2) ?
     Backend_write(self, argv[0], argv[1]) :
     Backend_writev(self, argv[0], argc - 1, argv + 1);
+#endif
 }
 
 VALUE Backend_accept(VALUE self, VALUE server_socket, VALUE socket_class) {
@@ -1155,7 +1171,7 @@ VALUE Backend_close(VALUE self, VALUE io) {
   RAISE_IF_EXCEPTION(resume_value);
   RB_GC_GUARD(resume_value);
 
-  fptr_finalize(fptr);
+  if (fptr) fptr_finalize(fptr);
   // fd = -1;
   return io;
 }
@@ -1317,6 +1333,7 @@ struct libev_child {
   VALUE fiber;
 };
 
+#ifndef POLYPHONY_WINDOWS
 void Backend_child_callback(EV_P_ ev_child *w, int revents) {
   struct libev_child *watcher = (struct libev_child *)w;
   int exit_status = WEXITSTATUS(w->rstatus);
@@ -1325,8 +1342,12 @@ void Backend_child_callback(EV_P_ ev_child *w, int revents) {
   status = rb_ary_new_from_args(2, INT2FIX(w->rpid), INT2FIX(exit_status));
   Fiber_make_runnable(watcher->fiber, status);
 }
+#endif
 
 VALUE Backend_waitpid(VALUE self, VALUE pid) {
+#ifdef POLYPHONY_WINDOWS
+  rb_raise(rb_eStandardError, "Not implemented");
+#else
   Backend_t *backend;
   struct libev_child watcher;
   VALUE switchpoint_result = Qnil;
@@ -1344,6 +1365,7 @@ VALUE Backend_waitpid(VALUE self, VALUE pid) {
   RB_GC_GUARD(watcher.fiber);
   RB_GC_GUARD(switchpoint_result);
   return switchpoint_result;
+#endif
 }
 #endif
 
@@ -1497,6 +1519,7 @@ done:
 #endif
 }
 
+#ifdef POLYPHONY_LINUX
 VALUE Backend_splice_chunks(VALUE self, VALUE src, VALUE dest, VALUE prefix, VALUE postfix, VALUE chunk_prefix, VALUE chunk_postfix, VALUE chunk_size) {
   Backend_t *backend;
   GetBackend(self, backend);
@@ -1586,6 +1609,7 @@ error:
   if (pipefd[1] != -1) close(pipefd[1]);
   return RAISE_EXCEPTION(result);
 }
+#endif
 
 VALUE Backend_trace(int argc, VALUE *argv, VALUE self) {
   Backend_t *backend;
@@ -1651,7 +1675,10 @@ void Init_Backend(void) {
   rb_define_method(cBackend, "chain", Backend_chain, -1);
   rb_define_method(cBackend, "idle_gc_period=", Backend_idle_gc_period_set, 1);
   rb_define_method(cBackend, "idle_proc=", Backend_idle_proc_set, 1);
+  
+  #ifdef POLYPHONY_LINUX
   rb_define_method(cBackend, "splice_chunks", Backend_splice_chunks, 7);
+  #endif
 
   rb_define_method(cBackend, "accept", Backend_accept, 2);
   rb_define_method(cBackend, "accept_loop", Backend_accept_loop, 2);

data/ext/polyphony/extconf.rb

@@ -2,12 +2,14 @@
 
 require 'rubygems'
 require 'mkmf'
+require 'rbconfig'
 
 dir_config 'polyphony_ext'
 
 KERNEL_INFO_RE = /Linux (\d)\.(\d+)(?:\.)?((?:\d+\.?)*)(?:\-)?([\w\-]+)?/
 def get_config
   config = { linux: !!(RUBY_PLATFORM =~ /linux/) }
+  config[:windows] = !!(RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
   return config if !config[:linux]
 
   kernel_info = `uname -sr`
@@ -17,7 +19,8 @@ def get_config
   version, major_revision, distribution = m[1].to_i, m[2].to_i, m[4]
 
   combined_version = version.to_i * 100 + major_revision.to_i
-
+  
+  config[:kernel_version]     = combined_version
   config[:pidfd_open]         = combined_version > 503
   config[:multishot_recv]     = combined_version >= 600
   config[:multishot_recvmsg]  = combined_version >= 600
@@ -31,7 +34,7 @@ def get_config
 end
 
 config = get_config
-puts "Building Polyphony... (#{config.inspect})"
+puts "Building Polyphony (\n#{config.map { |(k, v)| "  #{k}: #{v}\n"}.join})"
 
 require_relative 'zlib_conf'
 
@@ -71,6 +74,7 @@ if config[:io_uring]
 else
   $defs << "-DPOLYPHONY_BACKEND_LIBEV"
   $defs << "-DPOLYPHONY_LINUX" if config[:linux]
+  $defs << "-DPOLYPHONY_WINDOWS" if config[:windows]
 
   $defs << "-DEV_STANDALONE" # prevent libev from assuming "config.h" exists
 

data/ext/polyphony/pipe.c

@@ -97,8 +97,8 @@ VALUE Pipe_close(VALUE self) {
   if (pipe->w_closed)
     rb_raise(rb_eRuntimeError, "Pipe is already closed for writing");
 
+  Backend_close(BACKEND(), INT2FIX(pipe->fds[1]));
   pipe->w_closed = 1;
-  close(pipe->fds[1]);
   return self;
 }
 

data/ext/polyphony/polyphony.c

@@ -80,20 +80,6 @@ VALUE Polyphony_backend_accept_loop(VALUE self, VALUE server_socket, VALUE socke
   return Backend_accept_loop(BACKEND(), server_socket, socket_class);
 }
 
-#ifdef HAVE_IO_URING_PREP_MULTISHOT_ACCEPT
-/* Starts a multishot accept operation on the given server socket. This API is
- * available only for the io_uring backend.
- *
- * @param server_socket [Socket] socket to accept on
- * @return [any] block return value
- */
-
-VALUE Polyphony_backend_multishot_accept(VALUE self, VALUE server_socket) {
-  return Backend_multishot_accept(BACKEND(), server_socket);
-}
-#endif
-
-
 /* Connects the given socket to the given address and port.
  *
  * @param io [Socket] socket to connect
@@ -433,12 +419,6 @@ void Init_Polyphony(void) {
   rb_define_singleton_method(mPolyphony, "backend_accept_loop", Polyphony_backend_accept_loop, 2);
   rb_define_singleton_method(mPolyphony, "backend_connect", Polyphony_backend_connect, 3);
   rb_define_singleton_method(mPolyphony, "backend_feed_loop", Polyphony_backend_feed_loop, 3);
-
-  #ifdef HAVE_IO_URING_PREP_MULTISHOT_ACCEPT
-  rb_define_singleton_method(mPolyphony, "backend_multishot_accept", Polyphony_backend_multishot_accept, 1);
-  #endif
-
-
   rb_define_singleton_method(mPolyphony, "backend_read", Polyphony_backend_read, 5);
   rb_define_singleton_method(mPolyphony, "backend_read_loop", Polyphony_backend_read_loop, 2);
   rb_define_singleton_method(mPolyphony, "backend_recv", Polyphony_backend_recv, 4);

data/ext/polyphony/polyphony.h

@@ -101,11 +101,6 @@ VALUE Backend_accept(VALUE self, VALUE server_socket, VALUE socket_class);
 VALUE Backend_accept_loop(VALUE self, VALUE server_socket, VALUE socket_class);
 VALUE Backend_connect(VALUE self, VALUE io, VALUE addr, VALUE port);
 VALUE Backend_feed_loop(VALUE self, VALUE io, VALUE receiver, VALUE method);
-
-#ifdef HAVE_IO_URING_PREP_MULTISHOT_ACCEPT
-VALUE Backend_multishot_accept(VALUE self, VALUE io);
-#endif
-
 VALUE Backend_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_eof, VALUE pos);
 VALUE Backend_read_loop(VALUE self, VALUE io, VALUE maxlen);
 VALUE Backend_recv(VALUE self, VALUE io, VALUE str, VALUE length, VALUE pos);

data/ext/polyphony/win_uio.h

@@ -0,0 +1,18 @@
+// source: https://stackoverflow.com/questions/57897314/fatal-error-when-compiling-include-sys-uio-h-on-project-windows
+
+#ifndef SYS_UIO_H
+#define SYS_UIO_H
+
+#include <inttypes.h>
+#include <unistd.h>
+
+struct iovec
+{
+    void    *iov_base;  /* Base address of a memory region for input or output */
+    size_t   iov_len;   /* The size of the memory pointed to by iov_base */
+};
+
+ ssize_t readv(int fildes, const struct iovec *iov, int iovcnt);
+ssize_t writev(int fildes, const struct iovec *iov, int iovcnt);
+
+#endif /* SYS_UIO_H */

data/lib/polyphony/extensions/socket.rb

@@ -464,20 +464,6 @@ class ::TCPServer < ::TCPSocket
     Polyphony.backend_accept(@io, TCPSocket)
   end
 
-  if Polyphony.instance_methods(false).include?(:backend_multishot_accept)
-    # Starts a multishot accept operation (only available with io_uring
-    # backend). Example usage:
-    #
-    #   server.multishot_accept do
-    #     server.accept_loop { |c| handle_connection(c) }
-    #   end
-    #
-    # @return [any] return value of code block
-    def multishot_accept(&block)
-      Polyphony.backend_multishot_accept(@io, &block)
-    end
-  end
-
   # Accepts incoming connections in an infinite loop.
   #
   # @yield [TCPSocket] accepted socket

data/lib/polyphony/extensions/timeout.rb

@@ -14,6 +14,10 @@ module ::Timeout
   # @param message [String] exception message
   # @return [any] block's return value
   def self.timeout(sec, klass = Timeout::Error, message = 'execution expired', &block)
-    cancel_after(sec, with_exception: [klass, message], &block)
+    if sec.nil? || sec == 0
+      block.call
+    else
+      cancel_after(sec, with_exception: [klass, message], &block)
+    end
   end
 end

data/lib/polyphony/version.rb

@@ -2,5 +2,5 @@
 
 module Polyphony
   # @!visibility private
-  VERSION = '1.4'
+  VERSION = '1.5'
 end

data/test/test_backend.rb

@@ -317,6 +317,8 @@ class BackendTest < MiniTest::Test
   end
 
   def test_splice_chunks
+    skip if !Thread.current.backend.respond_to?(:splice_chunks)
+
     body = 'abcd' * 4
     chunk_size = 12
 
@@ -346,8 +348,8 @@ class BackendTest < MiniTest::Test
     expected = "Content-Type: foo\r\n\r\n#{12.to_s(16)}\r\n#{body[0..11]}\r\n#{4.to_s(16)}\r\n#{body[12..15]}\r\n0\r\n\r\n"
     assert_equal expected, buf
   ensure
-    o.close
-    w.close
+    o&.close
+    w&.close
   end
 
   def test_idle_gc

data/test/test_ext.rb

@@ -242,6 +242,20 @@ class TimeoutTest < MiniTest::Test
     assert_equal [0, 1, 2], buffer
   end
 
+  def test_timeout_with_nil_or_zero
+    v = Timeout.timeout(nil) do
+      sleep 0.01
+      :foo
+    end
+    assert_equal :foo, v
+
+    v = Timeout.timeout(0) do
+      sleep 0.01
+      :bar
+    end
+    assert_equal :bar, v
+  end
+
   class MyTimeout < Exception
   end
 

data/test/test_global_api.rb

@@ -128,16 +128,16 @@ class MoveOnAfterTest < MiniTest::Test
 
   def test_move_on_after_with_reset
     t0 = monotonic_clock
-    v = move_on_after(0.01, with_value: :moved_on) do |timeout|
-      sleep 0.006
+    v = move_on_after(0.1, with_value: :moved_on) do |timeout|
+      sleep 0.06
       timeout.reset
-      sleep 0.006
+      sleep 0.06
       nil
     end
     t1 = monotonic_clock
 
     assert_nil v
-    assert_in_range 0.012..0.030, t1 - t0 if IS_LINUX
+    assert_in_range 0.12..0.30, t1 - t0 if IS_LINUX
   end
 
   def test_nested_move_on_after

data/test/test_socket.rb

@@ -390,98 +390,3 @@ class SSLSocketTest < MiniTest::Test
     assert_kind_of OpenSSL::SSL::SSLError, errors.first
   end
 end
-
-class MultishotAcceptTest < MiniTest::Test
-  def setup
-    skip if !TCPServer.instance_methods(false).include?(:multishot_accept)
-  end
-
-  def start_tcp_server_on_random_port(host = '127.0.0.1')
-    port = rand(1100..60000)
-    server = TCPServer.new(host, port)
-    [port, server]
-  rescue Errno::EADDRINUSE
-    retry
-  end
-
-  def test_multishot_accept_while_loop
-    port, server = start_tcp_server_on_random_port
-    server_fiber = spin do
-      server.multishot_accept do
-        while (socket = server.accept)
-          spin do
-            while (data = socket.gets(8192))
-              socket << data
-            end
-          end
-        end
-      end
-    end
-
-    snooze
-    client = TCPSocket.new('127.0.0.1', port)
-    client.write("1234\n")
-    assert_equal "1234\n", client.recv(8192)
-    client.close
-
-    client = TCPSocket.new('127.0.0.1', port)
-    client.write("5678\n")
-    assert_equal "5678\n", client.recv(8192)
-    client.close
-
-  ensure
-    server_fiber&.stop
-    server_fiber&.await
-    server&.close
-  end
-
-  def spin_client(socket)
-    spin do
-      while (data = socket.gets(8192))
-        socket << data
-      end
-    end
-  end
-
-  def test_multishot_accept_loop
-    port, server = start_tcp_server_on_random_port
-    server_fiber = spin do
-      server.multishot_accept do
-        server.accept_loop { |s| spin_client(s) }
-      end
-    end
-
-    snooze
-    client = TCPSocket.new('127.0.0.1', port)
-    client.write("1234\n")
-    assert_equal "1234\n", client.recv(8192)
-    client.close
-
-    client = TCPSocket.new('127.0.0.1', port)
-    client.write("5678\n")
-    assert_equal "5678\n", client.recv(8192)
-    client.close
-
-  ensure
-    server_fiber&.stop
-    server_fiber&.await
-    server&.close
-  end
-
-  def test_multishot_accept_error
-    port, server = start_tcp_server_on_random_port
-    error = nil
-    server_fiber = spin do
-      server.multishot_accept do
-        server.accept_loop { |s| spin_client(s) }
-      rescue SystemCallError => e
-        error = e
-      end
-    end
-    snooze
-    server.close
-    snooze
-    server_fiber.await
-    assert_kind_of Errno::EBADF, error
-  end
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: '1.4'
+  version: '1.5'
 platform: ruby
 authors:
 - Sharon Rosner
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-01 00:00:00.000000000 Z
+date: 2023-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -150,7 +150,7 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.10.0
-description: 
+description:
 email: sharon@noteflakes.com
 executables: []
 extensions:
@@ -312,6 +312,7 @@ files:
 - examples/pipes/gzip.rb
 - examples/pipes/gzip_http_server.rb
 - examples/pipes/http_server.rb
+- examples/pipes/http_server2.rb
 - examples/pipes/tcp_proxy.rb
 - examples/pipes/tee.rb
 - ext/libev/Changes
@@ -356,6 +357,7 @@ files:
 - ext/polyphony/runqueue_ring_buffer.h
 - ext/polyphony/socket_extensions.c
 - ext/polyphony/thread.c
+- ext/polyphony/win_uio.h
 - ext/polyphony/zlib_conf.rb
 - ext/test_eintr.c
 - lib/polyphony.rb
@@ -658,7 +660,7 @@ metadata:
   source_code_uri: https://github.com/digital-fabric/polyphony
   documentation_uri: https://www.rubydoc.info/gems/polyphony
   changelog_uri: https://github.com/digital-fabric/polyphony/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - polyphony
@@ -678,7 +680,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.1
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Fine grained concurrency for Ruby
 test_files: []