polyphony 1.2 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8069af9a528319585e1112ca1c1fc97981ae7106da100701691d7caf1478fdc
-  data.tar.gz: c5ec274b188332a18f8de7b595fad457f25cfc79bf903c05db0aaf7bf20507dc
+  metadata.gz: 537c28ec35d12c724a5f5ef4117ada1641d0b49b780757965615665bddbe995a
+  data.tar.gz: 5c11137a7a7dc6774ec815ec8b38791752f1beb939311b5968f0d0b242c7f8ad
 SHA512:
-  metadata.gz: f4e8fbd79cce5062a1fa054838186c925fa626c29faf86f589889f418838b681923863d07603036c2276bd3644ce99eac1f84cdc57b7c57e97787bceec6f4cd0
-  data.tar.gz: 22dbe0e38bc0d46ac1dcd543b0ae2b5e4a282c286f6dd40d823347542cbb37e2f21cf3c7c5503389f80f4b057b644c19c683d346a3500ada6a39e83bdbd1516f
+  metadata.gz: 912c4a3cea0a183350c939e588bba70656fcd14a07af6bd5912e3c2208cbb286150477d050482b030c494b0f87f21da7ec350c50f5bfee8e563bc21211143adc
+  data.tar.gz: c72b01fcef19a525cef49b277f0f1fe949956499be51f34f75fe1e87fc6efe9222a43ac96d282460610c3a82989934a0f661e78a27736120117c1ef391036dd6

data/.rubocop.yml

@@ -7,6 +7,7 @@ AllCops:
     - 'test/**/*.rb'
     - 'examples/**/*.rb'
     - 'Gemfile*'
+    - 'ext/**/*.rb'
     - lib/polyphony/adapters/irb.rb
 
 Style/LambdaCall:

data/.yardopts

@@ -20,6 +20,7 @@
 docs/readme.md
 docs/overview.md
 docs/tutorial.md
+docs/cancellation.md
 docs/advanced-io.md
 docs/cheat-sheet.md
 docs/faq.md

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.3 2023-06-23
+
+- Improve cancellation doc page
+- Fix linking to liburing under certain conditions (#107)
+- Fix reference to `Socket::ZERO_LINGER` (#106 @floriandejonckheere)
+- Handle error when calling `pidfd_open`
+
 ## 1.2 2023-06-17
 
 - Require Ruby 3.1 or newer

data/docs/cancellation.md

@@ -101,10 +101,11 @@ with_timeout(5) { sleep 10; :bar } #=> MyTimeoutError raised!
 In the code above, we create a `with_timeout` method that takes a duration
 argument. It starts by spinning up a fiber that will sleep for the given
 duration, then raise a custom exception. It then runs the given block by calling
-`yield`. If the given block stops running before the timeout, it exists
-normally, not before making sure to stop the timeout fiber. If the given block
-runs longer than the timeout, the exception raised by the timeout fiber will be
-propagated to the fiber running the block, causing it to be stopped.
+`yield`. If the given block returns before the timeout, its return value is
+returned from the call to `with_timeout`, not before making sure to stop the
+timeout fiber. If the given block runs longer than the timeout, the exception
+raised by the timeout will interrupt the fiber running the block, and will
+propagate to the call site.
 
 Now that we have an idea of how we can construct timeouts, let's look at the
 different timeout APIs included in Polyphony:

data/ext/polyphony/backend_io_uring.c

@@ -14,7 +14,7 @@
 #include <errno.h>
 
 #include "polyphony.h"
-#include "liburing.h"
+#include <liburing.h>
 #include "backend_io_uring_context.h"
 #include "ruby/thread.h"
 #include "ruby/io.h"
@@ -141,8 +141,6 @@ typedef struct poll_context {
   int                 result;
 } poll_context_t;
 
-extern int __sys_io_uring_enter(int fd, unsigned to_submit, unsigned min_complete, unsigned flags, sigset_t *sig);
-
 void *io_uring_backend_poll_without_gvl(void *ptr) {
   poll_context_t *ctx = (poll_context_t *)ptr;
   ctx->result = io_uring_wait_cqe(ctx->ring, &ctx->cqe);
@@ -215,7 +213,7 @@ again:
   if (overflow_checked) goto done;
 
   if (cq_ring_needs_flush(ring)) {
-    __sys_io_uring_enter(ring->ring_fd, 0, 0, IORING_ENTER_GETEVENTS, NULL);
+    io_uring_enter(ring->ring_fd, 0, 0, IORING_ENTER_GETEVENTS, NULL);
     overflow_checked = true;
     goto again;
   }
@@ -1539,6 +1537,10 @@ VALUE Backend_waitpid(VALUE self, VALUE pid) {
     RAISE_IF_EXCEPTION(resume_value);
     RB_GC_GUARD(resume_value);
   }
+  else {
+    int e = errno;
+    rb_syserr_fail(e, strerror(e));
+  }
 
   ret = waitpid(pid_int, &status, WNOHANG);
   if (ret < 0) {

data/ext/polyphony/extconf.rb

@@ -44,11 +44,13 @@ if config[:io_uring]
     end
   end
 
-  if !find_header 'liburing.h', File.expand_path('../../vendor/liburing/src/include', __dir__)
+  if !find_header 'liburing.h', File.join(liburing_path, 'src/include')
     raise "Couldn't find liburing.h"
   end
 
-  $LDFLAGS << " -L#{File.expand_path('../../vendor/liburing/src', __dir__)} -l uring"
+  if !find_library('uring', nil, File.join(liburing_path, 'src'))
+    raise "Couldn't find liburing.a"
+  end
 end
 
 def define_bool(name, value)
@@ -92,12 +94,8 @@ $defs << '-DPOLYPHONY_PLAYGROUND' if ENV['POLYPHONY_PLAYGROUND']
 
 CONFIG['optflags'] << ' -fno-strict-aliasing' unless RUBY_PLATFORM =~ /mswin/
 
-if RUBY_VERSION >= '3.1'
-  have_func('rb_fiber_transfer', 'ruby.h')
-end
-
 have_header('ruby/io/buffer.h')
-
+have_func('rb_fiber_transfer')
 have_func('rb_io_path')
 have_func('rb_io_descriptor')
 have_func('rb_io_get_write_io')

data/lib/polyphony/extensions/socket.rb

@@ -177,7 +177,7 @@ class ::Socket < ::BasicSocket
   #
   # @return [::Socket] self
   def dont_linger
-    setsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER, ZERO_LINGER)
+    setsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER, Socket::ZERO_LINGER)
     self
   end
 
@@ -287,7 +287,7 @@ class ::TCPSocket < ::IPSocket
   #
   # @return [::Socket] self
   def dont_linger
-    setsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER, ZERO_LINGER)
+    setsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER, Socket::ZERO_LINGER)
     self
   end
 

data/lib/polyphony/version.rb

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

data/test/test_socket.rb

@@ -163,6 +163,17 @@ class TCPSocketTest < MiniTest::Test
     server_fiber&.await
     server&.close
   end
+
+  def test_sockopt
+    client = TCPSocket.open('ipinfo.io', 80)
+
+    client.dont_linger
+    client.no_delay
+    client.reuse_addr
+    client.reuse_port
+  ensure
+    client.close
+  end
 end
 
 class UNIXSocketTest < MiniTest::Test

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: '1.3'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-17 00:00:00.000000000 Z
+date: 2023-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler