polyphony 0.76 → 0.77

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad0cf72d2ae4acd2673cff5b4c5a2fa627cd2833e3131fa4504a2dc1e4cef6ea
-  data.tar.gz: 69bb3e3bf2dfdffc3806c442a1d095b018f865f6c3d966ce7f5b4d789ba2bc9f
+  metadata.gz: 10f049946dc02d9cdd984cc8658687d2319e0fd85f6f2cce74aa0a887bc714cb
+  data.tar.gz: 5118859d4640aebeddb9186c43d58617e9b455a63ea97c1dc8283432db954fd1
 SHA512:
-  metadata.gz: 306e7c56b5fa00a078e725e508bf99934f6ea12c738cb1e1c66130b20037ad4862f8aeefe0a53fec214387579955dfde9f74b92487653af8f501c80a6a16bb1b
-  data.tar.gz: 3c807f56e677355ae3193db5a641caa660ab2f18cc2d7a5f8a4b38ef2b59463b0bf732cf4878cd7c93e19198f1eb330797b82f1ea69089f5ec055a3545e4d04c
+  metadata.gz: e107e21d6c42f9cd9e91521e288dfee37a6f0da4b7d8a8d311924bf88ccf732d2cc94de834dbbaa3c7a974e5bb84ce1d8d20efd68870c9f2dac9b73155d28558
+  data.tar.gz: 8e4f7005c9cbc46cd084bbe66a4e8f7145f6a4a3062ce027a70eee07c0e648f79289515591ef4b48010580b7125c403ab09e45417781346ebf6da4b2d528ec45

data/CHANGELOG.md

@@ -1,6 +1,10 @@
+## 0.77 2022-02-07
+
+- Fix behaviour of signal traps (#71)
+
 ## 0.76 2022-02-06
 
-- Comment out `Backend_close` API
+- Comment out `Backend_close` API (#70)
 
 ## 0.75 2022-02-04
 

data/Gemfile.lock

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

data/examples/core/trap1.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+pid = Process.pid
+fork do
+  sleep 1
+  Process.kill('SIGINT', pid)
+  # sleep 10
+  # Process.kill(-9, pid)
+end
+
+require 'bundler/setup'
+require 'polyphony'
+
+Thread.backend.trace_proc = proc { |*e| STDOUT.orig_write("#{e.inspect}\n") }
+trap('SIGINT') { STDOUT.orig_write("* recv SIGINT\n") }
+# trap('SIGCHLD') { STDOUT.orig_write("* recv SIGCHLD\n") }
+STDOUT.orig_write("* pre gets\n")
+# STDIN.wait_readable
+s = gets
+p s
+STDOUT.orig_write("* post gets\n")

data/examples/core/trap2.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+pid = Process.pid
+fork do
+  sleep 1
+  Process.kill('SIGINT', pid)
+  # sleep 10
+  # Process.kill(-9, pid)
+end
+
+trap('SIGINT') {}
+p :before
+result = IO.select([STDIN])
+p :after

data/ext/polyphony/backend_io_uring.c

@@ -191,10 +191,14 @@ void io_uring_backend_poll(Backend_t *backend) {
     io_uring_submit(&backend->ring);
   }
 
+wait_cqe:
   backend->base.currently_polling = 1;
   rb_thread_call_without_gvl(io_uring_backend_poll_without_gvl, (void *)&poll_ctx, RUBY_UBF_IO, 0);
   backend->base.currently_polling = 0;
-  if (poll_ctx.result < 0) return;
+  if (poll_ctx.result < 0) {
+    if (poll_ctx.result == -EINTR && runqueue_empty_p(&backend->base.runqueue)) goto wait_cqe;
+    return;
+  }
 
   io_uring_backend_handle_completion(poll_ctx.cqe, backend);
   io_uring_cqe_seen(&backend->ring, poll_ctx.cqe);

data/ext/polyphony/backend_libev.c

@@ -169,9 +169,14 @@ inline VALUE Backend_poll(VALUE self, VALUE blocking) {
   backend->base.poll_count++;
 
   COND_TRACE(&backend->base, 2, SYM_fiber_event_poll_enter, rb_fiber_current());
+  
+ev_run:
   backend->base.currently_polling = 1;
+  errno = 0;
   ev_run(backend->ev_loop, blocking == Qtrue ? EVRUN_ONCE : EVRUN_NOWAIT);
   backend->base.currently_polling = 0;
+  if (errno == EINTR && runqueue_empty_p(&backend->base.runqueue)) goto ev_run;
+  
   COND_TRACE(&backend->base, 2, SYM_fiber_event_poll_leave, rb_fiber_current());
 
   return self;

data/ext/test_eintr.c

@@ -0,0 +1,50 @@
+#include <stdio.h>
+#include <unistd.h>
+#include <signal.h>
+#include <poll.h>
+#include "./liburing/liburing.h"
+
+void sig_handler(int sig) {
+  printf("handle signal %d!\n", sig);
+}
+
+int main(int argc, char *argv[])
+{
+  int pid = getpid();
+  int child_pid = fork();
+  if (!child_pid) {
+    sleep(1);
+    kill(pid, SIGINT);
+    sleep(1);
+    kill(pid, SIGINT);
+  }
+  else {
+    struct sigaction sa;
+
+    sa.sa_handler = sig_handler;
+    sa.sa_flags = SA_SIGINFO | SA_ONSTACK;//0;
+    sigemptyset(&sa.sa_mask);
+    sigaction(SIGINT, &sa, NULL);
+
+    printf("pid: %d\n", pid);
+
+    struct io_uring ring;
+    int ret = io_uring_queue_init(16, &ring, 0);
+    printf("io_uring_queue_init: %d\n", ret);
+
+    struct io_uring_sqe *sqe = io_uring_get_sqe(&ring);
+    io_uring_prep_poll_add(sqe, STDIN_FILENO, POLLIN);
+    ret = io_uring_submit(&ring);
+    printf("io_uring_submit: %d\n", ret);
+
+    struct io_uring_cqe *cqe;
+
+wait_cqe:
+    ret = io_uring_wait_cqe(&ring, &cqe);
+    printf("io_uring_wait_cqe: %d\n", ret);
+    if (ret == -EINTR) goto wait_cqe;
+
+    printf("done\n");
+    return 0;
+  }
+}

data/lib/polyphony/extensions/fiber.rb

@@ -248,21 +248,27 @@ module Polyphony
     # also be scheduled with priority. This method is mainly used trapping
     # signals (see also the patched `Kernel#trap`)
     def schedule_priority_oob_fiber(&block)
-      f = Fiber.new do
+      oob_fiber = Fiber.new do
         Fiber.current.setup_raw
         result = block.call
       rescue Exception => e
         Thread.current.schedule_and_wakeup(Thread.main.main_fiber, e)
         result = e
       ensure
-        Thread.backend.trace(:fiber_terminate, f, result)
+        Thread.backend.trace(:fiber_terminate, Fiber.current, result)
         suspend
       end
-      f.oob = true
+      prepare_oob_fiber(oob_fiber, block)
+      Thread.backend.trace(:fiber_create, oob_fiber)
+      oob_fiber.schedule_with_priority(nil)
+    end
+
+    def prepare_oob_fiber(fiber, block)
+      fiber.oob = true
+      fiber.tag = :oob
+      fiber.thread = Thread.current
       location = block.source_location
-      f.set_caller(["#{location.join(':')}"])
-      Thread.backend.trace(:fiber_create, f)
-      Thread.current.schedule_and_wakeup(f, nil)
+      fiber.set_caller(["#{location.join(':')}"])
     end
   end
 

data/lib/polyphony/version.rb

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

data/test/helper.rb

@@ -46,10 +46,11 @@ class MiniTest::Test
     Thread.current.backend.finalize
     Thread.current.backend = Polyphony::Backend.new
     sleep 0.001
+    @__stamp = Time.now
   end
 
   def teardown
-    # trace "* teardown #{self.name}"
+    # trace "* teardown #{self.name} (#{Time.now - @__stamp}s)"
     Fiber.current.shutdown_all_children
     if Fiber.current.children.size > 0
       puts "Children left after #{self.name}: #{Fiber.current.children.inspect}"

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_receive_cross_thread_exception'
+$test_cmd = +'ruby test/run.rb  --name test_cross_thread_send_receive'
 if test_name
   $test_cmd << " --name #{test_name}"
 end

data/test/test_fiber.rb

@@ -923,18 +923,20 @@ class MailboxTest < MiniTest::Test
   def test_cross_thread_send_receive
     ping_receive_buffer = []
     pong_receive_buffer = []
+    master = Fiber.current
 
     pong = Thread.new do
-      sleep 0.05
-      loop do
+      master << :pong_ready
+      3.times do
         peer, data = receive
         pong_receive_buffer << data
         peer << 'pong'
       end
     end
 
+    assert_equal :pong_ready, receive
+
     ping = Thread.new do
-      sleep 0.05
       3.times do
         pong << [Fiber.current, 'ping']
         data = receive
@@ -943,7 +945,7 @@ class MailboxTest < MiniTest::Test
     end
 
     ping.join
-    pong.kill
+    pong.join
     ping = pong = nil
 
     assert_equal %w{pong pong pong}, ping_receive_buffer

data/test/test_signal.rb

@@ -3,6 +3,63 @@
 require_relative 'helper'
 
 class SignalTrapTest < Minitest::Test
+  def test_signal_handler_trace
+    i1, o1 = IO.pipe
+    i2, o2 = IO.pipe
+    pid = Process.pid
+    child_pid = Polyphony.fork do
+      i1.gets
+      Process.kill('SIGINT', pid)
+      sleep 0.1
+      o2.puts "done"
+      o2.close
+    end
+
+    events = []
+    begin
+      Thread.backend.trace_proc = proc { |*e| events << [e[0], e[1].tag] }
+      trap ('SIGINT') { }
+      
+      o1.orig_write("\n")
+      o1.close
+
+      msg = i2.gets
+      assert_equal "done\n", msg
+    ensure
+      Thread.backend.trace_proc = nil
+      trap ('SIGINT') { raise Interrupt }
+    end
+
+    Fiber.current.tag = :main
+
+    expected = [
+      [:fiber_switchpoint, :main],
+      [:fiber_event_poll_enter, :main],
+      [:fiber_create, :oob],
+      [:fiber_schedule, :oob],
+      [:fiber_event_poll_leave, :main],
+      [:fiber_run, :oob],
+      [:fiber_terminate, :oob],
+      [:fiber_switchpoint, :oob],
+      [:fiber_event_poll_enter, :oob],
+      [:fiber_schedule, :main],
+      [:fiber_event_poll_leave, :oob],
+      [:fiber_run, :main]
+    ]
+    if Thread.backend.kind == :libev
+      expected += [
+        [:fiber_schedule, :main],
+        [:fiber_switchpoint, :main],
+        [:fiber_run, :main]
+      ]
+    end
+
+    assert_equal expected, events
+  ensure
+    Process.kill('SIGTERM', child_pid) rescue nil
+    Process.wait(child_pid) rescue nil
+  end
+
   def test_int_signal
     Thread.new { sleep 0.001; Process.kill('INT', Process.pid) }
     assert_raises(Interrupt) { sleep 5 }

data/test/test_timer.rb

@@ -78,7 +78,7 @@ class TimerCancelAfterTest < MiniTest::Test
 
   def test_timer_cancel_after_with_reset
     buf = []
-    @timer.cancel_after(0.13) do
+    @timer.cancel_after(0.15) do
       sleep 0.05
       buf << 1
       @timer.reset

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: '0.76'
+  version: '0.77'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-06 00:00:00.000000000 Z
+date: 2022-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -245,6 +245,8 @@ files:
 - examples/core/thread_pool.rb
 - examples/core/throttling.rb
 - examples/core/timeout.rb
+- examples/core/trap1.rb
+- examples/core/trap2.rb
 - examples/core/using-a-mutex.rb
 - examples/core/worker-thread.rb
 - examples/io/backticks.rb
@@ -346,6 +348,7 @@ files:
 - ext/polyphony/runqueue_ring_buffer.h
 - ext/polyphony/socket_extensions.c
 - ext/polyphony/thread.c
+- ext/test_eintr.c
 - lib/polyphony.rb
 - lib/polyphony/adapters/fs.rb
 - lib/polyphony/adapters/irb.rb