polyphony 1.5 → 1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ec9aae8d4c83ff8dd3332187fdd12fc598596dc4bbab11eaad6400e61769684
-  data.tar.gz: a42cedfc33172dbacc4f61e16fa0a6fce3eb772e78e8829a2dfe744601c77b1c
+  metadata.gz: 9bed700ffe759bddcee9727be8e3c11d194f45fe44f05a0a879c92c7b221c6c5
+  data.tar.gz: 0f864fa278709cb00c6b2fae7e3725ef581b05f2b111661a7b5a8d4be1696346
 SHA512:
-  metadata.gz: 2f6c4a70a56c854dfaa707baeac665ed04adcf04a0f67c25419b2de50d367b155ed6aad3e6bb3dcdc6391af08f4a4dafc3afcadecc499f26cb4b5a06a5d0c69e
-  data.tar.gz: e8b74bd9dbec6a0d05e5510514ccff97792e04c0742e85624087eb92fe55d195b553288c0e3132ab468ba7a28a921ead91ce20ce26d6dab93f5b5a467f5f61bd
+  metadata.gz: e94ad30b3e9392f8afc0ae85a22afbe6ee6ab4b60c6fa1c412ab6d571d51ebec6e7bf8280106f6d0d7ad6c479dd8b6d748f4aed70b8dc2791f16a1d650fd7667
+  data.tar.gz: 2d8a3f5f2b9dd4d5107dedba344d5e4c46efc43546878779918997e3cb81c9087428e4872e70a631169a0b9d2ff3f1b8b745aa3668817a30475f921106b117e9

data/.rubocop.yml

@@ -81,6 +81,8 @@ Metrics/MethodLength:
   Exclude:
     - lib/polyphony/extensions/io.rb
     - lib/polyphony/extensions/fiber.rb
+    - lib/polyphony/extensions/thread.rb
+    - lib/polyphony/adapters/open3.rb
     - test/**/*.rb
     - examples/**/*.rb
 
@@ -94,6 +96,7 @@ Metrics/ClassLength:
     - lib/polyphony/extensions/io.rb
     - lib/polyphony/extensions/fiber.rb
     - lib/polyphony/extensions/object.rb
+    - lib/polyphony/extensions/thread.rb
     - test/**/*.rb
     - examples/**/*.rb
 

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 1.6 2023-08-05
+
+- Refactor exception instantiation
+- Fix race condition in `Thread#join`
+- Fix race condition in `Event` class
+- Add support for open3 API
+- Update liburing to version 2.4
+- Various fixes to `IO` instance methods
+- Fix `IO#double_splice` on non-Linux OSes
+- Implement `IO.copy_stream`
+- Add `Fiber#value` as alias to `Fiber#await`
+- Implement fiber-aware `Monitor` class (#113)
+- Implement Thread#value
+
 ## 1.5 2023-07-28
 
 - Refactor backend_await in io_uring backend

data/TODO.md

@@ -1,6 +1,3 @@
-- Look at RPC benchmark more closely: is there a way to reduce the overhead of
-  the `backend_base_switch_fiber` function?
-
 - io_uring backend:
   - if `io_uring_get_sqe` returns null, call `io_uring_submit`, (snooze fiber)?
     and try again
@@ -25,7 +22,6 @@
 
 ## Roadmap for Polyphony 2
 
-- allow backend selection at runtime?
 - Debugging
   - Eat your own dogfood: need a good tool to check what's going on when some
     test fails

data/ext/polyphony/backend_io_uring.c

@@ -186,10 +186,30 @@ static void handle_multishot_accept_completion(op_context_t *ctx, struct io_urin
   }
 }
 
+static void handle_multishot_timeout_completion(
+  op_context_t *ctx, struct io_uring_cqe *cqe, Backend_t *backend
+)
+{
+  if (ctx->result == -ECANCELED) {
+    context_store_release(&backend->store, ctx);
+  }
+  else {
+    int has_more = cqe->flags & IORING_CQE_F_MORE;
+    if (!has_more) {
+      context_store_release(&backend->store, ctx);
+    }
+    if (ctx->fiber) {
+      Fiber_make_runnable(ctx->fiber, has_more ? Qtrue : Qnil);
+    }
+  }
+}
+
 static void handle_multishot_completion(op_context_t *ctx, struct io_uring_cqe *cqe, Backend_t *backend) {
   switch (ctx->type) {
     case OP_MULTISHOT_ACCEPT:
       return handle_multishot_accept_completion(ctx, cqe, backend);
+    case OP_MULTISHOT_TIMEOUT:
+      return handle_multishot_timeout_completion(ctx, cqe, backend);
     default:
       printf("Unexpected multishot completion for op type %d\n", ctx->type);
   }
@@ -199,6 +219,12 @@ static inline void io_uring_backend_handle_completion(struct io_uring_cqe *cqe,
   op_context_t *ctx = io_uring_cqe_get_data(cqe);
   if (!ctx) return;
 
+  // if (ctx->type == OP_TIMEOUT) {
+  //   double now = current_time_ns() / 1e9;
+  //   double elapsed = now - ctx->ts;
+  //   printf("%13.6f CQE timeout %p:%d (elapsed: %9.6f)\n", now, ctx, ctx->id, elapsed);
+  // }
+
   // printf("cqe ctx %p id: %d result: %d (%s, ref_count: %d)\n", ctx, ctx->id, cqe->res, op_type_to_str(ctx->type), ctx->ref_count);
   ctx->result = cqe->res;
   if (ctx->ref_count == MULTISHOT_REFCOUNT) {
@@ -663,6 +689,7 @@ VALUE Backend_writev(VALUE self, VALUE io, int argc, VALUE *argv) {
     result = io_uring_backend_defer_submit_and_await(self, backend, sqe, ctx, &resume_value);
     completed = context_store_release(&backend->store, ctx);
     if (!completed) {
+      TRACE_FREE(iov);
       free(iov);
       context_attach_buffers(ctx, argc, argv);
       RAISE_IF_EXCEPTION(resume_value);
@@ -671,6 +698,7 @@ VALUE Backend_writev(VALUE self, VALUE io, int argc, VALUE *argv) {
     RB_GC_GUARD(resume_value);
 
     if (result < 0) {
+      TRACE_FREE(iov);
       free(iov);
       rb_syserr_fail(-result, strerror(-result));
     }
@@ -693,6 +721,7 @@ VALUE Backend_writev(VALUE self, VALUE io, int argc, VALUE *argv) {
     }
   }
 
+  TRACE_FREE(iov);
   free(iov);
   return INT2FIX(total_written);
 }
@@ -1433,6 +1462,10 @@ int io_uring_backend_submit_timeout_and_await(VALUE self, Backend_t *backend, do
   struct io_uring_sqe *sqe = io_uring_backend_get_sqe(backend);
   op_context_t *ctx = context_store_acquire(&backend->store, OP_TIMEOUT);
 
+  // double now = current_time_ns() / 1e9;
+  // ctx->ts = now;
+  // printf("%13.6f SQE timeout %p:%d (%g)\n", now, ctx, ctx->id, duration);
+
   io_uring_prep_timeout(sqe, &ts, 0, 0);
   io_uring_backend_defer_submit_and_await(self, backend, sqe, ctx, resume_value);
   return context_store_release(&backend->store, ctx);
@@ -1572,7 +1605,7 @@ VALUE Backend_waitpid(VALUE self, VALUE pid) {
     else
       rb_syserr_fail(e, strerror(e));
   }
-  return rb_ary_new_from_args(2, INT2FIX(ret), INT2FIX(WEXITSTATUS(status)));
+  return rb_ary_new_from_args(2, INT2FIX(ret), INT2FIX(status));
 }
 
 /*

data/ext/polyphony/backend_io_uring_context.c

@@ -6,20 +6,23 @@
 
 const char *op_type_to_str(enum op_type type) {
   switch (type) {
-  case OP_ACCEPT:   return "ACCEPT";
-  case OP_CHAIN:    return "CHAIN";
-  case OP_CLOSE:    return "CLOSE";
-  case OP_CONNECT:  return "CONNECT";
-  case OP_POLL:     return "POLL";
-  case OP_READ:     return "READ";
-  case OP_RECV:     return "RECV";
-  case OP_RECVMSG:  return "RECVMSG";
-  case OP_SEND:     return "SEND";
-  case OP_SENDMSG:  return "SENDMSG";
-  case OP_SPLICE:   return "SPLICE";
-  case OP_TIMEOUT:  return "TIMEOUT";
-  case OP_WRITEV:   return "WRITEV";
-  case OP_WRITE:    return "WRITE";
+  case OP_ACCEPT:             return "ACCEPT";
+  case OP_CHAIN:              return "CHAIN";
+  case OP_CLOSE:              return "CLOSE";
+  case OP_CONNECT:            return "CONNECT";
+  case OP_POLL:               return "POLL";
+  case OP_READ:               return "READ";
+  case OP_RECV:               return "RECV";
+  case OP_RECVMSG:            return "RECVMSG";
+  case OP_SEND:               return "SEND";
+  case OP_SENDMSG:            return "SENDMSG";
+  case OP_SPLICE:             return "SPLICE";
+  case OP_TIMEOUT:            return "TIMEOUT";
+  case OP_WRITEV:             return "WRITEV";
+  case OP_WRITE:              return "WRITE";
+
+  case OP_MULTISHOT_ACCEPT:   return "ACCEPT MULTISHOT";
+  case OP_MULTISHOT_TIMEOUT:  return "ACCEPT MULTISHOT";
 
   default: return "";
   };
@@ -71,14 +74,15 @@ inline int context_store_release(op_context_store_t *store, op_context_t *ctx) {
 
   // If a multishot ctx is released, we pretend its ref count is 1, so it will
   // be returned to the store.
-  if (ctx->ref_count == MULTISHOT_REFCOUNT) {
-    ctx->ref_count = 1;
-  }
+  if (ctx->ref_count == MULTISHOT_REFCOUNT) ctx->ref_count = 1;
 
   ctx->ref_count--;
   if (ctx->ref_count) return 0;
 
-  if (ctx->buffer_count > 1) free(ctx->buffers);
+  if (ctx->buffer_count > 1) {
+    TRACE_FREE(ctx->buffers);
+    free(ctx->buffers);
+  }
 
   store->taken_count--;
   store->available_count++;
@@ -97,11 +101,13 @@ inline int context_store_release(op_context_store_t *store, op_context_t *ctx) {
 void context_store_free(op_context_store_t *store) {
   while (store->available) {
     op_context_t *next = store->available->next;
+    TRACE_FREE(store->available);
     free(store->available);
     store->available = next;
   }
   while (store->taken) {
     op_context_t *next = store->taken->next;
+    TRACE_FREE(store->taken);
     free(store->taken);
     store->taken = next;
   }

data/ext/polyphony/backend_io_uring_context.h

@@ -8,7 +8,6 @@ enum op_type {
   OP_CHAIN,
   OP_CLOSE,
   OP_CONNECT,
-  OP_MULTISHOT_ACCEPT,
   OP_NONE,
   OP_POLL,
   OP_READ,
@@ -19,7 +18,9 @@ enum op_type {
   OP_SPLICE,
   OP_TIMEOUT,
   OP_WRITEV,
-  OP_WRITE
+  OP_WRITE,
+  OP_MULTISHOT_ACCEPT,
+  OP_MULTISHOT_TIMEOUT
 };
 
 #define MULTISHOT_REFCOUNT 0xFFFF
@@ -36,6 +37,7 @@ typedef struct op_context {
   unsigned int      buffer_count;
   VALUE             buffer0;
   VALUE             *buffers;
+  double            ts; // timestamp for tracing
 } op_context_t;
 
 typedef struct op_context_store {

data/ext/polyphony/backend_libev.c

@@ -1325,7 +1325,7 @@ VALUE Backend_waitpid(VALUE self, VALUE pid) {
     int e = errno;
     rb_syserr_fail(e, strerror(e));
   }
-  return rb_ary_new_from_args(2, INT2FIX(ret), INT2FIX(WEXITSTATUS(status)));
+  return rb_ary_new_from_args(2, INT2FIX(ret), INT2FIX(status));
 }
 #else
 struct libev_child {
@@ -1336,10 +1336,7 @@ struct libev_child {
 #ifndef POLYPHONY_WINDOWS
 void Backend_child_callback(EV_P_ ev_child *w, int revents) {
   struct libev_child *watcher = (struct libev_child *)w;
-  int exit_status = WEXITSTATUS(w->rstatus);
-  VALUE status;
-
-  status = rb_ary_new_from_args(2, INT2FIX(w->rpid), INT2FIX(exit_status));
+  VALUE status = rb_ary_new_from_args(2, INT2FIX(w->rpid), INT2FIX(w->rstatus));
   Fiber_make_runnable(watcher->fiber, status);
 }
 #endif
@@ -1365,9 +1362,9 @@ VALUE Backend_waitpid(VALUE self, VALUE pid) {
   RB_GC_GUARD(watcher.fiber);
   RB_GC_GUARD(switchpoint_result);
   return switchpoint_result;
-#endif
+#endif // #ifdef POLYPHONY_WINDOWS
 }
-#endif
+#endif // #ifdef POLYPHONY_USE_PIDFD_OPEN
 
 void Backend_async_callback(EV_P_ ev_async *w, int revents) { }
 

data/ext/polyphony/event.c

@@ -3,6 +3,8 @@
 
 typedef struct event {
   VALUE waiting_fiber;
+  int signaled;
+  VALUE result;
 } Event_t;
 
 VALUE cEvent = Qnil;
@@ -10,6 +12,7 @@ VALUE cEvent = Qnil;
 static void Event_mark(void *ptr) {
   Event_t *event = ptr;
   rb_gc_mark(event->waiting_fiber);
+  rb_gc_mark(event->result);
 }
 
 static void Event_free(void *ptr) {
@@ -41,6 +44,8 @@ static VALUE Event_initialize(VALUE self) {
   GetEvent(self, event);
 
   event->waiting_fiber = Qnil;
+  event->signaled = 0;
+  event->result = Qnil;
 
   return self;
 }
@@ -50,10 +55,17 @@ VALUE Event_signal(int argc, VALUE *argv, VALUE self) {
   Event_t *event;
   GetEvent(self, event);
 
+  if (event->signaled) goto done;
+
+  event->signaled = 1;
+  event->result = value;
+
   if (event->waiting_fiber != Qnil) {
     Fiber_make_runnable(event->waiting_fiber, value);
     event->waiting_fiber = Qnil;
   }
+
+done:
   return self;
 }
 
@@ -67,10 +79,19 @@ VALUE Event_await(VALUE self) {
   if (event->waiting_fiber != Qnil)
     rb_raise(rb_eRuntimeError, "Event is already awaited by another fiber");
 
+  if (event->signaled) {
+    VALUE result = event->result;
+    event->signaled = 0;
+    event->result = Qnil;
+    return result;
+  }
+
   backend = rb_ivar_get(rb_thread_current(), ID_ivar_backend);
   event->waiting_fiber = rb_fiber_current();
   switchpoint_result = Backend_wait_event(backend, Qnil);
   event->waiting_fiber = Qnil;
+  event->signaled = 0;
+  event->result = Qnil;
 
   RAISE_IF_EXCEPTION(switchpoint_result);
   RB_GC_GUARD(backend);

data/ext/polyphony/extconf.rb

@@ -22,9 +22,10 @@ def get_config
   
   config[:kernel_version]     = combined_version
   config[:pidfd_open]         = combined_version > 503
+  config[:multishot_accept]   = combined_version >= 519
   config[:multishot_recv]     = combined_version >= 600
   config[:multishot_recvmsg]  = combined_version >= 600
-  config[:multishot_accept]   = combined_version >= 519
+  config[:multishot_timeout]  = combined_version >= 640
   config[:submit_all_flag]    = combined_version >= 518
   config[:coop_taskrun_flag]  = combined_version >= 519
 
@@ -62,21 +63,22 @@ end
 
 $defs << '-DPOLYPHONY_USE_PIDFD_OPEN' if config[:pidfd_open]
 if config[:io_uring]
-  $defs << "-DPOLYPHONY_BACKEND_LIBURING"
-  $defs << "-DPOLYPHONY_LINUX"
-  $defs << "-DPOLYPHONY_UNSET_NONBLOCK" if RUBY_VERSION =~ /^3/
-  $defs << "-DHAVE_IO_URING_PREP_MULTISHOT_ACCEPT" if config[:multishot_accept]
-  $defs << "-DHAVE_IO_URING_PREP_RECV_MULTISHOT" if config[:multishot_recv]
-  $defs << "-DHAVE_IO_URING_PREP_RECVMSG_MULTISHOT" if config[:multishot_recvmsg]
-  $defs << "-DHAVE_IORING_SETUP_SUBMIT_ALL" if config[:submit_all_flag]
-  $defs << "-DHAVE_IORING_SETUP_COOP_TASKRUN" if config[:coop_taskrun_flag]
-  $CFLAGS << " -Wno-pointer-arith"
+  $defs << '-DPOLYPHONY_BACKEND_LIBURING'
+  $defs << '-DPOLYPHONY_LINUX'
+  $defs << '-DPOLYPHONY_UNSET_NONBLOCK' if RUBY_VERSION =~ /^3/
+  $defs << '-DHAVE_IO_URING_PREP_MULTISHOT_ACCEPT'  if config[:multishot_accept]
+  $defs << '-DHAVE_IO_URING_PREP_RECV_MULTISHOT'    if config[:multishot_recv]
+  $defs << '-DHAVE_IO_URING_PREP_RECVMSG_MULTISHOT' if config[:multishot_recvmsg]
+  $defs << '-DHAVE_IO_URING_TIMEOUT_MULTISHOT'      if config[:multishot_timeout]
+  $defs << '-DHAVE_IORING_SETUP_SUBMIT_ALL'         if config[:submit_all_flag]
+  $defs << '-DHAVE_IORING_SETUP_COOP_TASKRUN'       if config[:coop_taskrun_flag]
+  $CFLAGS << ' -Wno-pointer-arith'
 else
-  $defs << "-DPOLYPHONY_BACKEND_LIBEV"
-  $defs << "-DPOLYPHONY_LINUX" if config[:linux]
-  $defs << "-DPOLYPHONY_WINDOWS" if config[:windows]
+  $defs << '-DPOLYPHONY_BACKEND_LIBEV'
+  $defs << '-DPOLYPHONY_LINUX' if config[:linux]
+  $defs << '-DPOLYPHONY_WINDOWS' if config[:windows]
 
-  $defs << "-DEV_STANDALONE" # prevent libev from assuming "config.h" exists
+  $defs << '-DEV_STANDALONE' # prevent libev from assuming "config.h" exists
 
   define_bool('EV_USE_EPOLL', have_header('sys/epoll.h'))
   define_bool('EV_USE_KQUEUE', have_header('sys/event.h') && have_header('sys/queue.h'))
@@ -88,10 +90,10 @@ else
 
   $defs << '-DHAVE_SYS_RESOURCE_H' if have_header('sys/resource.h')
 
-  $CFLAGS << " -Wno-comment"
-  $CFLAGS << " -Wno-unused-result"
-  $CFLAGS << " -Wno-dangling-else"
-  $CFLAGS << " -Wno-parentheses"
+  $CFLAGS << ' -Wno-comment'
+  $CFLAGS << ' -Wno-unused-result'
+  $CFLAGS << ' -Wno-dangling-else'
+  $CFLAGS << ' -Wno-parentheses'
 end
 
 $defs << '-DPOLYPHONY_PLAYGROUND' if ENV['POLYPHONY_PLAYGROUND']

data/ext/polyphony/fiber.c

@@ -3,7 +3,6 @@
 
 ID ID_ivar_auto_watcher;
 ID ID_ivar_mailbox;
-ID ID_ivar_result;
 ID ID_ivar_waiting_fibers;
 
 VALUE SYM_dead;
@@ -239,7 +238,6 @@ void Init_Fiber(void) {
 
   ID_ivar_auto_watcher    = rb_intern("@auto_watcher");
   ID_ivar_mailbox         = rb_intern("@mailbox");
-  ID_ivar_result          = rb_intern("@result");
   ID_ivar_waiting_fibers  = rb_intern("@waiting_fibers");
 
   SYM_spin                = ID2SYM(rb_intern("spin"));

data/ext/polyphony/polyphony.c

@@ -13,6 +13,7 @@ ID ID_ivar_blocking_mode;
 ID ID_ivar_io;
 ID ID_ivar_multishot_accept_queue;
 ID ID_ivar_parked;
+ID ID_ivar_result;
 ID ID_ivar_runnable;
 ID ID_ivar_running;
 ID ID_ivar_thread;
@@ -474,6 +475,7 @@ void Init_Polyphony(void) {
   ID_ivar_io                      = rb_intern("@io");
   ID_ivar_multishot_accept_queue  = rb_intern("@multishot_accept_queue");
   ID_ivar_parked                  = rb_intern("@parked");
+  ID_ivar_result                  = rb_intern("@result");
   ID_ivar_runnable                = rb_intern("@runnable");
   ID_ivar_running                 = rb_intern("@running");
   ID_ivar_thread                  = rb_intern("@thread");

data/ext/polyphony/polyphony.h

@@ -10,6 +10,7 @@
 #define INSPECT(str, obj) { printf(str); VALUE s = rb_funcall(obj, rb_intern("inspect"), 0); printf(": %s\n", StringValueCStr(s)); }
 #define CALLER() rb_funcall(rb_mKernel, rb_intern("caller"), 0)
 #define TRACE_CALLER() INSPECT("caller: ", CALLER())
+#define TRACE_FREE(ptr) //printf("Free %p %s:%d\n", ptr, __FILE__, __LINE__)
 
 // exceptions
 #define TEST_EXCEPTION(ret) (rb_obj_is_kind_of(ret, rb_eException) == Qtrue)
@@ -47,6 +48,7 @@ extern ID ID_ivar_blocking_mode;
 extern ID ID_ivar_io;
 extern ID ID_ivar_multishot_accept_queue;
 extern ID ID_ivar_parked;
+extern ID ID_ivar_result;
 extern ID ID_ivar_runnable;
 extern ID ID_ivar_running;
 extern ID ID_ivar_thread;
@@ -147,6 +149,9 @@ void Thread_schedule_fiber(VALUE thread, VALUE fiber, VALUE value);
 void Thread_schedule_fiber_with_priority(VALUE thread, VALUE fiber, VALUE value);
 VALUE Thread_switch_fiber(VALUE thread);
 
+VALUE Event_signal(int argc, VALUE *argv, VALUE event);
+VALUE Event_await(VALUE event);
+
 VALUE Polyphony_snooze(VALUE self);
 
 #endif /* POLYPHONY_H */

data/ext/polyphony/ring_buffer.c

@@ -10,6 +10,7 @@ void ring_buffer_init(ring_buffer *buffer) {
 }
 
 void ring_buffer_free(ring_buffer *buffer) {
+  TRACE_FREE(buffer->entries);
   free(buffer->entries);
 }
 

data/ext/polyphony/runqueue_ring_buffer.c

@@ -10,6 +10,7 @@ inline void runqueue_ring_buffer_init(runqueue_ring_buffer *buffer) {
 }
 
 inline void runqueue_ring_buffer_free(runqueue_ring_buffer *buffer) {
+  TRACE_FREE(buffer->entries);
   free(buffer->entries);
 }
 

data/ext/polyphony/thread.c

@@ -3,9 +3,12 @@
 
 ID ID_deactivate_all_watchers_post_fork;
 ID ID_ivar_backend;
+ID ID_ivar_done;
 ID ID_ivar_join_wait_queue;
 ID ID_ivar_main_fiber;
+ID ID_ivar_ready;
 ID ID_ivar_terminated;
+ID ID_ivar_waiters;
 ID ID_stop;
 
 /* :nop-doc: */
@@ -83,20 +86,80 @@ VALUE Thread_class_backend(VALUE _self) {
   return rb_ivar_get(rb_thread_current(), ID_ivar_backend);
 }
 
+
+VALUE Thread_done_p(VALUE self)
+{
+  return rb_ivar_get(self, ID_ivar_done);
+}
+
+VALUE Thread_kill_safe(VALUE self)
+{
+  static VALUE eTerminate = Qnil;
+  if (rb_ivar_get(self, ID_ivar_done) == Qtrue) return self;
+
+  if (eTerminate == Qnil)
+    eTerminate = rb_const_get(mPolyphony, rb_intern("Terminate"));
+
+  while (rb_ivar_get(self, ID_ivar_ready) != Qtrue)
+    rb_thread_schedule();
+
+  VALUE main_fiber = rb_ivar_get(self, ID_ivar_main_fiber);
+  VALUE exception = rb_funcall(eTerminate, ID_new, 0);
+  Thread_schedule_fiber(self, main_fiber, exception);
+  return self;
+}
+
+VALUE Thread_mark_as_done(VALUE self, VALUE result)
+{
+  rb_ivar_set(self, ID_ivar_done, Qtrue);
+  VALUE waiters = rb_ivar_get(self, ID_ivar_waiters);
+  if (waiters == Qnil) return self;
+
+  int len = RARRAY_LEN(waiters);
+  for (int i = 0; i < len; i++) {
+    VALUE waiter = RARRAY_AREF(waiters, i);
+    Event_signal(1, &result, waiter);
+  }
+  return self;
+}
+
+VALUE Thread_await_done(VALUE self)
+{
+  if (Thread_done_p(self) == Qtrue) return rb_ivar_get(self, ID_ivar_result);
+
+  VALUE waiter = Fiber_auto_watcher(rb_fiber_current());
+  VALUE waiters = rb_ivar_get(self, ID_ivar_waiters);
+  if (waiters == Qnil) {
+    waiters = rb_ary_new();
+    rb_ivar_set(self, ID_ivar_waiters, waiters);
+  }
+  rb_ary_push(waiters, waiter);
+
+  return Event_await(waiter);
+}
+
 void Init_Thread(void) {
   rb_define_method(rb_cThread, "setup_fiber_scheduling", Thread_setup_fiber_scheduling, 0);
   rb_define_method(rb_cThread, "schedule_and_wakeup", Thread_fiber_schedule_and_wakeup, 2);
   rb_define_method(rb_cThread, "switch_fiber", Thread_switch_fiber, 0);
   rb_define_method(rb_cThread, "fiber_unschedule", Thread_fiber_unschedule, 1);
 
+  rb_define_method(rb_cThread, "done?", Thread_done_p, 0);
+  rb_define_method(rb_cThread, "kill_safe", Thread_kill_safe, 0);
+  rb_define_method(rb_cThread, "mark_as_done", Thread_mark_as_done, 1);
+  rb_define_method(rb_cThread, "await_done", Thread_await_done, 0);
+
   rb_define_singleton_method(rb_cThread, "backend", Thread_class_backend, 0);
 
   rb_define_method(rb_cThread, "debug!", Thread_debug, 0);
 
   ID_deactivate_all_watchers_post_fork  = rb_intern("deactivate_all_watchers_post_fork");
   ID_ivar_backend                       = rb_intern("@backend");
+  ID_ivar_done                          = rb_intern("@done");
   ID_ivar_join_wait_queue               = rb_intern("@join_wait_queue");
   ID_ivar_main_fiber                    = rb_intern("@main_fiber");
+  ID_ivar_ready                         = rb_intern("@ready");
   ID_ivar_terminated                    = rb_intern("@terminated");
+  ID_ivar_waiters                       = rb_intern("@waiters");
   ID_stop                               = rb_intern("stop");
 }