polyphony 0.73.1 → 0.77

data/ext/polyphony/backend_io_uring_context.c

@@ -17,6 +17,7 @@ const char *op_type_to_str(enum op_type type) {
   case OP_ACCEPT: return "ACCEPT";
   case OP_CONNECT: return "CONNECT";
   case OP_CHAIN: return "CHAIN";
+  case OP_CLOSE: return "CLOSE";
   default: return "";
   };
 }

data/ext/polyphony/backend_io_uring_context.h

@@ -15,7 +15,8 @@ enum op_type {
   OP_POLL,
   OP_ACCEPT,
   OP_CONNECT,
-  OP_CHAIN
+  OP_CHAIN,
+  OP_CLOSE
 };
 
 typedef struct op_context {

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;
@@ -697,10 +702,13 @@ VALUE Backend_connect(VALUE self, VALUE sock, VALUE host, VALUE port) {
   Backend_t *backend;
   struct libev_io watcher;
   rb_io_t *fptr;
-  struct sockaddr_in addr;
-  char *host_buf = StringValueCStr(host);
+  struct sockaddr *ai_addr;
+  int ai_addrlen;
   VALUE switchpoint_result = Qnil;
   VALUE underlying_sock = rb_ivar_get(sock, ID_ivar_io);
+
+  ai_addrlen = backend_getaddrinfo(host, port, &ai_addr);
+
   if (underlying_sock != Qnil) sock = underlying_sock;
 
   GetBackend(self, backend);
@@ -708,12 +716,8 @@ VALUE Backend_connect(VALUE self, VALUE sock, VALUE host, VALUE port) {
   io_verify_blocking_mode(fptr, sock, Qfalse);
   watcher.fiber = Qnil;
 
-  addr.sin_family = AF_INET;
-  addr.sin_addr.s_addr = inet_addr(host_buf);
-  addr.sin_port = htons(NUM2INT(port));
-
   backend->base.op_count++;
-  int result = connect(fptr->fd, (struct sockaddr *)&addr, sizeof(addr));
+  int result = connect(fptr->fd, ai_addr, ai_addrlen);
   if (result < 0) {
     int e = errno;
     if (e != EINPROGRESS) rb_syserr_fail(e, strerror(e));
@@ -1156,7 +1160,6 @@ noreturn VALUE Backend_timer_loop(VALUE self, VALUE interval) {
   while (1) {
     uint64_t now_ns = current_time_ns();
     if (next_time_ns == 0) next_time_ns = now_ns + interval_ns;
-    double sleep_duration = ((double)(next_time_ns - now_ns))/1e9;
 
     if (next_time_ns > now_ns) {
       double sleep_duration = ((double)(next_time_ns - now_ns))/1e9;
@@ -1370,7 +1373,7 @@ inline VALUE Backend_run_idle_tasks(VALUE self) {
   return self;
 }
 
-inline int splice_chunks_write(Backend_t *backend, int fd, VALUE str, struct libev_rw_io *watcher, VALUE *result) {
+static inline int splice_chunks_write(Backend_t *backend, int fd, VALUE str, struct libev_rw_io *watcher, VALUE *result) {
   char *buf = RSTRING_PTR(str);
   int len = RSTRING_LEN(str);
   int left = len;

data/ext/polyphony/event.c

@@ -59,14 +59,17 @@ VALUE Event_signal(int argc, VALUE *argv, VALUE self) {
 
 VALUE Event_await(VALUE self) {
   Event_t *event;
+  VALUE switchpoint_result;
+  VALUE backend;
+
   GetEvent(self, event);
 
   if (event->waiting_fiber != Qnil)
     rb_raise(rb_eRuntimeError, "Event is already awaited by another fiber");
 
-  VALUE backend = rb_ivar_get(rb_thread_current(), ID_ivar_backend);
+  backend = rb_ivar_get(rb_thread_current(), ID_ivar_backend);
   event->waiting_fiber = rb_fiber_current();
-  VALUE switchpoint_result = Backend_wait_event(backend, Qnil);
+  switchpoint_result = Backend_wait_event(backend, Qnil);
   event->waiting_fiber = Qnil;
 
   RAISE_IF_EXCEPTION(switchpoint_result);

data/ext/polyphony/polyphony.c

@@ -9,16 +9,18 @@ ID ID_clear;
 ID ID_each;
 ID ID_inspect;
 ID ID_invoke;
-ID ID_new;
 ID ID_ivar_blocking_mode;
 ID ID_ivar_io;
 ID ID_ivar_parked;
 ID ID_ivar_runnable;
 ID ID_ivar_running;
 ID ID_ivar_thread;
+ID ID_new;
+ID ID_raise;
 ID ID_size;
 ID ID_signal;
 ID ID_switch_fiber;
+ID ID_to_s;
 ID ID_transfer;
 ID ID_R;
 ID ID_W;
@@ -123,6 +125,10 @@ 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);
+// }
+
 void Init_Polyphony() {
   mPolyphony = rb_define_module("Polyphony");
 
@@ -147,6 +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_verify_blocking_mode", Backend_verify_blocking_mode, 2);
 
   rb_define_global_function("snooze", Polyphony_snooze, 0);
   rb_define_global_function("suspend", Polyphony_suspend, 0);
@@ -166,8 +174,10 @@ void Init_Polyphony() {
   ID_ivar_running       = rb_intern("@running");
   ID_ivar_thread        = rb_intern("@thread");
   ID_new                = rb_intern("new");
+  ID_raise              = rb_intern("raise");
   ID_signal             = rb_intern("signal");
   ID_size               = rb_intern("size");
   ID_switch_fiber       = rb_intern("switch_fiber");
+  ID_to_s               = rb_intern("to_s");
   ID_transfer           = rb_intern("transfer");
 }

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); \
@@ -57,6 +58,7 @@ extern ID ID_raise;
 extern ID ID_signal;
 extern ID ID_size;
 extern ID ID_switch_fiber;
+extern ID ID_to_s;
 extern ID ID_transfer;
 
 extern VALUE SYM_fiber_create;
@@ -112,6 +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_poll(VALUE self, VALUE blocking);
 VALUE Backend_wait_event(VALUE self, VALUE raise_on_exception);

data/ext/polyphony/queue.c

@@ -121,24 +121,27 @@ VALUE Queue_unshift(VALUE self, VALUE value) {
 
 VALUE Queue_shift(VALUE self) {
   Queue_t *queue;
-  GetQueue(self, 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);
 
   while (1) {
+    VALUE switchpoint_result;
+
     if (queue->values.count) Fiber_make_runnable(fiber, Qnil);
 
     ring_buffer_push(&queue->shift_queue, fiber);
-    VALUE switchpoint_result = Backend_wait_event(backend, Qnil);
+    switchpoint_result = Backend_wait_event(backend, Qnil);
     ring_buffer_delete(&queue->shift_queue, fiber);
 
     RAISE_IF_EXCEPTION(switchpoint_result);
     RB_GC_GUARD(switchpoint_result);
     if (queue->values.count) break;
   }
-  VALUE value = ring_buffer_shift(&queue->values);
+  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);
@@ -206,9 +209,11 @@ VALUE Queue_shift_each(VALUE self) {
 
 VALUE Queue_shift_all(VALUE self) {
   Queue_t *queue;
+  VALUE result;
+
   GetQueue(self, queue);
 
-  VALUE result = ring_buffer_shift_all(&queue->values);
+  result = ring_buffer_shift_all(&queue->values);
   if (queue->capacity) queue_schedule_blocked_fibers_to_capacity(queue);
   return result;
 }

data/ext/polyphony/runqueue_ring_buffer.c

@@ -24,9 +24,11 @@ inline void runqueue_ring_buffer_clear(runqueue_ring_buffer *buffer) {
 static runqueue_entry nil_runqueue_entry = {(Qnil), (Qnil)};
 
 inline runqueue_entry runqueue_ring_buffer_shift(runqueue_ring_buffer *buffer) {
+  runqueue_entry value;
+
   if (buffer->count == 0) return nil_runqueue_entry;
 
-  runqueue_entry value = buffer->entries[buffer->head];
+  value = buffer->entries[buffer->head];
   buffer->head = (buffer->head + 1) % buffer->size;
   buffer->count--;
   return value;

data/ext/polyphony/socket_extensions.c

@@ -17,10 +17,13 @@ VALUE Socket_double_chevron(VALUE self, VALUE msg) {
 }
 
 void Init_SocketExtensions() {
+  VALUE cSocket;
+  VALUE cTCPSocket;
+
   rb_require("socket");
 
-  VALUE cSocket = rb_const_get(rb_cObject, rb_intern("Socket"));
-  VALUE cTCPSocket = rb_const_get(rb_cObject, rb_intern("TCPSocket"));
+  cSocket = rb_const_get(rb_cObject, rb_intern("Socket"));
+  cTCPSocket = rb_const_get(rb_cObject, rb_intern("TCPSocket"));
 
   rb_define_method(cSocket, "send", Socket_send, 2);
   rb_define_method(cTCPSocket, "send", Socket_send, 2);

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

@@ -5,17 +5,40 @@ require_relative '../core/exceptions'
 module Polyphony
   # Fiber control API
   module FiberControl
+    # Returns the fiber's monitoring mailbox queue, used for receiving fiber
+    # monitoring messages.
+    #
+    # @return [Polyphony::Queue] Monitoring mailbox queue
     def monitor_mailbox
       @monitor_mailbox ||= Polyphony::Queue.new
     end
 
+    # call-seq:
+    #   fiber.stop(value = nil) -> fiber
+    #   Fiber.interrupt(value = nil) -> fiber
+    #
+    # Stops the fiber by raising a Polyphony::MoveOn exception. The given value
+    # will become the fiber's return value.
+    #
+    # @param value [any] Fiber's eventual return value
+    # @return [Fiber] fiber
     def interrupt(value = nil)
       return if @running == false
 
       schedule Polyphony::MoveOn.new(value)
+      self
     end
     alias_method :stop, :interrupt
 
+    # call-seq:
+    #   fiber.reset(value = nil) -> fiber
+    #   fiber.restart(value = nil) -> fiber
+    #
+    # Restarts the fiber, with the given value serving as the first value passed
+    # to the fiber's block.
+    #
+    # @param value [any] value passed to fiber block
+    # @return [Fiber] restarted fiber
     def restart(value = nil)
       raise "Can't restart main fiber" if @main
 
@@ -31,32 +54,58 @@ module Polyphony
     end
     alias_method :reset, :restart
 
+    # Stops a fiber by raising a Polyphony::Cancel exception.
+    #
+    # @return [Fiber] fiber
     def cancel
       return if @running == false
 
       schedule Polyphony::Cancel.new
+      self
     end
 
+    # Sets the graceful shutdown flag for the fiber.
+    #
+    # @param graceful [bool] Whether or not to perform a graceful shutdown
     def graceful_shutdown=(graceful)
       @graceful_shutdown = graceful
     end
 
+    # Returns the graceful shutdown flag for the fiber.
+    #
+    # @return [bool]
     def graceful_shutdown?
       @graceful_shutdown
     end
 
+    # Terminates the fiber, optionally setting the graceful shutdown flag.
+    #
+    # @param graceful [bool] Whether to perform a graceful shutdown
+    # @return [Fiber]
     def terminate(graceful = false)
       return if @running == false
 
       @graceful_shutdown = graceful
       schedule Polyphony::Terminate.new
+      self
     end
 
+    # call-seq:
+    #   fiber.raise(message) -> fiber
+    #   fiber.raise(exception_class) -> fiber
+    #   fiber.raise(exception_class, exception_message) -> fiber
+    #   fiber.raise(exception) -> fiber
+    #
+    # Raises an exception in the context of the fiber.
+    #
+    # @return [Fiber]
     def raise(*args)
       error = error_from_raise_args(args)
       schedule(error)
+      self
     end
 
+    # :no-doc:
     def error_from_raise_args(args)
       case (arg = args.shift)
       when String then RuntimeError.new(arg)
@@ -125,6 +174,9 @@ module Polyphony
     # return values for all terminated fibers. If any of the awaited fibers
     # terminates with an uncaught exception, `Fiber.await` will await all the
     # other fibers to terminate, then reraise the exception.
+    #
+    # @param *fibers [Array<Fiber>] fibers to wait for
+    # @return [Array<any>] return values of given fibers
     def await(*fibers)
       return [] if fibers.empty?
 
@@ -158,6 +210,12 @@ module Polyphony
     end
     alias_method :join, :await
 
+    # Waits for at least one of the given fibers to terminate, returning an
+    # array containing the first terminated fiber and its return value. If an
+    # exception occurs in one of the given fibers, it will be reraised.
+    #
+    # @param *fibers [Array<Fiber>] Fibers to wait for
+    # @return [Array] Array containing the first terminated fiber and its return value
     def select(*fibers)
       return nil if fibers.empty?
 
@@ -190,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
 
@@ -391,7 +463,7 @@ class ::Fiber
 
   extend Polyphony::FiberControlClassMethods
 
-  attr_accessor :tag, :thread, :parent
+  attr_accessor :tag, :thread, :parent, :oob
   attr_reader :result
 
   def running?
@@ -408,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
@@ -420,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

@@ -31,7 +31,7 @@ class ::Socket
   alias_method :orig_read, :read
   def read(maxlen = nil, buf = nil, buf_pos = 0)
     return Polyphony.backend_recv(self, buf, maxlen, buf_pos) if buf
-    return Polyphony.backend_recv(self, buf || +'', maxlen, 0) if maxlen
+    return Polyphony.backend_recv(self, +'', maxlen, 0) if maxlen
 
     buf = +''
     len = buf.bytesize
@@ -120,8 +120,13 @@ class ::TCPSocket
 
   attr_reader :io
 
+  def self.open(*args)
+    new(*args)
+  end
+
   def initialize(remote_host, remote_port, local_host = nil, local_port = nil)
-    @io = Socket.new Socket::AF_INET, 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)
@@ -167,7 +172,7 @@ class ::TCPSocket
   alias_method :orig_read, :read
   def read(maxlen = nil, buf = nil, buf_pos = 0)
     return Polyphony.backend_recv(self, buf, maxlen, buf_pos) if buf
-    return Polyphony.backend_recv(self, buf || +'', maxlen, 0) if maxlen
+    return Polyphony.backend_recv(self, +'', maxlen, 0) if maxlen
 
     buf = +''
     len = buf.bytesize
@@ -224,8 +229,9 @@ end
 # Override stock TCPServer code by encapsulating a Socket instance.
 class ::TCPServer
   def initialize(hostname = nil, port = 0)
-    @io = Socket.new Socket::AF_INET, 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
 
@@ -259,7 +265,7 @@ class ::UNIXSocket
   alias_method :orig_read, :read
   def read(maxlen = nil, buf = nil, buf_pos = 0)
     return Polyphony.backend_recv(self, buf, maxlen, buf_pos) if buf
-    return Polyphony.backend_recv(self, buf || +'', maxlen, 0) if maxlen
+    return Polyphony.backend_recv(self, +'', maxlen, 0) if maxlen
 
     buf = +''
     len = buf.bytesize

data/lib/polyphony/extensions/thread.rb

@@ -18,14 +18,20 @@ class ::Thread
   def execute
     # backend must be created in the context of the new thread, therefore it
     # cannot be created in Thread#initialize
-    @backend = Polyphony::Backend.new
+    raise_error = false
+    begin
+      @backend = Polyphony::Backend.new
+    rescue Exception => e
+      raise_error = true
+      raise e
+    end
     setup
     @ready = true
     result = @block.(*@args)
   rescue Polyphony::MoveOn, Polyphony::Terminate => e
     result = e.value
   rescue Exception => e
-    result = e
+    raise_error ? (raise e) : (result = e)
   ensure
     @ready = true
     finalize(result)
@@ -48,7 +54,7 @@ class ::Thread
       @result = result
       signal_waiters(result)
     end
-    @backend.finalize
+    @backend&.finalize
   end
 
   def signal_waiters(result)

data/lib/polyphony/version.rb

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

data/lib/polyphony.rb

@@ -2,11 +2,12 @@
 
 require 'fiber'
 require_relative './polyphony_ext'
-require_relative './polyphony/extensions'
+require_relative './polyphony/extensions/thread'
 
 Thread.current.setup_fiber_scheduling
 Thread.current.backend = Polyphony::Backend.new
 
+require_relative './polyphony/extensions'
 require_relative './polyphony/core/exceptions'
 require_relative './polyphony/core/global_api'
 require_relative './polyphony/core/resource_pool'
@@ -40,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