farce 0.4.0-x86-linux-gnu → 0.4.1-x86-linux-gnu

data/ext/farce/reactor.c

@@ -345,6 +345,9 @@ void fs_watch_io(fs_state *s, fs_wait *w, int fd, int events, int group, long in
     }
 }
 
+// Cancel the outstanding futex operation before its caller releases the word.
+static void fs_cancel_futex(VALUE self, fs_wait *w);
+
 // Finish a wait and remove its watches and ready-queue entry.
 // A pending receive must stop using the buffer before cleanup can continue.
 // Clear Ruby references and keep the fiber's slot available for its next wait.
@@ -352,6 +355,12 @@ VALUE fs_retire(VALUE self, VALUE token) {
     fs_state *s = fs_get(self); fs_wait *w = fs_lookup(s, token);
     if (!w) return Qnil;
     if (w->receive_pending) fs_cancel_receive(self, w);
+    if (w->futex_pending) {
+        // Logical cancellation must not discard the lookup required by the CQE.
+        // Suppress resumption first, then consume the original completion.
+        w->status = 2;
+        fs_cancel_futex(self, w);
+    }
     ready_remove(s, w);
     fs_watch *watch = w->watches;
     while (watch) {
@@ -381,6 +390,56 @@ VALUE fs_retire(VALUE self, VALUE token) {
     return Qnil;
 }
 
+// Select asynchronous futex parking only for an installed, live native ring.
+// External schedulers require a later integration instead of a duck-typed hook.
+bool containers_futex_scheduler_supported(VALUE scheduler) {
+#ifdef FARCE_HAVE_URING_FUTEX
+    if (NIL_P(scheduler) || !rb_typeddata_is_kind_of(scheduler, &fs_type)) return false;
+    fs_state *s = fs_get(scheduler);
+    return s->driver == FS_URING_DRIVER && s->ring_live && s->futex_supported &&
+        !s->closed && !s->stopping && s->owner == rb_thread_current() &&
+        s->active == rb_fiber_current() && rb_fiber_scheduler_get() == scheduler &&
+        containers_futex_available();
+#else
+    return false;
+#endif
+}
+
+typedef struct {
+    VALUE self, token, timeout;
+    containers_futex_t *word;
+} fs_futex_wait;
+
+// Submit and park using one suspension. The surrounding ensure retains the word
+// until the kernel request has completed, even if timer setup or parking raises.
+static VALUE futex_wait_body(VALUE data) {
+    fs_futex_wait *wait = (fs_futex_wait *)data;
+    fs_state *s = fs_get(wait->self);
+    fs_wait *w = fs_lookup(s, wait->token);
+    int error = fs_driver_futex(s, w, wait->word);
+    if (error) rb_syserr_fail(error, "scheduler futex submission");
+    return rb_funcall(wait->self, rb_intern("wait_with_timeout"), 3,
+        wait->token, wait->timeout, Qfalse);
+}
+
+static VALUE futex_wait_cleanup(VALUE data) {
+    fs_futex_wait *wait = (fs_futex_wait *)data;
+    return fs_retire(wait->self, wait->token);
+}
+
+bool containers_futex_scheduler_wait(VALUE scheduler, containers_futex_t *word, VALUE timeout) {
+    if (!containers_futex_scheduler_supported(scheduler)) return true;
+    fs_futex_wait wait = {scheduler, fs_arm(scheduler), timeout, word};
+    return RTEST(rb_ensure(futex_wait_body, (VALUE)&wait, futex_wait_cleanup, (VALUE)&wait));
+}
+
+// Expose the backend capability privately so native-path validation cannot pass
+// by silently exercising a descriptor fallback.
+static VALUE futex_supported(VALUE self) {
+    fs_state *s = fs_get(self);
+    return !s->closed && !s->stopping && s->futex_supported && containers_futex_available() ? Qtrue : Qfalse;
+}
+
 // Switch from the root to a ready fiber.
 // If a newly started child finishes, return control to its waiting parent
 // before returning to the root dispatcher.
@@ -600,6 +659,27 @@ static int snapshot_fallback(st_data_t key, st_data_t value, st_data_t arg) {
 // Wake-pipe events ask the dispatcher to return to Ruby policy code.
 static void accept_event(VALUE self, fs_event *e) {
     fs_state *s = fs_get(self);
+    if (e->generation & FS_FUTEX) {
+        fs_wait *w = fs_lookup(s, ULL2NUM(e->generation & ~FS_OPERATION));
+        if (!w) return;
+        w->futex_pending = 0;
+        int error = e->error < 0 ? -e->error : 0;
+        if (error == ENOSYS || error == EOPNOTSUPP) s->futex_supported = 0;
+        if (!w->status) {
+            if (error == ENOSYS || error == EOPNOTSUPP) {
+                // Retry with the now-disabled capability, rather than reporting
+                // a timeout to consumers that have not reached their deadline.
+                fs_resume(self, w->token, Qtrue, Qnil);
+            } else {
+                // Early notification is reported as EAGAIN. Other interruptions
+                // also return to the container's condition/deadline check.
+                if (error != EAGAIN && error != EINTR && error != ECANCELED)
+                    w->native_error = error;
+                fs_resume(self, w->token, Qtrue, Qnil);
+            }
+        }
+        return;
+    }
     if (e->generation & FS_RECEIVE) {
         fs_wait *w = fs_lookup(s, ULL2NUM(e->generation & ~FS_RECEIVE));
         if (!w) return;
@@ -660,36 +740,44 @@ static void poll_ready(VALUE self) {
     if (s->poll_error || s->selected_pending) s->policy_pending = 1;
 }
 
-// Cancel an io_uring receive and wait until the original operation has finished.
-// Keep the caller's buffer locked throughout, because a cancellation reply alone
-// does not prove the kernel has stopped writing to it.
-void fs_cancel_receive(VALUE self, fs_wait *w) {
+// Cancel an operation and consume its original CQE before releasing storage.
+// Cancellation acknowledgements use zero userdata, so a delayed acknowledgement
+// cannot refer to an operation record or a subsequently reused suspension.
+static void cancel_operation(VALUE self, fs_wait *w, uint64_t kind, int *pending) {
 #ifdef FARCE_URING
     fs_state *s = fs_get(self);
     struct io_uring_sqe *entry = io_uring_get_sqe(&s->ring);
     if (!entry) {
         int result;
         do { result = io_uring_submit(&s->ring); } while (result == -EINTR);
-        if (result < 0) rb_bug("cannot submit pending scheduler receive");
+        if (result < 0) rb_bug("cannot submit pending scheduler operation");
         entry = io_uring_get_sqe(&s->ring);
         if (!entry) rb_bug("cannot reserve scheduler cancellation");
     }
-    io_uring_prep_cancel64(entry, FS_RECEIVE | NUM2ULL(w->token), 0);
+    io_uring_prep_cancel64(entry, kind | NUM2ULL(w->token), 0);
     entry->user_data = 0;
-    // Wait for the original receive CQE, not just the cancellation CQE. No Ruby
-    // fiber runs here, and the caller's buffer remains locked throughout.
-    while (w->receive_pending) {
+    // Do not run fibers here. The caller's buffer or futex word stays alive
+    // until the original completion, rather than just the cancellation reply.
+    while (*pending) {
         int result = io_uring_submit_and_wait(&s->ring, 1);
-        if (result < 0 && result != -EINTR) rb_bug("cannot acknowledge scheduler receive cancellation");
+        if (result < 0 && result != -EINTR) rb_bug("cannot acknowledge scheduler cancellation");
         s->timeout = 0;
         fs_driver_poll(s);
-        if (s->poll_error && s->poll_error != EINTR) rb_bug("cannot drain scheduler receive cancellation");
+        if (s->poll_error && s->poll_error != EINTR) rb_bug("cannot drain scheduler cancellation");
         for (int i = 0; i < s->event_count; i++) accept_event(self, &s->events[i]);
         rearm_events(s);
     }
 #endif
 }
 
+void fs_cancel_receive(VALUE self, fs_wait *w) {
+    cancel_operation(self, w, FS_RECEIVE, &w->receive_pending);
+}
+
+static void fs_cancel_futex(VALUE self, fs_wait *w) {
+    cancel_operation(self, w, FS_FUTEX, &w->futex_pending);
+}
+
 // Call a helper for every active wait, skipping empty slots and idle fibers.
 static void each_wait(fs_state *s, int (*callback)(st_data_t, st_data_t, st_data_t), st_data_t arg) {
     for (uint32_t i = 0; i < s->slot_count; i++) {
@@ -836,6 +924,7 @@ void farce_init_fiber_scheduler(VALUE internal) {
     rb_define_private_method(klass, "retire_wait", fs_retire, 1);
     rb_define_private_method(klass, "register_select", register_select, 3);
     rb_define_private_method(klass, "ready?", ready, 0);
+    rb_define_private_method(klass, "futex_supported?", futex_supported, 0);
     rb_define_private_method(klass, "pending?", pending, 0);
     rb_define_private_method(klass, "pending_count", pending_count, 0);
     rb_define_private_method(klass, "wakeup", wakeup, 0);

data/ext/farce/reactor.h

@@ -1,6 +1,7 @@
 #ifndef FARCE_FIBER_REACTOR_H
 #define FARCE_FIBER_REACTOR_H
 #include "containers.h"
+#include "futex.h"
 #include <ruby/io.h>
 #include <ruby/io/buffer.h>
 #include <ruby/thread.h>
@@ -21,6 +22,8 @@
 #define FS_WRITE 4
 #define FS_EVENTS 1024
 #define FS_RECEIVE (UINT64_C(1) << 63)
+#define FS_FUTEX (UINT64_C(1) << 62)
+#define FS_OPERATION (FS_RECEIVE | FS_FUTEX)
 #define FS_SLOT_BITS 20
 #define FS_SLOT_MASK ((1U << FS_SLOT_BITS) - 1)
 
@@ -45,7 +48,7 @@ struct fs_reg {
 struct fs_wait {
     VALUE token, fiber, value, error, groups, ios;
     uint32_t slot;
-    int status, events, selected, queued, native_error, receive_pending;
+    int status, events, selected, queued, native_error, receive_pending, futex_pending;
     fs_wait *ready_next, *ready_prev;
     fs_watch *watches;
     fs_watch first_watch;
@@ -62,7 +65,7 @@ typedef struct {
     size_t pending;
     uint64_t serial, generation, suspensions;
     unsigned immediate;
-    int selected_pending, receive_disabled;
+    int selected_pending, receive_disabled, futex_supported;
     int driver, descriptor, wake[2], closed;
     pthread_mutex_t wake_mutex;
 #ifdef FARCE_URING
@@ -85,6 +88,7 @@ static inline fs_state *fs_get(VALUE self) {
 int fs_driver_init(fs_state *s, int driver);
 int fs_driver_update(fs_state *s, fs_reg *reg, int events);
 int fs_driver_receive(fs_state *s, fs_wait *w, int fd, void *buffer, size_t size);
+int fs_driver_futex(fs_state *s, fs_wait *w, containers_futex_t *word);
 void fs_cancel_receive(VALUE self, fs_wait *w);
 void fs_driver_close(fs_state *s);
 void *fs_driver_poll(void *data);

data/ext/farce/signal.c

@@ -1,21 +1,16 @@
 #include "containers.h"
-#include "ruby/io.h"
+#include "native_wait.h"
 
-#include <errno.h>
-#include <fcntl.h>
 #include <math.h>
 #include <stdint.h>
 #include <time.h>
-#include <unistd.h>
 
 static VALUE cSignal;
 
 typedef struct containers_signal_waiter containers_signal_waiter_t;
 
 struct containers_signal_waiter {
-    int read_fd;
-    int write_fd;
-    bool notified;
+    containers_waiter_t notification;
     containers_signal_waiter_t *next;
 };
 
@@ -66,34 +61,13 @@ containers_signal_parse_timeout(VALUE value)
     return timeout;
 }
 
-static void
-containers_signal_set_fd_flags(int fd)
-{
-#ifdef _WIN32
-    (void)fd;
-#else
-    int flags = fcntl(fd, F_GETFL, 0);
-    if (flags >= 0) (void)fcntl(fd, F_SETFL, flags | O_NONBLOCK);
-    flags = fcntl(fd, F_GETFD, 0);
-    if (flags >= 0) (void)fcntl(fd, F_SETFD, flags | FD_CLOEXEC);
-#endif
-}
-
-/* Called with signal->lock held. Each waiter has a separate descriptor, so a
- * single broadcast makes every scheduled Fiber or native thread runnable. */
+/* Called with signal->lock held. The notification remains latched while
+ * the waiting caller selects its parking backend outside the state mutex. */
 static void
 containers_signal_notify_waiters_locked(containers_signal_t *signal)
 {
-    unsigned char byte = 1;
     for (containers_signal_waiter_t *waiter = signal->waiters; waiter; waiter = waiter->next) {
-        if (waiter->notified) continue;
-        ssize_t result;
-        do {
-            result = write(waiter->write_fd, &byte, 1);
-        } while (result < 0 && errno == EINTR);
-        if (result == 1 || (result < 0 && (errno == EAGAIN || errno == EWOULDBLOCK))) {
-            waiter->notified = true;
-        }
+        (void)containers_waiter_notify(&waiter->notification);
     }
 }
 
@@ -112,7 +86,7 @@ containers_signal_memsize(const void *pointer)
 }
 
 static const rb_data_type_t containers_signal_type = {
-    .wrap_struct_name = "Ractor::Containers::Signal",
+    .wrap_struct_name = "Farce::Internal::Signal",
     .function = {
         .dmark = NULL,
         .dfree = containers_signal_free,
@@ -184,26 +158,14 @@ containers_signal_new(void)
     return containers_signal_initialize(signal);
 }
 
-static bool
-containers_signal_wait_for_descriptor(int fd, containers_signal_timeout_t *timeout)
-{
-    VALUE wait_timeout = Qnil;
-    if (timeout->finite) {
-        double remaining = timeout->deadline - containers_signal_monotonic_now();
-        if (remaining <= 0) return false;
-        wait_timeout = DBL2NUM(remaining);
-    }
-
-    return containers_wait_for_readable(fd, wait_timeout);
-}
-
 static VALUE
 containers_signal_wait_body(VALUE opaque)
 {
     containers_signal_wait_context_t *context = (containers_signal_wait_context_t *)opaque;
-    return containers_signal_wait_for_descriptor(context->waiter.read_fd, context->timeout)
-        ? Qtrue
-        : Qfalse;
+    return containers_waiter_wait(
+        &context->waiter.notification, &context->signal->lock,
+        context->timeout->finite, context->timeout->deadline, NULL
+    ) ? Qtrue : Qfalse;
 }
 
 static VALUE
@@ -220,8 +182,7 @@ containers_signal_wait_cleanup(VALUE opaque)
         }
     }
     pthread_mutex_unlock(&context->signal->lock);
-    close(context->waiter.read_fd);
-    close(context->waiter.write_fd);
+    containers_waiter_close(&context->waiter.notification);
     return Qnil;
 }
 
@@ -232,24 +193,12 @@ containers_signal_wait_once(
     containers_signal_timeout_t *timeout
 )
 {
-    int descriptors[2];
-    if (pipe(descriptors) != 0) {
-        pthread_mutex_unlock(&signal->lock);
-        rb_sys_fail("pipe");
-    }
-    containers_signal_set_fd_flags(descriptors[0]);
-    containers_signal_set_fd_flags(descriptors[1]);
-
     containers_signal_wait_context_t context = {
         .signal = signal,
-        .waiter = {
-            .read_fd = descriptors[0],
-            .write_fd = descriptors[1],
-            .notified = false,
-            .next = signal->waiters,
-        },
+        .waiter = {.next = signal->waiters},
         .timeout = timeout,
     };
+    containers_waiter_init(&context.waiter.notification);
     signal->waiters = &context.waiter;
     pthread_mutex_unlock(&signal->lock);
     return RTEST(rb_ensure(
@@ -330,6 +279,10 @@ containers_signal_wait(int argc, VALUE *argv, VALUE self)
             pthread_mutex_unlock(&signal->lock);
             return ULL2NUM(generation);
         }
+        if (timeout.finite && timeout.deadline <= containers_signal_monotonic_now()) {
+            pthread_mutex_unlock(&signal->lock);
+            return containers_signal_timeout_result();
+        }
         bool awakened = containers_signal_wait_once(signal, &timeout);
         pthread_mutex_lock(&signal->lock);
         if (!awakened && signal->generation == observed) {

data/ext/farce/tree_map.c

@@ -1,4 +1,5 @@
 #include "containers.h"
+#include "native_wait.h"
 #include "transaction.h"
 #include <ruby/atomic.h>
 #include <ruby/fiber/scheduler.h>
@@ -558,9 +559,7 @@ tc_map_store_unlocked(VALUE self, tc_map *map, VALUE key, VALUE value,
 typedef struct tc_core_map_waiter tc_core_map_waiter;
 
 struct tc_core_map_waiter {
-    int read_fd;
-    int write_fd;
-    bool notified;
+    containers_waiter_t notification;
     tc_core_map_waiter *next;
 };
 
@@ -787,40 +786,14 @@ typedef struct {
     tc_core_map_waiter waiter;
 } tc_core_map_fiber_wait;
 
-static void
-tc_core_map_set_fd_flags(int fd)
-{
-#ifdef _WIN32
-    (void)fd;
-#else
-    int flags = fcntl(fd, F_GETFL, 0);
-    if (flags >= 0) (void)fcntl(fd, F_SETFL, flags | O_NONBLOCK);
-    flags = fcntl(fd, F_GETFD, 0);
-    if (flags >= 0) (void)fcntl(fd, F_SETFD, flags | FD_CLOEXEC);
-#endif
-}
-
 /* Called with core->lock held. The waiter remains linked until its ensure
  * cleanup so an interrupt cannot leave a dangling stack pointer behind. */
 static void
 tc_core_map_notify_one_locked(tc_core_map *core)
 {
-    unsigned char byte = 1;
-
-    for (tc_core_map_waiter *waiter = core->waiters;
-         waiter != NULL;
-         waiter = waiter->next) {
-        ssize_t result;
-
-        if (waiter->notified) continue;
-        do {
-            result = write(waiter->write_fd, &byte, 1);
-        } while (result < 0 && errno == EINTR);
-        if (result == 1 ||
-            (result < 0 && (errno == EAGAIN || errno == EWOULDBLOCK))) {
-            waiter->notified = true;
-            return;
-        }
+    for (tc_core_map_waiter *waiter = core->waiters; waiter; waiter = waiter->next) {
+        if (waiter->notification.notified) continue;
+        if (containers_waiter_notify(&waiter->notification)) return;
     }
 }
 
@@ -828,7 +801,9 @@ static VALUE
 tc_core_map_fiber_wait_body(VALUE opaque)
 {
     tc_core_map_fiber_wait *wait = (tc_core_map_fiber_wait *)opaque;
-    return containers_wait_for_readable(wait->waiter.read_fd, Qnil) ? Qtrue : Qfalse;
+    return containers_waiter_wait(
+        &wait->waiter.notification, &wait->core->lock, false, 0, NULL
+    ) ? Qtrue : Qfalse;
 }
 
 static VALUE
@@ -851,9 +826,9 @@ tc_core_map_fiber_wait_cleanup(VALUE opaque)
     }
     /* Notification makes a waiter runnable, but does not reserve ownership.
      * Always pass the baton if a notified waiter leaves while ownerless,
-     * including cancellation after rb_io_wait returned but before the lock
+     * including cancellation after a wait returned but before the lock
      * acquisition loop claimed ownership. */
-    if (wait->waiter.notified &&
+    if (wait->waiter.notification.notified &&
         NIL_P(wait->core->owner_fiber) &&
         !tc_core_map_publication_busy(
             RUBY_ATOMIC_LOAD(wait->core->publication_state)
@@ -862,8 +837,7 @@ tc_core_map_fiber_wait_cleanup(VALUE opaque)
     }
     pthread_mutex_unlock(&wait->core->lock);
 
-    close(wait->waiter.read_fd);
-    close(wait->waiter.write_fd);
+    containers_waiter_close(&wait->waiter.notification);
     return Qnil;
 }
 
@@ -871,24 +845,11 @@ tc_core_map_fiber_wait_cleanup(VALUE opaque)
 static void
 tc_core_map_wait_once(tc_core_map *core)
 {
-    int descriptors[2];
-
-    if (pipe(descriptors) != 0) {
-        pthread_mutex_unlock(&core->lock);
-        rb_sys_fail("pipe");
-    }
-    tc_core_map_set_fd_flags(descriptors[0]);
-    tc_core_map_set_fd_flags(descriptors[1]);
-
     tc_core_map_fiber_wait wait = {
         .core = core,
-        .waiter = {
-            .read_fd = descriptors[0],
-            .write_fd = descriptors[1],
-            .notified = false,
-            .next = NULL,
-        },
+        .waiter = {.next = NULL},
     };
+    containers_waiter_init(&wait.waiter.notification);
 
     if (core->last_waiter != NULL) core->last_waiter->next = &wait.waiter;
     else core->waiters = &wait.waiter;
@@ -904,8 +865,8 @@ tc_core_map_wait_once(tc_core_map *core)
 }
 
 /* CRuby needs logical Fiber ownership rather than pthread ownership: multiple
- * scheduled Fibers can contend on the same native thread. Descriptor waits
- * let rb_io_wait park only the current Fiber while its owner resumes. */
+ * scheduled Fibers can contend on the same native thread. Native notifications
+ * park only the current Fiber while its owner resumes. */
 static void
 tc_core_map_lock(VALUE self, tc_core_map *core)
 {

data/ext/farce/unshareable.c

@@ -40,7 +40,7 @@ containers_marker_size(const void *pointer)
 }
 
 static const rb_data_type_t containers_pin_marker_type = {
-    .wrap_struct_name = "Ractor::Containers pin marker",
+    .wrap_struct_name = "Farce pin marker",
     .function = {
         .dmark = containers_marker_mark,
         .dfree = RUBY_TYPED_DEFAULT_FREE,

data/ext/farce/unsupported.c

@@ -1,6 +1,18 @@
-#include "ruby.h"
+#include "futex.h"
 
 void farce_init_fiber_scheduler(VALUE internal) {
     (void)internal;
     rb_raise(rb_eLoadError, "native Farce fiber scheduling requires epoll or kqueue; use the select implementation");
 }
+
+bool containers_futex_scheduler_supported(VALUE scheduler) {
+    (void)scheduler;
+    return false;
+}
+
+bool containers_futex_scheduler_wait(VALUE scheduler, containers_futex_t *word, VALUE timeout) {
+    (void)scheduler;
+    (void)word;
+    (void)timeout;
+    return true;
+}

data/ext/farce/vector.c

@@ -1,15 +1,13 @@
 #include "containers.h"
+#include "native_wait.h"
 #include "transaction.h"
-#include "ruby/io.h"
 #include "ruby/fiber/scheduler.h"
 
 #include <errno.h>
-#include <fcntl.h>
 #include <math.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <time.h>
-#include <unistd.h>
 
 #define VECTOR_INITIAL_CAPACITY 16
 static VALUE cVector;
@@ -19,9 +17,7 @@ static VALUE vector_transaction_marker;
 typedef struct vector_waiter vector_waiter_t;
 
 struct vector_waiter {
-    int read_fd;
-    int write_fd;
-    bool notified;
+    containers_waiter_t notification;
     vector_waiter_t *next;
 };
 
@@ -85,7 +81,7 @@ vector_memsize(const void *pointer)
 }
 
 static const rb_data_type_t vector_type = {
-    .wrap_struct_name = "Ractor::Containers::Vector",
+    .wrap_struct_name = "Farce::Internal::Vector",
     .function = {
         .dmark = vector_mark,
         .dfree = vector_free,
@@ -214,35 +210,14 @@ vector_timeout_keyword(VALUE keywords)
     return timeout;
 }
 
-static void
-vector_set_fd_flags(int fd)
-{
-#ifdef _WIN32
-    (void)fd;
-#else
-    int flags = fcntl(fd, F_GETFL, 0);
-    if (flags >= 0) (void)fcntl(fd, F_SETFL, flags | O_NONBLOCK);
-    flags = fcntl(fd, F_GETFD, 0);
-    if (flags >= 0) (void)fcntl(fd, F_SETFD, flags | FD_CLOEXEC);
-#endif
-}
-
-/* Called with vector->lock held. Each waiter has an independent pipe, so a
- * transition wakes every waiting thread or scheduled fiber. */
+/* Called with vector->lock held. A transition wakes every registered
+ * thread or fiber without sharing a consumable notification. */
 static void
 vector_notify_waiters_locked(vector_t *vector)
 {
-    unsigned char byte = 1;
     vector->generation++;
     for (vector_waiter_t *waiter = vector->waiters; waiter; waiter = waiter->next) {
-        if (waiter->notified) continue;
-        ssize_t result;
-        do {
-            result = write(waiter->write_fd, &byte, 1);
-        } while (result < 0 && errno == EINTR);
-        if (result == 1 || (result < 0 && (errno == EAGAIN || errno == EWOULDBLOCK))) {
-            waiter->notified = true;
-        }
+        (void)containers_waiter_notify(&waiter->notification);
     }
 }
 
@@ -259,23 +234,14 @@ typedef struct {
     vector_timeout_t *timeout;
 } vector_wait_context_t;
 
-static bool
-vector_wait_for_descriptor(int fd, vector_timeout_t *timeout)
-{
-    VALUE wait_timeout = Qnil;
-    if (timeout->finite) {
-        double remaining = timeout->deadline - vector_monotonic_now();
-        if (remaining <= 0) return false;
-        wait_timeout = DBL2NUM(remaining);
-    }
-    return containers_wait_for_readable(fd, wait_timeout);
-}
-
 static VALUE
 vector_wait_body(VALUE opaque)
 {
     vector_wait_context_t *context = (vector_wait_context_t *)opaque;
-    return vector_wait_for_descriptor(context->waiter.read_fd, context->timeout) ? Qtrue : Qfalse;
+    return containers_waiter_wait(
+        &context->waiter.notification, &context->vector->lock,
+        context->timeout->finite, context->timeout->deadline, NULL
+    ) ? Qtrue : Qfalse;
 }
 
 static VALUE
@@ -292,8 +258,7 @@ vector_wait_cleanup(VALUE opaque)
         }
     }
     pthread_mutex_unlock(&context->vector->lock);
-    close(context->waiter.read_fd);
-    close(context->waiter.write_fd);
+    containers_waiter_close(&context->waiter.notification);
     return Qnil;
 }
 
@@ -303,24 +268,12 @@ vector_wait_cleanup(VALUE opaque)
 static bool
 vector_wait_once(vector_t *vector, vector_timeout_t *timeout)
 {
-    int descriptors[2];
-    if (pipe(descriptors) != 0) {
-        pthread_mutex_unlock(&vector->lock);
-        rb_sys_fail("pipe");
-    }
-    vector_set_fd_flags(descriptors[0]);
-    vector_set_fd_flags(descriptors[1]);
-
     vector_wait_context_t context = {
         .vector = vector,
-        .waiter = {
-            .read_fd = descriptors[0],
-            .write_fd = descriptors[1],
-            .notified = false,
-            .next = vector->waiters,
-        },
+        .waiter = {.next = vector->waiters},
         .timeout = timeout,
     };
+    containers_waiter_init(&context.waiter.notification);
     vector->waiters = &context.waiter;
     pthread_mutex_unlock(&vector->lock);
     return RTEST(rb_ensure(vector_wait_body, (VALUE)&context, vector_wait_cleanup, (VALUE)&context));

data/ext/farce/weak_map.c

@@ -250,7 +250,7 @@ weak_map_memsize(const void *pointer)
 }
 
 static const rb_data_type_t weak_map_type = {
-    .wrap_struct_name = "Ractor::Containers::WeakMap",
+    .wrap_struct_name = "Farce::Internal::WeakMap",
     .function = {
         .dmark = weak_map_mark,
         .dfree = weak_map_free,

data/lib/farce/version.rb

@@ -4,5 +4,5 @@
 
 module Farce
   # @return [String] the current version of Farce
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end