io-event 0.1.0 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d311214a03ab6047c7ba6952dfeeef690a453d0bd661df5e5419f477832b3cbd
-  data.tar.gz: 51653482b73275b35b8ac590b5576d2d991170c463d540fd3e5b6dbd8c2d4555
+  metadata.gz: c0978ed0fd5d85399283cd8c4bb296f44662af2fad9a67e992000f3214898f5a
+  data.tar.gz: 154503dd7f0f52dc2ad166d262bb371f81fc60e148dd0c74eadb65051bc5e71f
 SHA512:
-  metadata.gz: e9f333103f29c2e2a69f1573fefb11c01a23d2cf9cc56e30343e9e9f9ec6f5bd5f44408a95cbdd84bf9350b7eb7e3d2ea57df92702a97407e49ab7a6006b9506
-  data.tar.gz: a35949d9fb40a0361b2627f3d998dfae230474a9fcb51f6361c0d3686560cc3d22749147e9a581dfc8f429ffd35b80d920a780400d66398e4de9c113d4122f8e
+  metadata.gz: a54cab01e6c314890284d9640e3404f6a34706402b2cbf6383bff69c6c341c0c84c56f64d1feebb46e875539e1baab95749ce7f41e5f15ae13af0d8b9e1e0c1a
+  data.tar.gz: 7b2891a70e1703616f104410d4f86898a5d9c2bfa6c8ecde0295bea1bfed6ee7efada50568bdf8f841e0360db370d209259f66f2cb17f97d2be47db8a1c2e101

data/ext/Makefile

@@ -139,8 +139,8 @@ target_prefix =
 LOCAL_LIBS = 
 LIBS =    
 ORIG_SRCS = 
-SRCS = $(ORIG_SRCS) event.c selector.c kqueue.c
-OBJS = event.o selector.o kqueue.o
+SRCS = $(ORIG_SRCS) event.c selector.c kqueue.c interrupt.c
+OBJS = event.o selector.o kqueue.o interrupt.o
 HDRS = $(srcdir)/extconf.h
 LOCAL_HDRS = 
 TARGET = IO_Event

data/ext/extconf.rb

@@ -48,6 +48,9 @@ if have_header('sys/event.h')
 	$srcs << "io/event/selector/kqueue.c"
 end
 
+have_header('sys/eventfd.h')
+$srcs << "io/event/interrupt.c"
+
 have_func("rb_io_descriptor")
 have_func("&rb_process_status_wait")
 have_func('rb_fiber_current')

data/ext/io/event/interrupt.c

@@ -0,0 +1,108 @@
+// Copyright, 2021, by Samuel G. D. Williams. <http://www.codeotaku.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+// static const int DEBUG = 0;
+
+#include "interrupt.h"
+#include <unistd.h>
+
+#include "selector/selector.h"
+
+#ifdef HAVE_SYS_EVENTFD_H
+#include <sys/eventfd.h>
+
+void IO_Event_Interrupt_open(struct IO_Event_Interrupt *interrupt)
+{
+	interrupt->descriptor = eventfd(0, EFD_CLOEXEC | EFD_NONBLOCK);
+	rb_update_max_fd(interrupt->descriptor);
+}
+
+void IO_Event_Interrupt_close(struct IO_Event_Interrupt *interrupt)
+{
+	close(interrupt->descriptor);
+}
+
+void IO_Event_Interrupt_signal(struct IO_Event_Interrupt *interrupt)
+{
+	uint64_t value = 1;
+	ssize_t result = write(interrupt->descriptor, &value, sizeof(value));
+	
+	if (result == -1) {
+		if (errno == EAGAIN || errno == EWOULDBLOCK) return;
+		
+		rb_sys_fail("IO_Event_Interrupt_signal:write");
+	}
+}
+
+void IO_Event_Interrupt_clear(struct IO_Event_Interrupt *interrupt)
+{
+	uint64_t value = 0;
+	ssize_t result = read(interrupt->descriptor, &value, sizeof(value));
+	
+	if (result == -1) {
+		if (errno == EAGAIN || errno == EWOULDBLOCK) return;
+		
+		rb_sys_fail("IO_Event_Interrupt_clear:read");
+	}
+}
+#else
+void IO_Event_Interrupt_open(struct IO_Event_Interrupt *interrupt)
+{
+#ifdef __linux__
+	pipe2(interrupt->descriptor, O_CLOEXEC | O_NONBLOCK);
+#else
+	pipe(interrupt->descriptor);
+	IO_Event_Selector_nonblock_set(interrupt->descriptor[0]);
+	IO_Event_Selector_nonblock_set(interrupt->descriptor[1]);
+#endif
+	
+	rb_update_max_fd(interrupt->descriptor[0]);
+	rb_update_max_fd(interrupt->descriptor[1]);
+}
+
+void IO_Event_Interrupt_close(struct IO_Event_Interrupt *interrupt)
+{
+	close(interrupt->descriptor[0]);
+	close(interrupt->descriptor[1]);
+}
+
+void IO_Event_Interrupt_signal(struct IO_Event_Interrupt *interrupt)
+{
+	ssize_t result = write(interrupt->descriptor[1], ".", 1);
+	
+	if (result == -1) {
+		if (errno == EAGAIN || errno == EWOULDBLOCK) return;
+		
+		rb_sys_fail("IO_Event_Interrupt_signal:write");
+	}
+}
+
+void IO_Event_Interrupt_clear(struct IO_Event_Interrupt *interrupt)
+{
+	char buffer[128];
+	ssize_t result = read(interrupt->descriptor[0], buffer, sizeof(buffer));
+	
+	if (result == -1) {
+		if (errno == EAGAIN || errno == EWOULDBLOCK) return;
+		
+		rb_sys_fail("IO_Event_Interrupt_clear:read");
+	}
+}
+#endif

data/ext/io/event/interrupt.h

@@ -0,0 +1,47 @@
+// Copyright, 2021, by Samuel G. D. Williams. <http://www.codeotaku.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#pragma once
+
+#include "extconf.h"
+
+#ifdef HAVE_SYS_EVENTFD_H
+struct IO_Event_Interrupt {
+	int descriptor;
+};
+
+inline int IO_Event_Interrupt_descriptor(struct IO_Event_Interrupt *interrupt) {
+	return interrupt->descriptor;
+}
+#else
+struct IO_Event_Interrupt {
+	int descriptor[2];
+};
+
+inline int IO_Event_Interrupt_descriptor(struct IO_Event_Interrupt *interrupt) {
+	return interrupt->descriptor[0];
+}
+#endif
+
+void IO_Event_Interrupt_open(struct IO_Event_Interrupt *interrupt);
+void IO_Event_Interrupt_close(struct IO_Event_Interrupt *interrupt);
+
+void IO_Event_Interrupt_signal(struct IO_Event_Interrupt *interrupt);
+void IO_Event_Interrupt_clear(struct IO_Event_Interrupt *interrupt);

data/ext/io/event/selector/epoll.c

@@ -26,6 +26,9 @@
 #include <errno.h>
 
 #include "pidfd.c"
+#include "../interrupt.h"
+
+static const int DEBUG = 0;
 
 static VALUE IO_Event_Selector_EPoll = Qnil;
 
@@ -34,6 +37,8 @@ enum {EPOLL_MAX_EVENTS = 64};
 struct IO_Event_Selector_EPoll {
 	struct IO_Event_Selector backend;
 	int descriptor;
+	int blocked;
+	struct IO_Event_Interrupt interrupt;
 };
 
 void IO_Event_Selector_EPoll_Type_mark(void *_data)
@@ -47,6 +52,8 @@ void close_internal(struct IO_Event_Selector_EPoll *data) {
 	if (data->descriptor >= 0) {
 		close(data->descriptor);
 		data->descriptor = -1;
+		
+		IO_Event_Interrupt_close(&data->interrupt);
 	}
 }
 
@@ -85,6 +92,21 @@ VALUE IO_Event_Selector_EPoll_allocate(VALUE self) {
 	return instance;
 }
 
+void IO_Event_Interrupt_add(struct IO_Event_Interrupt *interrupt, struct IO_Event_Selector_EPoll *data) {
+	int descriptor = IO_Event_Interrupt_descriptor(interrupt);
+	
+	struct epoll_event event = {
+		.events = EPOLLIN|EPOLLRDHUP,
+		.data = {.ptr = NULL},
+	};
+	
+	int result = epoll_ctl(data->descriptor, EPOLL_CTL_ADD, descriptor, &event);
+	
+	if (result == -1) {
+		rb_sys_fail("IO_Event_Interrupt_add:epoll_ctl");
+	}
+}
+
 VALUE IO_Event_Selector_EPoll_initialize(VALUE self, VALUE loop) {
 	struct IO_Event_Selector_EPoll *data = NULL;
 	TypedData_Get_Struct(self, struct IO_Event_Selector_EPoll, &IO_Event_Selector_EPoll_Type, data);
@@ -100,9 +122,19 @@ VALUE IO_Event_Selector_EPoll_initialize(VALUE self, VALUE loop) {
 		rb_update_max_fd(data->descriptor);
 	}
 	
+	IO_Event_Interrupt_open(&data->interrupt);
+	IO_Event_Interrupt_add(&data->interrupt, data);
+	
 	return self;
 }
 
+VALUE IO_Event_Selector_EPoll_loop(VALUE self) {
+	struct IO_Event_Selector_EPoll *data = NULL;
+	TypedData_Get_Struct(self, struct IO_Event_Selector_EPoll, &IO_Event_Selector_EPoll_Type, data);
+	
+	return data->backend.loop;
+}
+
 VALUE IO_Event_Selector_EPoll_close(VALUE self) {
 	struct IO_Event_Selector_EPoll *data = NULL;
 	TypedData_Get_Struct(self, struct IO_Event_Selector_EPoll, &IO_Event_Selector_EPoll_Type, data);
@@ -498,7 +530,9 @@ void * select_internal(void *_arguments) {
 
 static
 void select_internal_without_gvl(struct select_arguments *arguments) {
+	arguments->data->blocked = 1;
 	rb_thread_call_without_gvl(select_internal, (void *)arguments, RUBY_UBF_IO, 0);
+	arguments->data->blocked = 0;
 	
 	if (arguments->count == -1) {
 		rb_sys_fail("select_internal_without_gvl:epoll_wait");
@@ -525,29 +559,54 @@ VALUE IO_Event_Selector_EPoll_select(VALUE self, VALUE duration) {
 		.timeout = 0
 	};
 	
+	// Process any currently pending events:
 	select_internal_with_gvl(&arguments);
-
-	// If the ready list was empty and no events were processed:	
-	if (!ready && arguments.count == 0) {
+	
+	// If we:
+	// 1. Didn't process any ready fibers, and
+	// 2. Didn't process any events from non-blocking select (above), and
+	// 3. There are no items in the ready list,
+	// then we can perform a blocking select.
+	if (!ready && !arguments.count && !data->backend.ready) {
 		arguments.timeout = make_timeout(duration);
 		
 		if (arguments.timeout != 0) {
+			// Wait for events to occur
 			select_internal_without_gvl(&arguments);
 		}
 	}
 	
 	for (int i = 0; i < arguments.count; i += 1) {
-		VALUE fiber = (VALUE)arguments.events[i].data.ptr;
-		VALUE result = INT2NUM(arguments.events[i].events);
+		const struct epoll_event *event = &arguments.events[i];
+		if (DEBUG) fprintf(stderr, "-> ptr=%p events=%d\n", event->data.ptr, event->events);
 		
-		// fprintf(stderr, "-> fiber=%p descriptor=%d\n", (void*)fiber, events[i].data.fd);
-		
-		IO_Event_Selector_fiber_transfer(fiber, 1, &result);
+		if (event->data.ptr) {
+			VALUE fiber = (VALUE)event->data.ptr;
+			VALUE result = INT2NUM(event->events);
+			
+			IO_Event_Selector_fiber_transfer(fiber, 1, &result);
+		} else {
+			IO_Event_Interrupt_clear(&data->interrupt);
+		}
 	}
 	
 	return INT2NUM(arguments.count);
 }
 
+VALUE IO_Event_Selector_EPoll_wakeup(VALUE self) {
+	struct IO_Event_Selector_EPoll *data = NULL;
+	TypedData_Get_Struct(self, struct IO_Event_Selector_EPoll, &IO_Event_Selector_EPoll_Type, data);
+	
+	// If we are blocking, we can schedule a nop event to wake up the selector:
+	if (data->blocked) {
+		IO_Event_Interrupt_signal(&data->interrupt);
+		
+		return Qtrue;
+	}
+	
+	return Qfalse;
+}
+
 void Init_IO_Event_Selector_EPoll(VALUE IO_Event_Selector) {
 	IO_Event_Selector_EPoll = rb_define_class_under(IO_Event_Selector, "EPoll", rb_cObject);
 	rb_gc_register_mark_object(IO_Event_Selector_EPoll);
@@ -555,6 +614,8 @@ void Init_IO_Event_Selector_EPoll(VALUE IO_Event_Selector) {
 	rb_define_alloc_func(IO_Event_Selector_EPoll, IO_Event_Selector_EPoll_allocate);
 	rb_define_method(IO_Event_Selector_EPoll, "initialize", IO_Event_Selector_EPoll_initialize, 1);
 	
+	rb_define_method(IO_Event_Selector_EPoll, "loop", IO_Event_Selector_EPoll_loop, 0);
+	
 	rb_define_method(IO_Event_Selector_EPoll, "transfer", IO_Event_Selector_EPoll_transfer, 0);
 	rb_define_method(IO_Event_Selector_EPoll, "resume", IO_Event_Selector_EPoll_resume, -1);
 	rb_define_method(IO_Event_Selector_EPoll, "yield", IO_Event_Selector_EPoll_yield, 0);
@@ -564,6 +625,7 @@ void Init_IO_Event_Selector_EPoll(VALUE IO_Event_Selector) {
 	rb_define_method(IO_Event_Selector_EPoll, "ready?", IO_Event_Selector_EPoll_ready_p, 0);
 	
 	rb_define_method(IO_Event_Selector_EPoll, "select", IO_Event_Selector_EPoll_select, 1);
+	rb_define_method(IO_Event_Selector_EPoll, "wakeup", IO_Event_Selector_EPoll_wakeup, 0);
 	rb_define_method(IO_Event_Selector_EPoll, "close", IO_Event_Selector_EPoll_close, 0);
 	
 	rb_define_method(IO_Event_Selector_EPoll, "io_wait", IO_Event_Selector_EPoll_io_wait, 3);

data/ext/io/event/selector/epoll.h

@@ -20,6 +20,8 @@
 
 #pragma once
 
+#include <ruby.h>
+
 #define IO_EVENT_SELECTOR_EPOLL
 
 void Init_IO_Event_Selector_EPoll(VALUE IO_Event_Selector);

data/ext/io/event/selector/kqueue.c

@@ -33,6 +33,8 @@ enum {KQUEUE_MAX_EVENTS = 64};
 struct IO_Event_Selector_KQueue {
 	struct IO_Event_Selector backend;
 	int descriptor;
+	
+	int blocked;
 };
 
 void IO_Event_Selector_KQueue_Type_mark(void *_data)
@@ -80,6 +82,7 @@ VALUE IO_Event_Selector_KQueue_allocate(VALUE self) {
 	
 	IO_Event_Selector_initialize(&data->backend, Qnil);
 	data->descriptor = -1;
+	data->blocked = 0;
 	
 	return instance;
 }
@@ -103,6 +106,13 @@ VALUE IO_Event_Selector_KQueue_initialize(VALUE self, VALUE loop) {
 	return self;
 }
 
+VALUE IO_Event_Selector_KQueue_loop(VALUE self) {
+	struct IO_Event_Selector_KQueue *data = NULL;
+	TypedData_Get_Struct(self, struct IO_Event_Selector_KQueue, &IO_Event_Selector_KQueue_Type, data);
+	
+	return data->backend.loop;
+}
+
 VALUE IO_Event_Selector_KQueue_close(VALUE self) {
 	struct IO_Event_Selector_KQueue *data = NULL;
 	TypedData_Get_Struct(self, struct IO_Event_Selector_KQueue, &IO_Event_Selector_KQueue_Type, data);
@@ -561,7 +571,10 @@ void * select_internal(void *_arguments) {
 
 static
 void select_internal_without_gvl(struct select_arguments *arguments) {
+	arguments->data->blocked = 1;
+	
 	rb_thread_call_without_gvl(select_internal, (void *)arguments, RUBY_UBF_IO, 0);
+	arguments->data->blocked = 0;
 	
 	if (arguments->count == -1) {
 		rb_sys_fail("select_internal_without_gvl:kevent");
@@ -592,18 +605,23 @@ VALUE IO_Event_Selector_KQueue_select(VALUE self, VALUE duration) {
 		}
 	};
 	
+	arguments.timeout = &arguments.storage;
+	
 	// We break this implementation into two parts.
 	// (1) count = kevent(..., timeout = 0)
 	// (2) without gvl: kevent(..., timeout = 0) if count == 0 and timeout != 0
 	// This allows us to avoid releasing and reacquiring the GVL.
 	// Non-comprehensive testing shows this gives a 1.5x speedup.
-	arguments.timeout = &arguments.storage;
 	
 	// First do the syscall with no timeout to get any immediately available events:
 	select_internal_with_gvl(&arguments);
 	
-	// If there were no pending events, if we have a timeout, wait for more events:
-	if (!ready && arguments.count == 0) {
+	// If we:
+	// 1. Didn't process any ready fibers, and
+	// 2. Didn't process any events from non-blocking select (above), and
+	// 3. There are no items in the ready list,
+	// then we can perform a blocking select.
+	if (!ready && !arguments.count && !data->backend.ready) {
 		arguments.timeout = make_timeout(duration, &arguments.storage);
 		
 		if (!timeout_nonblocking(arguments.timeout)) {
@@ -614,15 +632,40 @@ VALUE IO_Event_Selector_KQueue_select(VALUE self, VALUE duration) {
 	}
 	
 	for (int i = 0; i < arguments.count; i += 1) {
-		VALUE fiber = (VALUE)arguments.events[i].udata;
-		VALUE result = INT2NUM(arguments.events[i].filter);
-		
-		IO_Event_Selector_fiber_transfer(fiber, 1, &result);
+		if (arguments.events[i].udata) {
+			VALUE fiber = (VALUE)arguments.events[i].udata;
+			VALUE result = INT2NUM(arguments.events[i].filter);
+			
+			IO_Event_Selector_fiber_transfer(fiber, 1, &result);
+		}
 	}
 	
 	return INT2NUM(arguments.count);
 }
 
+VALUE IO_Event_Selector_KQueue_wakeup(VALUE self) {
+	struct IO_Event_Selector_KQueue *data = NULL;
+	TypedData_Get_Struct(self, struct IO_Event_Selector_KQueue, &IO_Event_Selector_KQueue_Type, data);
+	
+	if (data->blocked) {
+		struct kevent trigger = {0};
+		
+		trigger.filter = EVFILT_USER;
+		trigger.flags = EV_ADD|EV_CLEAR;
+		trigger.fflags = NOTE_TRIGGER;
+		
+		int result = kevent(data->descriptor, &trigger, 1, NULL, 0, NULL);
+		
+		if (result == -1) {
+			rb_sys_fail("IO_Event_Selector_KQueue_wakeup:kevent");
+		}
+		
+		return Qtrue;
+	}
+	
+	return Qfalse;
+}
+
 void Init_IO_Event_Selector_KQueue(VALUE IO_Event_Selector) {
 	IO_Event_Selector_KQueue = rb_define_class_under(IO_Event_Selector, "KQueue", rb_cObject);
 	rb_gc_register_mark_object(IO_Event_Selector_KQueue);
@@ -630,6 +673,8 @@ void Init_IO_Event_Selector_KQueue(VALUE IO_Event_Selector) {
 	rb_define_alloc_func(IO_Event_Selector_KQueue, IO_Event_Selector_KQueue_allocate);
 	rb_define_method(IO_Event_Selector_KQueue, "initialize", IO_Event_Selector_KQueue_initialize, 1);
 	
+	rb_define_method(IO_Event_Selector_KQueue, "loop", IO_Event_Selector_KQueue_loop, 0);
+	
 	rb_define_method(IO_Event_Selector_KQueue, "transfer", IO_Event_Selector_KQueue_transfer, 0);
 	rb_define_method(IO_Event_Selector_KQueue, "resume", IO_Event_Selector_KQueue_resume, -1);
 	rb_define_method(IO_Event_Selector_KQueue, "yield", IO_Event_Selector_KQueue_yield, 0);
@@ -639,6 +684,7 @@ void Init_IO_Event_Selector_KQueue(VALUE IO_Event_Selector) {
 	rb_define_method(IO_Event_Selector_KQueue, "ready?", IO_Event_Selector_KQueue_ready_p, 0);
 	
 	rb_define_method(IO_Event_Selector_KQueue, "select", IO_Event_Selector_KQueue_select, 1);
+	rb_define_method(IO_Event_Selector_KQueue, "wakeup", IO_Event_Selector_KQueue_wakeup, 0);
 	rb_define_method(IO_Event_Selector_KQueue, "close", IO_Event_Selector_KQueue_close, 0);
 	
 	rb_define_method(IO_Event_Selector_KQueue, "io_wait", IO_Event_Selector_KQueue_io_wait, 3);

data/ext/io/event/selector/selector.h

@@ -18,6 +18,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#pragma once
+
 #include <ruby.h>
 #include <ruby/thread.h>
 #include <ruby/io.h>

data/ext/io/event/selector/uring.c

@@ -37,6 +37,7 @@ struct IO_Event_Selector_URing {
 	struct IO_Event_Selector backend;
 	struct io_uring ring;
 	size_t pending;
+	int blocked;
 };
 
 void IO_Event_Selector_URing_Type_mark(void *_data)
@@ -86,7 +87,8 @@ VALUE IO_Event_Selector_URing_allocate(VALUE self) {
 	data->ring.ring_fd = -1;
 	
 	data->pending = 0;
-
+	data->blocked = 0;
+	
 	return instance;
 }
 
@@ -106,6 +108,13 @@ VALUE IO_Event_Selector_URing_initialize(VALUE self, VALUE loop) {
 	return self;
 }
 
+VALUE IO_Event_Selector_URing_loop(VALUE self) {
+	struct IO_Event_Selector_URing *data = NULL;
+	TypedData_Get_Struct(self, struct IO_Event_Selector_URing, &IO_Event_Selector_URing_Type, data);
+	
+	return data->backend.loop;
+}
+
 VALUE IO_Event_Selector_URing_close(VALUE self) {
 	struct IO_Event_Selector_URing *data = NULL;
 	TypedData_Get_Struct(self, struct IO_Event_Selector_URing, &IO_Event_Selector_URing_Type, data);
@@ -156,7 +165,8 @@ VALUE IO_Event_Selector_URing_raise(int argc, VALUE *argv, VALUE self)
 	
 	return IO_Event_Selector_raise(&data->backend, argc, argv);
 }
-
+	
+	int blocked;
 VALUE IO_Event_Selector_URing_ready_p(VALUE self) {
 	struct IO_Event_Selector_URing *data = NULL;
 	TypedData_Get_Struct(self, struct IO_Event_Selector_URing, &IO_Event_Selector_URing_Type, data);
@@ -171,14 +181,14 @@ int io_uring_submit_flush(struct IO_Event_Selector_URing *data) {
 		
 		// Try to submit:
 		int result = io_uring_submit(&data->ring);
-
+		
 		if (result >= 0) {
 			// If it was submitted, reset pending count:
 			data->pending = 0;
 		} else if (result != -EBUSY && result != -EAGAIN) {
 			rb_syserr_fail(-result, "io_uring_submit_flush");
 		}
-
+		
 		return result;
 	}
 	
@@ -194,7 +204,7 @@ int io_uring_submit_now(struct IO_Event_Selector_URing *data) {
 			data->pending = 0;
 			return result;
 		}
-
+		
 		if (result == -EBUSY || result == -EAGAIN) {
 			IO_Event_Selector_yield(&data->backend);
 		} else {
@@ -214,7 +224,7 @@ struct io_uring_sqe * io_get_sqe(struct IO_Event_Selector_URing *data) {
 	while (sqe == NULL) {
 		// The submit queue is full, we need to drain it:	
 		io_uring_submit_now(data);
-
+		
 		sqe = io_uring_get_sqe(&data->ring);
 	}
 	
@@ -523,10 +533,8 @@ struct select_arguments {
 static
 void * select_internal(void *_arguments) {
 	struct select_arguments * arguments = (struct select_arguments *)_arguments;
-
-	io_uring_submit_flush(arguments->data);
-
 	struct io_uring_cqe *cqe = NULL;
+	
 	arguments->result = io_uring_wait_cqe_timeout(&arguments->data->ring, &cqe, arguments->timeout);
 	
 	return NULL;
@@ -534,7 +542,11 @@ void * select_internal(void *_arguments) {
 
 static
 int select_internal_without_gvl(struct select_arguments *arguments) {
+	io_uring_submit_flush(arguments->data);
+	
+	arguments->data->blocked = 1;
 	rb_thread_call_without_gvl(select_internal, (void *)arguments, RUBY_UBF_IO, 0);
+	arguments->data->blocked = 0;
 	
 	if (arguments->result == -ETIME) {
 		arguments->result = 0;
@@ -548,6 +560,8 @@ int select_internal_without_gvl(struct select_arguments *arguments) {
 	return arguments->result;
 }
 
+// #define IO_EVENT_SELECTOR_URING_UDATA_INTERRUPT ((__u64) -2)
+
 static inline
 unsigned select_process_completions(struct io_uring *ring) {
 	unsigned completed = 0;
@@ -563,6 +577,10 @@ unsigned select_process_completions(struct io_uring *ring) {
 			continue;
 		}
 		
+		// if (cqe->user_data == IO_EVENT_SELECTOR_URING_UDATA_INTERRUPT) {
+		// 	io_uring_cq_advance(ring, 1);
+		// }
+		
 		VALUE fiber = (VALUE)cqe->user_data;
 		VALUE result = RB_INT2NUM(cqe->res);
 		
@@ -587,9 +605,13 @@ VALUE IO_Event_Selector_URing_select(VALUE self, VALUE duration) {
 	int ready = IO_Event_Selector_queue_flush(&data->backend);
 	
 	int result = select_process_completions(&data->ring);
-
-	// If the ready list was empty and we didn't process any completions:
-	if (!ready && result == 0) {
+	
+	// If we:
+	// 1. Didn't process any ready fibers, and
+	// 2. Didn't process any events from non-blocking select (above), and
+	// 3. There are no items in the ready list,
+	// then we can perform a blocking select.
+	if (!ready && !result && !data->backend.ready) {
 		// We might need to wait for events:
 		struct select_arguments arguments = {
 			.data = data,
@@ -605,7 +627,7 @@ VALUE IO_Event_Selector_URing_select(VALUE self, VALUE duration) {
 			// The timeout specified required "nonblocking" behaviour so we just flush the SQ if required:
 			io_uring_submit_flush(data);
 		}
-
+		
 		// After waiting/flushing the SQ, check if there are any completions:
 		result = select_process_completions(&data->ring);
 	}
@@ -613,6 +635,33 @@ VALUE IO_Event_Selector_URing_select(VALUE self, VALUE duration) {
 	return RB_INT2NUM(result);
 }
 
+VALUE IO_Event_Selector_URing_wakeup(VALUE self) {
+	struct IO_Event_Selector_URing *data = NULL;
+	TypedData_Get_Struct(self, struct IO_Event_Selector_URing, &IO_Event_Selector_URing_Type, data);
+	
+	// If we are blocking, we can schedule a nop event to wake up the selector:
+	if (data->blocked) {
+		struct io_uring_sqe *sqe = NULL;
+		
+		while (true) {
+			sqe = io_uring_get_sqe(&data->ring);
+			if (sqe) break;
+			
+			rb_thread_schedule();
+			
+			// It's possible we became unblocked already, so we can assume the selector has already cycled at least once:
+			if (!data->blocked) return Qfalse;
+		}
+		
+		io_uring_prep_nop(sqe);
+		io_uring_submit(&data->ring);
+		
+		return Qtrue;
+	}
+	
+	return Qfalse;
+}
+
 void Init_IO_Event_Selector_URing(VALUE IO_Event_Selector) {
 	IO_Event_Selector_URing = rb_define_class_under(IO_Event_Selector, "URing", rb_cObject);
 	rb_gc_register_mark_object(IO_Event_Selector_URing);
@@ -620,6 +669,8 @@ void Init_IO_Event_Selector_URing(VALUE IO_Event_Selector) {
 	rb_define_alloc_func(IO_Event_Selector_URing, IO_Event_Selector_URing_allocate);
 	rb_define_method(IO_Event_Selector_URing, "initialize", IO_Event_Selector_URing_initialize, 1);
 	
+	rb_define_method(IO_Event_Selector_URing, "loop", IO_Event_Selector_URing_loop, 0);
+	
 	rb_define_method(IO_Event_Selector_URing, "transfer", IO_Event_Selector_URing_transfer, 0);
 	rb_define_method(IO_Event_Selector_URing, "resume", IO_Event_Selector_URing_resume, -1);
 	rb_define_method(IO_Event_Selector_URing, "yield", IO_Event_Selector_URing_yield, 0);
@@ -629,6 +680,7 @@ void Init_IO_Event_Selector_URing(VALUE IO_Event_Selector) {
 	rb_define_method(IO_Event_Selector_URing, "ready?", IO_Event_Selector_URing_ready_p, 0);
 	
 	rb_define_method(IO_Event_Selector_URing, "select", IO_Event_Selector_URing_select, 1);
+	rb_define_method(IO_Event_Selector_URing, "wakeup", IO_Event_Selector_URing_wakeup, 0);
 	rb_define_method(IO_Event_Selector_URing, "close", IO_Event_Selector_URing_close, 0);
 	
 	rb_define_method(IO_Event_Selector_URing, "io_wait", IO_Event_Selector_URing_io_wait, 3);

data/ext/io/event/selector/uring.h

@@ -25,4 +25,3 @@
 #define IO_EVENT_SELECTOR_URING
 
 void Init_IO_Event_Selector_URing(VALUE IO_Event_Selector);
-VALUE IO_Event_Selector_URing_select(VALUE self, VALUE duration);

data/ext/mkmf.log

@@ -113,6 +113,22 @@ checked program was:
 
 --------------------
 
+have_header: checking for sys/eventfd.h... -------------------- no
+
+"clang -E -I/Users/samuel/.rubies/ruby-3.0.3/include/ruby-3.0.0/arm64-darwin21 -I/Users/samuel/.rubies/ruby-3.0.3/include/ruby-3.0.0/ruby/backward -I/Users/samuel/.rubies/ruby-3.0.3/include/ruby-3.0.0 -I.  -I/opt/local/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT   -O3 -ggdb3 -Wall -Wextra -Wdeprecated-declarations -Wdivision-by-zero -Wimplicit-function-declaration -Wimplicit-int -Wmisleading-indentation -Wpointer-arith -Wshorten-64-to-32 -Wwrite-strings -Wmissing-noreturn -Wno-constant-logical-operand -Wno-long-long -Wno-missing-field-initializers -Wno-overlength-strings -Wno-parentheses-equality -Wno-self-assign -Wno-tautological-compare -Wno-unused-parameter -Wno-unused-value -Wunused-variable -Wextra-tokens -pipe -Wall  conftest.c -o conftest.i"
+conftest.c:3:10: fatal error: 'sys/eventfd.h' file not found
+#include <sys/eventfd.h>
+         ^~~~~~~~~~~~~~~
+1 error generated.
+checked program was:
+/* begin */
+1: #include "ruby.h"
+2: 
+3: #include <sys/eventfd.h>
+/* end */
+
+--------------------
+
 have_func: checking for rb_io_descriptor()... -------------------- no
 
 "clang -fdeclspec -o conftest -I/Users/samuel/.rubies/ruby-3.0.3/include/ruby-3.0.0/arm64-darwin21 -I/Users/samuel/.rubies/ruby-3.0.3/include/ruby-3.0.0/ruby/backward -I/Users/samuel/.rubies/ruby-3.0.3/include/ruby-3.0.0 -I.  -I/opt/local/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT   -O3 -ggdb3 -Wall -Wextra -Wdeprecated-declarations -Wdivision-by-zero -Wimplicit-function-declaration -Wimplicit-int -Wmisleading-indentation -Wpointer-arith -Wshorten-64-to-32 -Wwrite-strings -Wmissing-noreturn -Wno-constant-logical-operand -Wno-long-long -Wno-missing-field-initializers -Wno-overlength-strings -Wno-parentheses-equality -Wno-self-assign -Wno-tautological-compare -Wno-unused-parameter -Wno-unused-value -Wunused-variable -Wextra-tokens -pipe -Wall conftest.c  -L. -L/Users/samuel/.rubies/ruby-3.0.3/lib -L/opt/local/lib -L. -fstack-protector-strong -L/opt/local/lib  -m64   -lruby.3.0-static -framework Security -framework Foundation -lpthread -lgmp -ldl -lobjc   "
@@ -141,7 +157,7 @@ checked program was:
 "clang -fdeclspec -o conftest -I/Users/samuel/.rubies/ruby-3.0.3/include/ruby-3.0.0/arm64-darwin21 -I/Users/samuel/.rubies/ruby-3.0.3/include/ruby-3.0.0/ruby/backward -I/Users/samuel/.rubies/ruby-3.0.3/include/ruby-3.0.0 -I.  -I/opt/local/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT   -O3 -ggdb3 -Wall -Wextra -Wdeprecated-declarations -Wdivision-by-zero -Wimplicit-function-declaration -Wimplicit-int -Wmisleading-indentation -Wpointer-arith -Wshorten-64-to-32 -Wwrite-strings -Wmissing-noreturn -Wno-constant-logical-operand -Wno-long-long -Wno-missing-field-initializers -Wno-overlength-strings -Wno-parentheses-equality -Wno-self-assign -Wno-tautological-compare -Wno-unused-parameter -Wno-unused-value -Wunused-variable -Wextra-tokens -pipe -Wall conftest.c  -L. -L/Users/samuel/.rubies/ruby-3.0.3/lib -L/opt/local/lib -L. -fstack-protector-strong -L/opt/local/lib  -m64   -lruby.3.0-static -framework Security -framework Foundation -lpthread -lgmp -ldl -lobjc   "
 Undefined symbols for architecture arm64:
   "_rb_io_descriptor", referenced from:
-      _t in conftest-3f9e69.o
+      _t in conftest-1e4d1a.o
 ld: symbol(s) not found for architecture arm64
 clang: error: linker command failed with exit code 1 (use -v to see invocation)
 checked program was:

data/lib/io/event/debug/selector.rb

@@ -28,6 +28,14 @@ module IO::Event
 				@readable = {}
 				@writable = {}
 				@priority = {}
+				
+				unless Fiber.current == selector.loop
+					raise "Selector must be initialized on event loop fiber!"
+				end
+			end
+			
+			def wakeup
+				@selector.wakeup
 			end
 			
 			def close
@@ -86,13 +94,17 @@ module IO::Event
 			end
 			
 			def select(duration = nil)
+				unless Fiber.current == @selector.loop
+					raise "Selector must be run on event loop fiber!"
+				end
+				
 				@selector.select(duration)
 			end
 			
 			private
 			
 			def register_readable(fiber, io, events)
-				if (events & READABLE) > 0
+				if (events & IO::READABLE) > 0
 					if @readable.key?(io)
 						raise "Cannot wait for #{io} to become readable from multiple fibers."
 					end
@@ -110,7 +122,7 @@ module IO::Event
 			end
 			
 			def register_writable(fiber, io, events)
-				if (events & WRITABLE) > 0
+				if (events & IO::WRITABLE) > 0
 					if @writable.key?(io)
 						raise "Cannot wait for #{io} to become writable from multiple fibers."
 					end
@@ -128,7 +140,7 @@ module IO::Event
 			end
 			
 			def register_priority(fiber, io, events)
-				if (events & PRIORITY) > 0
+				if (events & IO::PRIORITY) > 0
 					if @priority.key?(io)
 						raise "Cannot wait for #{io} to become priority from multiple fibers."
 					end

data/lib/io/event/interrupt.rb

@@ -0,0 +1,57 @@
+# Copyright, 2021, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+module IO::Event
+	# A thread safe synchronisation primative.
+	class Interrupt
+		def self.attach(selector)
+			self.new(selector)
+		end
+		
+		def initialize(selector)
+			@selector = selector
+			@input, @output = ::IO.pipe
+			
+			@fiber = Fiber.new do
+				while true
+					if @selector.io_wait(@fiber, @input, IO::READABLE)
+						@input.read_nonblock(1)
+					end
+				end
+			end
+			
+			@fiber.transfer
+		end
+		
+		# Send a sigle byte interrupt.
+		def signal
+			@output.write('.')
+			@output.flush
+		end
+		
+		def close
+			@input.close
+			@output.close
+			# @fiber.raise(::Interrupt)
+		end
+	end
+	
+	private_constant :Interrupt
+end

data/lib/io/event/selector/select.rb

@@ -18,19 +18,39 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require_relative '../interrupt'
+
 module IO::Event
 	module Selector
 		class Select
 			def initialize(loop)
 				@loop = loop
 				
-				@readable = {}
-				@writable = {}
+				@readable = Hash.new.compare_by_identity
+				@writable = Hash.new.compare_by_identity
+				
+				@blocked = false
 				
 				@ready = Queue.new
+				@interrupt = Interrupt.attach(self)
+			end
+			
+			attr :loop
+			
+			# If the event loop is currently blocked, 
+			def wakeup
+				if @blocked
+					@interrupt.signal
+					
+					return true
+				end
+				
+				return false
 			end
 			
 			def close
+				@interrupt.close
+				
 				@loop = nil
 				@readable = nil
 				@writable = nil
@@ -97,12 +117,12 @@ module IO::Event
 			def io_wait(fiber, io, events)
 				remove_readable = remove_writable = false
 				
-				if (events & READABLE) > 0 or (events & PRIORITY) > 0
+				if (events & IO::READABLE) > 0 or (events & IO::PRIORITY) > 0
 					@readable[io] = fiber
 					remove_readable = true
 				end
 				
-				if (events & WRITABLE) > 0
+				if (events & IO::WRITABLE) > 0
 					@writable[io] = fiber
 					remove_writable = true
 				end
@@ -123,9 +143,9 @@ module IO::Event
 						
 						case result = io.read_nonblock(maximum_size, exception: false)
 						when :wait_readable
-							self.io_wait(fiber, io, READABLE)
+							self.io_wait(fiber, io, IO::READABLE)
 						when :wait_writable
-							self.io_wait(fiber, io, WRITABLE)
+							self.io_wait(fiber, io, IO::WRITABLE)
 						else
 							break unless result
 							
@@ -147,9 +167,9 @@ module IO::Event
 						chunk = buffer.to_str(offset, length)
 						case result = io.write_nonblock(chunk, exception: false)
 						when :wait_readable
-							self.io_wait(fiber, io, READABLE)
+							self.io_wait(fiber, io, IO::READABLE)
 						when :wait_writable
-							self.io_wait(fiber, io, WRITABLE)
+							self.io_wait(fiber, io, IO::WRITABLE)
 						else
 							offset += result
 							length -= result
@@ -169,7 +189,7 @@ module IO::Event
 					w.close
 				end
 				
-				self.io_wait(fiber, r, READABLE)
+				self.io_wait(fiber, r, IO::READABLE)
 				
 				return thread.value
 			ensure
@@ -193,26 +213,32 @@ module IO::Event
 			
 			def select(duration = nil)
 				if pop_ready
+					# If we have popped items from the ready list, they may influence the duration calculation, so we don't delay the event loop:
 					duration = 0
 				end
 				
+				@blocked = true
+				duration = 0 unless @ready.empty?
 				readable, writable, _ = ::IO.select(@readable.keys, @writable.keys, nil, duration)
+				@blocked = false
 				
 				ready = Hash.new(0)
 				
 				readable&.each do |io|
 					fiber = @readable.delete(io)
-					ready[fiber] |= READABLE
+					ready[fiber] |= IO::READABLE
 				end
 				
 				writable&.each do |io|
 					fiber = @writable.delete(io)
-					ready[fiber] |= WRITABLE
+					ready[fiber] |= IO::WRITABLE
 				end
 				
 				ready.each do |fiber, events|
 					fiber.transfer(events) if fiber.alive?
 				end
+				
+				return ready.size
 			end
 		end
 	end

data/lib/io/event/selector.rb

@@ -21,11 +21,6 @@
 require_relative 'selector/select'
 
 module IO::Event
-	# These constants are the same as those defined in IO.
-	READABLE = 1
-	PRIORITY = 2
-	WRITABLE = 4
-	
 	module Selector
 		def self.default(env = ENV)
 			if name = env['IO_EVENT_SELECTOR']&.to_sym

data/lib/io/event/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module IO::Event
-	VERSION = "0.1.0"
+	VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: io-event
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.3
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-06 00:00:00.000000000 Z
+date: 2021-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bake
@@ -53,33 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: sus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: timers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
 description:
 email:
 executables: []
@@ -92,8 +78,11 @@ files:
 - ext/event.o
 - ext/extconf.h
 - ext/extconf.rb
+- ext/interrupt.o
 - ext/io/event/event.c
 - ext/io/event/event.h
+- ext/io/event/interrupt.c
+- ext/io/event/interrupt.h
 - ext/io/event/selector/epoll.c
 - ext/io/event/selector/epoll.h
 - ext/io/event/selector/kqueue.c
@@ -108,6 +97,7 @@ files:
 - ext/selector.o
 - lib/io/event.rb
 - lib/io/event/debug/selector.rb
+- lib/io/event/interrupt.rb
 - lib/io/event/selector.rb
 - lib/io/event/selector/select.rb
 - lib/io/event/version.rb