polyphony 1.4 → 1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91cce4703d1b930aa9b242373492a373abd6d49b5ce200f8828683538c15562b
-  data.tar.gz: c5c8af2ab5f4961b6379015b8d68f10c56dc5c466a44c0a0a4d6be4a93ab26b9
+  metadata.gz: 8ec9aae8d4c83ff8dd3332187fdd12fc598596dc4bbab11eaad6400e61769684
+  data.tar.gz: a42cedfc33172dbacc4f61e16fa0a6fce3eb772e78e8829a2dfe744601c77b1c
 SHA512:
-  metadata.gz: 5a9cb0b512efaae4b0454f3b5e99807657275a8d4c80dd8f527235c842c3131f4a38f4e4eefc174aeae1c2e7c6f879e9ccf8064e49b42dd69cb27d7780ff1780
-  data.tar.gz: 19977c5db508a5a5bdf1fa1f4b0db061436849c5d75f59c62764ae3bfd5426014e4e119e7306b68edf25c82cea9193f259c2e1403b1def825847614c003026dd
+  metadata.gz: 2f6c4a70a56c854dfaa707baeac665ed04adcf04a0f67c25419b2de50d367b155ed6aad3e6bb3dcdc6391af08f4a4dafc3afcadecc499f26cb4b5a06a5d0c69e
+  data.tar.gz: e8b74bd9dbec6a0d05e5510514ccff97792e04c0742e85624087eb92fe55d195b553288c0e3132ab468ba7a28a921ead91ce20ce26d6dab93f5b5a467f5f61bd

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.5 2023-07-28
+
+- Refactor backend_await in io_uring backend
+- Fix calling `Timeout.timeout` with `nil` or `0` (#114)
+- Rework support for io_uring multishot accept
+- Combine SQE submission and waiting for CQE into a single syscall
+- Use io_uring for closing a `Polyphony::Pipe`, removing call to `close()`
+
 ## 1.4 2023-07-01
 
 - Implement concurrent `IO#close`

data/TODO.md

@@ -5,6 +5,10 @@
   - if `io_uring_get_sqe` returns null, call `io_uring_submit`, (snooze fiber)?
     and try again
 
+- closing and shutdown:
+  - `Pipe_free()` - can we use the backend to close the pipe fds?
+  - Implement `BasicSocket#shutdown`, add `Backend_shutdown` API.
+
 - Tracing:
   - Emit events on I/O ops, e.g.:
     - [:op_read_submit, id, io, len]
@@ -19,16 +23,7 @@
 - More tight loops
   - `IO#gets_loop`, `Socket#gets_loop`, `OpenSSL::Socket#gets_loop` (medium effort)
 
-- Add support for `close` to io_uring backend
-
-## Roadmap for Polyphony 1.1
-
-- io_uring
-  - Use playground.c to find out why we when submitting and waiting for
-    completion in single syscall signals seem to be blocked until the syscall
-    returns. Is this a bug in io_uring/liburing?
-
------------------------------------------------------
+## Roadmap for Polyphony 2
 
 - allow backend selection at runtime?
 - Debugging

data/examples/pipes/http_server.rb

@@ -4,33 +4,63 @@ require 'bundler/inline'
 
 gemfile do
   source 'https://rubygems.org'
-  gem 'h1p'
-  gem 'polyphony', path: '.'
+  gem 'h1p', path: '../h1p'
+  # gem 'polyphony', path: '.'
 end
 
-require 'polyphony'
+# require 'polyphony'
 require 'h1p'
 
-def handle_client(conn)
-  spin do
-    parser = H1P::Parser.new(conn, :server)
+module ::Kernel
+  def trace(*args)
+    STDOUT << format_trace(args)
+  end
 
-    while true # assuming persistent connection
-      headers = parser.parse_headers
-      break unless headers
+  def format_trace(args)
+    if args.first.is_a?(String)
+      if args.size > 1
+        format("%s: %p\n", args.shift, args)
+      else
+        format("%s\n", args.first)
+      end
+    else
+      format("%p\n", args.size == 1 ? args.first : args)
+    end
+  end
 
-      parser.read_body unless parser.complete?
+  def monotonic_clock
+    ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
+  end
+end
 
+def handle_client(conn)
+  Thread.new do
+    reader = proc do |len, buf, buf_pos|
+      trace(len:, buf:, buf_pos:)
+      s = conn.readpartial(len)
+      buf ? (buf << s) : +s
+    rescue EOFError
+      nil
+    end
+    parser = H1P::Parser.new(reader, :server)
+    # parser = H1P::Parser.new(conn, :server)
+    while (headers = parser.parse_headers)
+      parser.read_body unless parser.complete?
       conn << "HTTP/1.1 200 OK\r\nContent-Length: 14\r\n\r\nHello, world!\n"
     end
-  rescue Errno::ECONNRESET
+  rescue Errno::ECONNRESET, Errno::EPIPE
     # ignore
   rescue H1P::Error
     puts 'Got invalid request, closing connection...'
   ensure
+    parser = nil
     conn.close rescue nil
   end
 end
 
 puts "Serving HTTP on port 1234..."
-TCPServer.new('0.0.0.0', 1234).accept_loop { |c| handle_client(c) }
+s = TCPServer.new('0.0.0.0', 1234)
+while true
+  c = s.accept
+  handle_client(c)
+end

data/examples/pipes/http_server2.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'bundler/inline'
+
+gemfile do
+  source 'https://rubygems.org'
+  gem 'http_parser.rb'
+  gem 'polyphony', path: '.'
+end
+
+require 'polyphony'
+require 'http_parser.rb'
+
+def handle_client(conn)
+  spin do
+    parser = Http::Parser.new
+    done = false
+    headers = nil
+    parser.on_headers_complete = proc do |h|
+      headers = h
+      headers[':method'] = parser.http_method
+      headers[':path'] = parser.request_url
+    end
+    parser.on_message_complete = proc { done = true }
+
+    while true # assuming persistent connection
+      conn.read_loop do |msg|
+        parser << msg
+        break if done
+      end
+  
+      conn << "HTTP/1.1 200 OK\r\nContent-Length: 14\r\n\r\nHello, world!\n"
+      done = false
+      headers = nil
+    end
+  rescue Errno::ECONNRESET, Errno::EPIPE
+    # ignore
+  ensure
+    parser = nil
+    conn.close rescue nil
+  end
+end
+
+puts "Serving HTTP on port 1234..."
+TCPServer.new('0.0.0.0', 1234).accept_loop { |c| handle_client(c) }

data/ext/polyphony/backend_common.h

@@ -2,9 +2,14 @@
 #define BACKEND_COMMON_H
 
 #include <sys/types.h>
+#ifdef POLYPHONY_WINDOWS
+#include <winsock2.h>
+#else
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <netdb.h>
+#include <sys/socket.h>
+#endif
 
 #include "ruby.h"
 #include "ruby/io.h"