polyphony 0.74 → 0.78

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2948e34f11b2bcb60406fda1024cac8d93c9019edfc97a8febe083d503b56d88
-  data.tar.gz: 4bedbe795bbdb669123da5d4d671e78e6cfe3a021ddf13f2a80563a80ca92571
+  metadata.gz: 51eecc20956cb4f1a35a7f6510dea2730652700e99d29c7d42ade201a119ea2e
+  data.tar.gz: bc2b57dc2cc5a8918bba1d8bf526cdbe23f44d134f9bdca5018b9e9e66930f91
 SHA512:
-  metadata.gz: 36cf3fecb1b3ad6dc7aec6a5a12b2a0db5e7e4f2fc15a201c5e6dbe692a3ebcf5d62bc8aad8febfb224c393014c40090245c47c93dec8b41bd9732b6002c9a8f
-  data.tar.gz: 8ad3f84d0af1eb5bb1535eb53128fb4f0602491e673128a873c8ef5176735ed61c6e1c53eb0b5faeb0792e299e771321a204f42d588566274f1737f16281a09e
+  metadata.gz: 21c446f9a6fa032577b245e6de5155832c8e6932d6c17e58824a55923c82be014453b64b29ccbb66fe5d01cde8622d3275664acda403637954f1e7e6851e93c7
+  data.tar.gz: a57831fe861ac51fa43692b66175291a457077822cdb5f795a093fca1e44bf95fb2b6a312cfe8a6c2b3c3e873319ffd03436e6236874a6acdd45843a21bc4981

data/.github/workflows/test.yml

@@ -19,7 +19,7 @@ jobs:
       POLYPHONY_USE_LIBEV: "1"
 
     steps:
-    - name: Setup OS
+    - name: Setup machine
       uses: actions/checkout@v1
     - name: Setup Ruby
       uses: ruby/setup-ruby@v1

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+## 0.78 2022-02-16
+
+- Fix Polyphony::Queue API compatibility (#72)
+
+## 0.77 2022-02-07
+
+- Fix behaviour of signal traps (#71)
+
+## 0.76 2022-02-06
+
+- Comment out `Backend_close` API (#70)
+
+## 0.75 2022-02-04
+
+- Fix handling of MoveOn on main fiber of forked process
+- Ensure SSLSocket underlying socket is in nonblocking mode
+- Add `Polyphony.backend_verify_blocking_mode` API
+- Fix address resolution for hostnames with IPv6 address
+- Improve behaviour of OOB fiber
+- Include caller in `fiber_switchpoint` trace
+
 ## 0.74 2022-02-01
 
 - Add support for IPv6 (#69)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    polyphony (0.74)
+    polyphony (0.78)
 
 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_common.c

@@ -64,7 +64,8 @@ VALUE backend_base_switch_fiber(VALUE backend, struct Backend_base *base) {
   unsigned int idle_tasks_run_count = 0;
 
   base->switch_count++;
-  COND_TRACE(base, 2, SYM_fiber_switchpoint, current_fiber);
+  if (SHOULD_TRACE(base))
+    TRACE(base, 3, SYM_fiber_switchpoint, current_fiber, CALLER());
 
   while (1) {
     next = runqueue_shift(&base->runqueue);
@@ -415,6 +416,13 @@ VALUE Backend_stats(VALUE self) {
   return stats;
 }
 
+VALUE Backend_verify_blocking_mode(VALUE self, VALUE io, VALUE blocking) {
+  rb_io_t *fptr;
+  GetOpenFile(io, fptr);
+  io_verify_blocking_mode(fptr, io, blocking);
+  return self;
+}
+
 void backend_setup_stats_symbols() {
   SYM_runqueue_size       = ID2SYM(rb_intern("runqueue_size"));
   SYM_runqueue_length     = ID2SYM(rb_intern("runqueue_length"));

data/ext/polyphony/backend_common.h

@@ -112,6 +112,7 @@ VALUE Backend_timeout_ensure_safe(VALUE arg);
 VALUE Backend_timeout_ensure_safe(VALUE arg);
 VALUE Backend_sendv(VALUE self, VALUE io, VALUE ary, VALUE flags);
 VALUE Backend_stats(VALUE self);
+VALUE Backend_verify_blocking_mode(VALUE self, VALUE io, VALUE blocking);
 void backend_run_idle_tasks(struct Backend_base *base);
 void io_verify_blocking_mode(rb_io_t *fptr, VALUE io, VALUE blocking);
 void backend_setup_stats_symbols();

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);
@@ -1017,39 +1021,39 @@ VALUE Backend_wait_io(VALUE self, VALUE io, VALUE write) {
   return self;
 }
 
-VALUE Backend_close(VALUE self, VALUE io) {
-  Backend_t *backend;
-  rb_io_t *fptr;
-  VALUE underlying_io = rb_ivar_get(io, ID_ivar_io);
-  VALUE resume_value = Qnil;
-  op_context_t *ctx;
-  struct io_uring_sqe *sqe;
-  int result;
-  int completed;
+// VALUE Backend_close(VALUE self, VALUE io) {
+//   Backend_t *backend;
+//   rb_io_t *fptr;
+//   VALUE underlying_io = rb_ivar_get(io, ID_ivar_io);
+//   VALUE resume_value = Qnil;
+//   op_context_t *ctx;
+//   struct io_uring_sqe *sqe;
+//   int result;
+//   int completed;
 
-  if (underlying_io != Qnil) io = underlying_io;
-  GetBackend(self, backend);
-  GetOpenFile(io, fptr);
+//   if (underlying_io != Qnil) io = underlying_io;
+//   GetBackend(self, backend);
+//   GetOpenFile(io, fptr);
 
-  if (fptr->fd < 0) return Qnil;
+//   if (fptr->fd < 0) return Qnil;
 
-  io_unset_nonblock(fptr, io);
+//   io_unset_nonblock(fptr, io);
 
-  ctx = context_store_acquire(&backend->store, OP_CLOSE);
-  sqe = io_uring_get_sqe(&backend->ring);
-  io_uring_prep_close(sqe, fptr->fd);
-  result = io_uring_backend_defer_submit_and_await(backend, sqe, ctx, &resume_value);
-  completed = context_store_release(&backend->store, ctx);
-  RAISE_IF_EXCEPTION(resume_value);
-  if (!completed) return resume_value;
-  RB_GC_GUARD(resume_value);
+//   ctx = context_store_acquire(&backend->store, OP_CLOSE);
+//   sqe = io_uring_get_sqe(&backend->ring);
+//   io_uring_prep_close(sqe, fptr->fd);
+//   result = io_uring_backend_defer_submit_and_await(backend, sqe, ctx, &resume_value);
+//   completed = context_store_release(&backend->store, ctx);
+//   RAISE_IF_EXCEPTION(resume_value);
+//   if (!completed) return resume_value;
+//   RB_GC_GUARD(resume_value);
 
-  if (result < 0) rb_syserr_fail(-result, strerror(-result));
+//   if (result < 0) rb_syserr_fail(-result, strerror(-result));
 
-  fptr_finalize(fptr);
-  // fptr->fd = -1;
-  return io;
-}
+//   fptr_finalize(fptr);
+//   // fptr->fd = -1;
+//   return io;
+// }
 
 inline struct __kernel_timespec double_to_timespec(double duration) {
   double duration_integral;
@@ -1640,7 +1644,7 @@ void Init_Backend() {
   rb_define_method(cBackend, "wait_io", Backend_wait_io, 2);
   rb_define_method(cBackend, "waitpid", Backend_waitpid, 1);
   rb_define_method(cBackend, "write", Backend_write_m, -1);
-  rb_define_method(cBackend, "close", Backend_close, 1);
+  // rb_define_method(cBackend, "close", Backend_close, 1);
 
   SYM_io_uring = ID2SYM(rb_intern("io_uring"));
   SYM_send = ID2SYM(rb_intern("send"));

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/polyphony/fiber.c

@@ -97,7 +97,7 @@ VALUE Fiber_receive(VALUE self) {
     mailbox = rb_funcall(cQueue, ID_new, 0);
     rb_ivar_set(self, ID_ivar_mailbox, mailbox);
   }
-  return Queue_shift(mailbox);
+  return Queue_shift(0, 0, mailbox);
 }
 
 VALUE Fiber_mailbox(VALUE self) {

data/ext/polyphony/polyphony.c

@@ -125,9 +125,9 @@ VALUE Polyphony_backend_write(int argc, VALUE *argv, VALUE self) {
   return Backend_write_m(argc, argv, BACKEND());
 }
 
-VALUE Polyphony_backend_close(VALUE self, VALUE io) {
-  return Backend_close(BACKEND(), io);
-}
+// VALUE Polyphony_backend_close(VALUE self, VALUE io) {
+//   return Backend_close(BACKEND(), io);
+// }
 
 void Init_Polyphony() {
   mPolyphony = rb_define_module("Polyphony");
@@ -153,7 +153,8 @@ void Init_Polyphony() {
   rb_define_singleton_method(mPolyphony, "backend_wait_io", Polyphony_backend_wait_io, 2);
   rb_define_singleton_method(mPolyphony, "backend_waitpid", Polyphony_backend_waitpid, 1);
   rb_define_singleton_method(mPolyphony, "backend_write", Polyphony_backend_write, -1);
-  rb_define_singleton_method(mPolyphony, "backend_close", Polyphony_backend_close, 1);
+  // rb_define_singleton_method(mPolyphony, "backend_close", Polyphony_backend_close, 1);
+  rb_define_singleton_method(mPolyphony, "backend_verify_blocking_mode", Backend_verify_blocking_mode, 2);
 
   rb_define_global_function("snooze", Polyphony_snooze, 0);
   rb_define_global_function("suspend", Polyphony_suspend, 0);

data/ext/polyphony/polyphony.h

@@ -10,7 +10,8 @@
 // debugging
 #define OBJ_ID(obj) (NUM2LONG(rb_funcall(obj, rb_intern("object_id"), 0)))
 #define INSPECT(str, obj) { printf(str); VALUE s = rb_funcall(obj, rb_intern("inspect"), 0); printf(": %s\n", StringValueCStr(s)); }
-#define TRACE_CALLER() { VALUE c = rb_funcall(rb_mKernel, rb_intern("caller"), 0); INSPECT("caller: ", c); }
+#define CALLER() rb_funcall(rb_mKernel, rb_intern("caller"), 0)
+#define TRACE_CALLER() INSPECT("caller: ", CALLER())
 #define TRACE_C_STACK() { \
   void *entries[10]; \
   size_t size = backtrace(entries, 10); \
@@ -73,7 +74,7 @@ void Fiber_make_runnable(VALUE fiber, VALUE value);
 
 VALUE Queue_push(VALUE self, VALUE value);
 VALUE Queue_unshift(VALUE self, VALUE value);
-VALUE Queue_shift(VALUE self);
+VALUE Queue_shift(int argc,VALUE *argv, VALUE self);
 VALUE Queue_shift_all(VALUE self);
 
 void Runqueue_push(VALUE self, VALUE fiber, VALUE value, int reschedule);
@@ -113,7 +114,7 @@ VALUE Backend_wait_event(VALUE self, VALUE raise);
 VALUE Backend_wait_io(VALUE self, VALUE io, VALUE write);
 VALUE Backend_waitpid(VALUE self, VALUE pid);
 VALUE Backend_write_m(int argc, VALUE *argv, VALUE self);
-VALUE Backend_close(VALUE self, VALUE io);
+// VALUE Backend_close(VALUE self, VALUE io);
 
 VALUE Backend_poll(VALUE self, VALUE blocking);
 VALUE Backend_wait_event(VALUE self, VALUE raise_on_exception);

data/ext/polyphony/queue.c

@@ -2,6 +2,7 @@
 #include "ring_buffer.h"
 
 typedef struct queue {
+  unsigned int closed;
   ring_buffer values;
   ring_buffer shift_queue;
   ring_buffer push_queue;
@@ -9,6 +10,8 @@ typedef struct queue {
 } Queue_t;
 
 VALUE cQueue = Qnil;
+VALUE cClosedQueueError = Qnil;
+VALUE cThreadError = Qnil;
 
 static void Queue_mark(void *ptr) {
   Queue_t *queue = ptr;
@@ -49,6 +52,7 @@ static VALUE Queue_initialize(int argc, VALUE *argv, VALUE self) {
   Queue_t *queue;
   GetQueue(self, queue);
 
+  queue->closed = 0;
   ring_buffer_init(&queue->values);
   ring_buffer_init(&queue->shift_queue);
   ring_buffer_init(&queue->push_queue);
@@ -99,6 +103,9 @@ VALUE Queue_push(VALUE self, VALUE value) {
   Queue_t *queue;
   GetQueue(self, queue);
 
+  if (queue->closed)
+    rb_raise(cClosedQueueError, "queue closed");
+
   if (queue->capacity) capped_queue_block_push(queue);
 
   queue_schedule_first_blocked_fiber(&queue->shift_queue);
@@ -111,6 +118,9 @@ VALUE Queue_unshift(VALUE self, VALUE value) {
   Queue_t *queue;
   GetQueue(self, queue);
 
+  if (queue->closed)
+    rb_raise(cClosedQueueError, "queue closed");
+
   if (queue->capacity) capped_queue_block_push(queue);
 
   queue_schedule_first_blocked_fiber(&queue->shift_queue);
@@ -119,14 +129,25 @@ VALUE Queue_unshift(VALUE self, VALUE value) {
   return self;
 }
 
-VALUE Queue_shift(VALUE self) {
-  Queue_t *queue;
+VALUE Queue_shift_nonblock(Queue_t *queue) {
+  if (queue->values.count) {
+    VALUE value = ring_buffer_shift(&queue->values);
+    if ((queue->capacity) && (queue->capacity > queue->values.count))
+      queue_schedule_first_blocked_fiber(&queue->push_queue);
+    RB_GC_GUARD(value);
+    return value;
+  }
+  rb_raise(cThreadError, "queue empty");
+}
+
+VALUE Queue_shift_block(Queue_t *queue) {
   VALUE fiber = rb_fiber_current();
   VALUE thread = rb_thread_current();
   VALUE backend = rb_ivar_get(thread, ID_ivar_backend);
   VALUE value;
 
-  GetQueue(self, queue);
+  if (queue->closed && !queue->values.count)
+    rb_raise(cClosedQueueError, "queue closed");
 
   while (1) {
     VALUE switchpoint_result;
@@ -140,6 +161,7 @@ VALUE Queue_shift(VALUE self) {
     RAISE_IF_EXCEPTION(switchpoint_result);
     RB_GC_GUARD(switchpoint_result);
     if (queue->values.count) break;
+    if (queue->closed) return Qnil;
   }
   value = ring_buffer_shift(&queue->values);
   if ((queue->capacity) && (queue->capacity > queue->values.count))
@@ -148,6 +170,16 @@ VALUE Queue_shift(VALUE self) {
   return value;
 }
 
+VALUE Queue_shift(int argc,VALUE *argv, VALUE self) {
+  int nonblock = argc && RTEST(argv[0]);
+  Queue_t *queue;
+  GetQueue(self, queue);
+
+  return nonblock ?
+    Queue_shift_nonblock(queue) :
+    Queue_shift_block(queue);
+}
+
 VALUE Queue_delete(VALUE self, VALUE value) {
   Queue_t *queue;
   GetQueue(self, queue);
@@ -244,6 +276,13 @@ VALUE Queue_pending_p(VALUE self) {
   return (queue->shift_queue.count) ? Qtrue : Qfalse;
 }
 
+VALUE Queue_num_waiting(VALUE self) {
+  Queue_t *queue;
+  GetQueue(self, queue);
+
+  return INT2NUM(queue->shift_queue.count);
+}
+
 VALUE Queue_size_m(VALUE self) {
   Queue_t *queue;
   GetQueue(self, queue);
@@ -251,20 +290,54 @@ VALUE Queue_size_m(VALUE self) {
   return INT2NUM(queue->values.count);
 }
 
+VALUE Queue_closed_p(VALUE self) {
+  Queue_t *queue;
+  GetQueue(self, queue);
+
+  return (queue->closed) ? Qtrue : Qfalse;
+}
+
+VALUE Queue_close(VALUE self) {
+  Queue_t *queue;
+  GetQueue(self, queue);
+
+  if (queue->closed) goto end;
+  queue->closed = 1;
+
+  // release all fibers waiting on `#shift`
+  while (queue->shift_queue.count) {
+    VALUE fiber = ring_buffer_shift(&queue->shift_queue);
+    if (fiber == Qnil) break;
+    Fiber_make_runnable(fiber, Qnil);
+  }
+
+end:
+  return self;
+}
+
 void Init_Queue() {
+  cClosedQueueError = rb_const_get(rb_cObject, rb_intern("ClosedQueueError"));
+  cThreadError = rb_const_get(rb_cObject, rb_intern("ThreadError"));
+
   cQueue = rb_define_class_under(mPolyphony, "Queue", rb_cObject);
   rb_define_alloc_func(cQueue, Queue_allocate);
 
   rb_define_method(cQueue, "initialize", Queue_initialize, -1);
   rb_define_method(cQueue, "push", Queue_push, 1);
   rb_define_method(cQueue, "<<", Queue_push, 1);
+  rb_define_method(cQueue, "enq", Queue_push, 1);
   rb_define_method(cQueue, "unshift", Queue_unshift, 1);
 
-  rb_define_method(cQueue, "shift", Queue_shift, 0);
-  rb_define_method(cQueue, "pop", Queue_shift, 0);
+  rb_define_method(cQueue, "shift", Queue_shift, -1);
+  rb_define_method(cQueue, "pop", Queue_shift, -1);
+  rb_define_method(cQueue, "deq", Queue_shift, -1);
+
   rb_define_method(cQueue, "delete", Queue_delete, 1);
   rb_define_method(cQueue, "clear", Queue_clear, 0);
 
+  rb_define_method(cQueue, "size", Queue_size_m, 0);
+  rb_define_method(cQueue, "length", Queue_size_m, 0);
+
   rb_define_method(cQueue, "cap", Queue_cap, 1);
   rb_define_method(cQueue, "capped?", Queue_capped_p, 0);
 
@@ -273,5 +346,8 @@ void Init_Queue() {
   rb_define_method(cQueue, "flush_waiters", Queue_flush_waiters, 1);
   rb_define_method(cQueue, "empty?", Queue_empty_p, 0);
   rb_define_method(cQueue, "pending?", Queue_pending_p, 0);
-  rb_define_method(cQueue, "size", Queue_size_m, 0);
+  rb_define_method(cQueue, "num_waiting", Queue_num_waiting, 0);
+
+  rb_define_method(cQueue, "closed?", Queue_closed_p, 0);
+  rb_define_method(cQueue, "close", Queue_close, 0);
 }

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/core/debug.rb

@@ -6,6 +6,8 @@ module ::Kernel
   def format_trace(args)
     if args.size > 1 && args.first.is_a?(String)
       format("%s: %p\n", args.shift, args.size == 1 ? args.first : args)
+    elsif args.size == 1 && args.first.is_a?(String)
+      "#{args.first}\n"
     else
       format("%p\n", args.size == 1 ? args.first : args)
     end

data/lib/polyphony/extensions/fiber.rb

@@ -248,13 +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
-        block.call
+        result = block.call
       rescue Exception => e
         Thread.current.schedule_and_wakeup(Thread.main.main_fiber, e)
+        result = e
+      ensure
+        Thread.backend.trace(:fiber_terminate, Fiber.current, result)
+        suspend
       end
-      Thread.current.schedule_and_wakeup(f, nil)
+      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
+      fiber.set_caller(["#{location.join(':')}"])
     end
   end
 
@@ -449,7 +463,7 @@ class ::Fiber
 
   extend Polyphony::FiberControlClassMethods
 
-  attr_accessor :tag, :thread, :parent
+  attr_accessor :tag, :thread, :parent, :oob
   attr_reader :result
 
   def running?
@@ -466,7 +480,11 @@ class ::Fiber
   alias_method :to_s, :inspect
 
   def location
-    @caller ? @caller[0] : '(root)'
+    if @oob
+      "#{@caller[0]} (oob)"
+    else
+      @caller ? @caller[0] : '(root)'
+    end
   end
 
   def caller
@@ -478,6 +496,10 @@ class ::Fiber
     end
   end
 
+  def set_caller(o)
+    @caller = o
+  end
+
   def main?
     @main
   end

data/lib/polyphony/extensions/openssl.rb

@@ -38,8 +38,10 @@ class ::OpenSSL::SSL::SSLSocket
 
   alias_method :orig_sysread, :sysread
   def sysread(maxlen, buf = +'')
+    # ensure socket is non blocking
+    Polyphony.backend_verify_blocking_mode(io, false)
     while true
-      case (result = read_nonblock(maxlen, buf, exception: false))
+      case (result = sysread_nonblock(maxlen, buf, exception: false))
       when :wait_readable then Polyphony.backend_wait_io(io, false)
       when :wait_writable then Polyphony.backend_wait_io(io, true)
       else return result
@@ -49,6 +51,8 @@ class ::OpenSSL::SSL::SSLSocket
 
   alias_method :orig_syswrite, :syswrite
   def syswrite(buf)
+    # ensure socket is non blocking
+    Polyphony.backend_verify_blocking_mode(io, false)
     while true
       case (result = write_nonblock(buf, exception: false))
       when :wait_readable then Polyphony.backend_wait_io(io, false)

data/lib/polyphony/extensions/socket.rb

@@ -124,12 +124,9 @@ class ::TCPSocket
     new(*args)
   end
 
-  def address_family(host)
-    host =~ /\:\:/ ? Socket::AF_INET6 : Socket::AF_INET
-  end
-
   def initialize(remote_host, remote_port, local_host = nil, local_port = nil)
-    @io = Socket.new address_family(remote_host), Socket::SOCK_STREAM
+    remote_addr = Addrinfo.tcp(remote_host, remote_port)
+    @io = Socket.new remote_addr.afamily, Socket::SOCK_STREAM
     if local_host && local_port
       addr = Addrinfo.tcp(local_host, local_port)
       @io.bind(addr)
@@ -231,13 +228,10 @@ end
 
 # Override stock TCPServer code by encapsulating a Socket instance.
 class ::TCPServer
-  def address_family(host)
-    host =~ /\:\:/ ? Socket::AF_INET6 : Socket::AF_INET
-  end
-
   def initialize(hostname = nil, port = 0)
-    @io = Socket.new address_family(hostname), Socket::SOCK_STREAM
-    @io.bind(Addrinfo.tcp(hostname, port))
+    addr = Addrinfo.tcp(hostname, port)
+    @io = Socket.new addr.afamily, Socket::SOCK_STREAM
+    @io.bind(addr)
     @io.listen(0)
   end
 

data/lib/polyphony/version.rb

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

data/lib/polyphony.rb

@@ -41,6 +41,8 @@ module Polyphony
         run_forked_block(&block)
       rescue SystemExit
         # fall through to ensure
+      rescue Polyphony::MoveOn
+        exit!
       rescue Exception => e
         STDERR << e.full_message
         exit!

data/test/helper.rb

@@ -21,10 +21,6 @@ IS_LINUX = RUBY_PLATFORM =~ /linux/
 #   Minitest::Reporters::SpecReporter.new
 # ]
 
-class ::Fiber
-  attr_writer :auto_watcher
-end
-
 module ::Kernel
   def trace(*args)
     STDOUT.orig_write(format_trace(args))
@@ -50,16 +46,16 @@ 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}"
       exit!
     end
-    Fiber.current.instance_variable_set(:@auto_watcher, nil)
   rescue => e
     puts e
     puts e.backtrace.join("\n")

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_queue.rb

@@ -21,6 +21,44 @@ class QueueTest < MiniTest::Test
     assert_equal [1, 2, 3, 4], buf
   end
 
+  def test_chained_push
+    @queue << 5 << 6 << 7
+
+    buf = []
+    3.times { buf << @queue.shift }
+    assert_equal [5, 6, 7], buf
+  end
+
+  def test_push_aliases
+    @queue.push 1
+    @queue << 2
+    @queue.enq 3
+
+    buf = []
+    3.times { buf << @queue.shift }
+    assert_equal [1, 2, 3], buf
+  end
+
+  def test_pop_aliases
+    @queue << 1 << 2 << 3
+
+    assert_equal 1, @queue.pop
+    assert_equal 2, @queue.deq
+    assert_equal 3, @queue.shift
+
+    @queue << 1 << 2 << 3
+
+    assert_equal 1, @queue.pop(false)
+    assert_equal 2, @queue.deq(false)
+    assert_equal 3, @queue.shift(false)
+  end
+
+  def test_nonblocking_pop
+    assert_raises(ThreadError) { @queue.pop(true) }
+    assert_raises(ThreadError) { @queue.deq(true) }
+    assert_raises(ThreadError) { @queue.shift(true) }
+  end
+
   def test_unshift
     @queue.push 1
     @queue.push 2
@@ -112,22 +150,86 @@ class QueueTest < MiniTest::Test
 
   def test_queue_size
     assert_equal 0, @queue.size
+    assert_equal 0, @queue.length
 
     @queue.push 1
 
     assert_equal 1, @queue.size
+    assert_equal 1, @queue.length
 
     @queue.push 2
 
     assert_equal 2, @queue.size
+    assert_equal 2, @queue.length
 
     @queue.shift
 
     assert_equal 1, @queue.size
+    assert_equal 1, @queue.length
 
     @queue.shift
 
     assert_equal 0, @queue.size
+    assert_equal 0, @queue.length
+  end
+
+  def test_pending?
+    assert_equal false, @queue.pending?
+
+    buf = []
+    f = spin { buf << @queue.shift }
+    snooze
+    assert_equal true, @queue.pending?
+
+    @queue << 42
+    f.await
+    assert_equal [42], buf
+    assert_equal false, @queue.pending?
+  end
+
+  def test_num_waiting
+    assert_equal 0, @queue.num_waiting
+
+    f1 = spin { @queue.shift }
+    snooze # allow fiber to start
+    assert_equal 1, @queue.num_waiting
+
+    f2 = spin { @queue.shift }
+    snooze # allow fiber to start
+    assert_equal 2, @queue.num_waiting
+
+    @queue << 1
+    f1.await
+    assert_equal 1, @queue.num_waiting
+
+    @queue << 2
+    f2.await
+    assert_equal 0, @queue.num_waiting
+  end
+
+  def test_closed_queue
+    assert_equal false, @queue.closed?
+
+    buf = []
+    f = spin { buf << @queue.shift }
+    snooze # allow fiber to start
+
+    @queue.close
+    assert_equal true, @queue.closed?
+    cancel_after(1) { f.await }
+    assert_equal [nil], buf
+
+    assert_raises(ClosedQueueError) { @queue << 1 }
+    assert_raises(ClosedQueueError) { @queue.deq }
+    assert_raises(ThreadError) { @queue.pop(true) }
+
+    # test deq on closed non-empty queue
+    @queue = Polyphony::Queue.new
+    @queue << 42 << 43
+    @queue.close
+
+    assert_equal 42, @queue.deq(false)
+    assert_equal 43, @queue.deq(true)
   end
 end
 
@@ -246,4 +348,4 @@ class CappedQueueTest < MiniTest::Test
     a.join
     assert_equal [1, 2, 3, :d5, 4, :d8, 5], buffer
   end
-end
+end

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_supervise.rb

@@ -269,4 +269,31 @@ class SuperviseTest < MiniTest::Test
     snooze
     assert_equal [[f1, :foo], [f2, :bar]], buffer
   end
+
+  def test_detached_supervisor
+    buffer = []
+
+    s = nil
+    f = spin {
+      foo = spin do
+        sleep 0.1
+      ensure
+        buffer << :foo
+      end
+      bar = spin do
+        sleep 0.2
+      ensure
+        buffer << :bar
+      end
+
+      s = spin { supervise }.detach
+      Fiber.current.attach_all_children_to(s)
+
+      s.terminate(true)
+    }
+
+    f.await
+    s.await
+    assert_equal [:foo, :bar], buffer
+  end
 end

data/test/test_thread.rb

@@ -132,7 +132,7 @@ class ThreadTest < MiniTest::Test
     Thread.backend.trace_proc = proc {|*r| records << r }
     suspend
     assert_equal [
-      [:fiber_switchpoint, Fiber.current]
+      [:fiber_switchpoint, Fiber.current, ["#{__FILE__}:#{__LINE__ - 2}:in `test_that_suspend_returns_immediately_if_no_watchers'"] + caller]
     ], records
   ensure
     Thread.backend.trace_proc = nil

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

data/test/test_trace.rb

@@ -10,7 +10,7 @@ class TraceTest < MiniTest::Test
 
     assert_equal [
       [:fiber_schedule, Fiber.current, nil, false],
-      [:fiber_switchpoint, Fiber.current],
+      [:fiber_switchpoint, Fiber.current, ["#{__FILE__}:#{__LINE__ - 4}:in `test_tracing_enabled'"] + caller],
       [:fiber_run, Fiber.current, nil]
     ], events
   ensure
@@ -22,9 +22,15 @@ class TraceTest < MiniTest::Test
     Thread.backend.trace_proc = proc { |*e| events << e }
 
     f = spin { sleep 0; :byebye }
+    l0 = __LINE__ + 1
     suspend
     sleep 0
 
+    Thread.backend.trace_proc = nil
+    
+    # remove caller info for :fiber_switchpoint events
+    events.each {|e| e.pop if e[0] == :fiber_switchpoint }
+
     assert_equal [
       [:fiber_create, f],
       [:fiber_schedule, f, nil, false],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: '0.74'
+  version: '0.78'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-01 00:00:00.000000000 Z
+date: 2022-02-16 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