event 0.2.2 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e032d8ef7daf3803999a2ac9cba5a72e95f6a3b6551f4724be451eb026b03e0
-  data.tar.gz: 1cdb73bcd9a5f52483faa2da537c1033ebfaba64b41abc80734b475afbd1fd72
+  metadata.gz: 1adbb7e42901c2b8d7cd402e48ebf24fc763dd37a0c5e6da48262fd8bb33771a
+  data.tar.gz: 0a85f5629cadf9eb37813fcaabf16be2e459bdcaff72756640f6dc93f34e00f1
 SHA512:
-  metadata.gz: 471fbc3ded644b8bfadbc4e1cca562f926bcd203141a59c6981e5ca85e225a9a1b09df4ed2f0792077272b2652ef50a81ea208c0fd44bd35b05158bfdb949c9b
-  data.tar.gz: a22b2804acdc8ad4dc5bc300fb23aa5991a2d69db301c2d6d5d71016643848e13cb1d9392c6367eebf4f3b179357b60c86cdbcd5b2bad8053c0dd0e1b42f38f9
+  metadata.gz: c0f0fd8577bb468b2a093b5720c7651eb530f496867ace6caba28ace95abe8f7c45351c7e98feaa45443654521bdea43d8e157547be1d430f42af20232e011e6
+  data.tar.gz: 7b2230479a18b9d818c1fafa49589f8eea607da8e0283292a807e5d12d15d59f1aa84e6e1d5ac75197474807eeabb0982f15534c98e85cc81ad64c7f7f11dcc7

data/ext/event/backend/backend.h

@@ -25,3 +25,5 @@ enum Event {
 	ERROR = 8,
 	HANGUP = 16
 };
+
+#include <ruby/thread.h>

data/ext/event/backend/epoll.c

@@ -28,7 +28,7 @@
 static VALUE Event_Backend_EPoll = Qnil;
 static ID id_fileno, id_transfer;
 
-static const unsigned EPOLL_MAX_EVENTS = 64;
+enum {EPOLL_MAX_EVENTS = 64};
 
 struct Event_Backend_EPoll {
 	VALUE loop;
@@ -41,13 +41,19 @@ void Event_Backend_EPoll_Type_mark(void *_data)
 	rb_gc_mark(data->loop);
 }
 
+static
+void close_internal(struct Event_Backend_EPoll *data) {
+	if (data->descriptor >= 0) {
+		close(data->descriptor);
+		data->descriptor = -1;
+	}
+}
+
 void Event_Backend_EPoll_Type_free(void *_data)
 {
 	struct Event_Backend_EPoll *data = _data;
 	
-	if (data->descriptor >= 0) {
-		close(data->descriptor);
-	}
+	close_internal(data);
 	
 	free(data);
 }
@@ -96,6 +102,15 @@ VALUE Event_Backend_EPoll_initialize(VALUE self, VALUE loop) {
 	return self;
 }
 
+VALUE Event_Backend_EPoll_close(VALUE self) {
+	struct Event_Backend_EPoll *data = NULL;
+	TypedData_Get_Struct(self, struct Event_Backend_EPoll, &Event_Backend_EPoll_Type, data);
+	
+	close_internal(data);
+	
+	return Qnil;
+}
+
 static inline
 uint32_t epoll_flags_from_events(int events) {
 	uint32_t flags = 0;
@@ -212,28 +227,71 @@ int make_timeout(VALUE duration) {
 	rb_raise(rb_eRuntimeError, "unable to convert timeout");
 }
 
+struct select_arguments {
+	struct Event_Backend_EPoll *data;
+	
+	int count;
+	struct epoll_event events[EPOLL_MAX_EVENTS];
+	
+	int timeout;
+};
+
+static
+void * select_internal(void *_arguments) {
+	struct select_arguments * arguments = (struct select_arguments *)_arguments;
+	
+	arguments->count = epoll_wait(arguments->data->descriptor, arguments->events, EPOLL_MAX_EVENTS, arguments->timeout);
+	
+	return NULL;
+}
+
+static
+void select_internal_without_gvl(struct select_arguments *arguments) {
+	rb_thread_call_without_gvl(select_internal, (void *)arguments, RUBY_UBF_IO, 0);
+	
+	if (arguments->count == -1) {
+		rb_sys_fail("select_internal_without_gvl:epoll_wait");
+	}
+}
+
+static
+void select_internal_with_gvl(struct select_arguments *arguments) {
+	select_internal((void *)arguments);
+	
+	if (arguments->count == -1) {
+		rb_sys_fail("select_internal_with_gvl:epoll_wait");
+	}
+}
+
 VALUE Event_Backend_EPoll_select(VALUE self, VALUE duration) {
 	struct Event_Backend_EPoll *data = NULL;
 	TypedData_Get_Struct(self, struct Event_Backend_EPoll, &Event_Backend_EPoll_Type, data);
 	
-	struct epoll_event events[EPOLL_MAX_EVENTS];
+	struct select_arguments arguments = {
+		.data = data,
+		.timeout = 0
+	};
 	
-	int count = epoll_wait(data->descriptor, events, EPOLL_MAX_EVENTS, make_timeout(duration));
+	select_internal_with_gvl(&arguments);
 	
-	if (count == -1) {
-		rb_sys_fail("epoll_wait");
+	if (arguments.count == 0) {
+		arguments.timeout = make_timeout(duration);
+		
+		if (arguments.timeout != 0) {
+			select_internal_without_gvl(&arguments);
+		}
 	}
 	
-	for (int i = 0; i < count; i += 1) {
-		VALUE fiber = (VALUE)events[i].data.ptr;
-		VALUE result = INT2NUM(events[i].events);
+	for (int i = 0; i < arguments.count; i += 1) {
+		VALUE fiber = (VALUE)arguments.events[i].data.ptr;
+		VALUE result = INT2NUM(arguments.events[i].events);
 		
 		// fprintf(stderr, "-> fiber=%p descriptor=%d\n", (void*)fiber, events[i].data.fd);
 		
 		rb_funcall(fiber, id_transfer, 1, result);
 	}
 	
-	return INT2NUM(count);
+	return INT2NUM(arguments.count);
 }
 
 void Init_Event_Backend_EPoll(VALUE Event_Backend) {
@@ -244,6 +302,7 @@ void Init_Event_Backend_EPoll(VALUE Event_Backend) {
 	
 	rb_define_alloc_func(Event_Backend_EPoll, Event_Backend_EPoll_allocate);
 	rb_define_method(Event_Backend_EPoll, "initialize", Event_Backend_EPoll_initialize, 1);
+	rb_define_method(Event_Backend_EPoll, "close", Event_Backend_EPoll_close, 0);
 	
 	rb_define_method(Event_Backend_EPoll, "io_wait", Event_Backend_EPoll_io_wait, 3);
 	rb_define_method(Event_Backend_EPoll, "select", Event_Backend_EPoll_select, 1);

data/ext/event/backend/kqueue.c

@@ -28,7 +28,7 @@
 static VALUE Event_Backend_KQueue = Qnil;
 static ID id_fileno, id_transfer;
 
-static const unsigned KQUEUE_MAX_EVENTS = 64;
+enum {KQUEUE_MAX_EVENTS = 64};
 
 struct Event_Backend_KQueue {
 	VALUE loop;
@@ -41,13 +41,19 @@ void Event_Backend_KQueue_Type_mark(void *_data)
 	rb_gc_mark(data->loop);
 }
 
+static
+void close_internal(struct Event_Backend_KQueue *data) {
+	if (data->descriptor >= 0) {
+		close(data->descriptor);
+		data->descriptor = -1;
+	}
+}
+
 void Event_Backend_KQueue_Type_free(void *_data)
 {
 	struct Event_Backend_KQueue *data = _data;
 	
-	if (data->descriptor >= 0) {
-		close(data->descriptor);
-	}
+	close_internal(data);
 	
 	free(data);
 }
@@ -97,50 +103,121 @@ VALUE Event_Backend_KQueue_initialize(VALUE self, VALUE loop) {
 	return self;
 }
 
-static inline
-u_short kqueue_filter_from_events(int events) {
-	u_short filter = 0;
+VALUE Event_Backend_KQueue_close(VALUE self) {
+	struct Event_Backend_KQueue *data = NULL;
+	TypedData_Get_Struct(self, struct Event_Backend_KQueue, &Event_Backend_KQueue_Type, data);
 	
-	if (events & READABLE) filter |= EVFILT_READ;
-	if (events & PRIORITY) filter |= EV_OOBAND;
-	if (events & WRITABLE) filter |= EVFILT_WRITE;
+	close_internal(data);
 	
-	return filter;
+	return Qnil;
 }
 
-static inline
-int events_from_kqueue_filter(u_short filter) {
-	int events = 0;
+static
+int io_add_filters(int descriptor, int ident, int events, VALUE fiber) {
+	int count = 0;
+	struct kevent kevents[2] = {0};
+	
+	if (events & READABLE) {
+		kevents[count].ident = ident;
+		kevents[count].filter = EVFILT_READ;
+		kevents[count].flags = EV_ADD | EV_ENABLE | EV_ONESHOT;
+		kevents[count].udata = (void*)fiber;
+		
+// #ifdef EV_OOBAND
+// 		if (events & PRIORITY) {
+// 			kevents[count].flags |= EV_OOBAND;
+// 		}
+// #endif
+		
+		count++;
+	}
+	
+	if (events & WRITABLE) {
+		kevents[count].ident = ident;
+		kevents[count].filter = EVFILT_WRITE;
+		kevents[count].flags = EV_ADD | EV_ENABLE | EV_ONESHOT;
+		kevents[count].udata = (void*)fiber;
+		count++;
+	}
+	
+	int result = kevent(descriptor, kevents, count, NULL, 0, NULL);
 	
-	if (filter & EVFILT_READ) events |= READABLE;
-	if (filter & EV_OOBAND) events |= PRIORITY;
-	if (filter & EVFILT_WRITE) events |= WRITABLE;
+	if (result == -1) {
+		rb_sys_fail("kevent(register)");
+	}
 	
-	return INT2NUM(events);
+	return events;
 }
 
-VALUE Event_Backend_KQueue_io_wait(VALUE self, VALUE fiber, VALUE io, VALUE events) {
-	struct Event_Backend_KQueue *data = NULL;
-	TypedData_Get_Struct(self, struct Event_Backend_KQueue, &Event_Backend_KQueue_Type, data);
+static
+void io_remove_filters(int descriptor, int ident, int events) {
+	int count = 0;
+	struct kevent kevents[2] = {0};
 	
-	struct kevent event = {0};
+	if (events & READABLE) {
+		kevents[count].ident = ident;
+		kevents[count].filter = EVFILT_READ;
+		kevents[count].flags = EV_DELETE;
+		
+		count++;
+	}
 	
-	int descriptor = NUM2INT(rb_funcall(io, id_fileno, 0));
+	if (events & WRITABLE) {
+		kevents[count].ident = ident;
+		kevents[count].filter = EVFILT_WRITE;
+		kevents[count].flags = EV_DELETE;
+		count++;
+	}
 	
-	event.ident = descriptor;
-	event.filter = kqueue_filters_from_events(events);
-	event.flags = EV_ADD | EV_ENABLE | EV_ONESHOT;
-	event.udata = (void*)fiber;
+	// Ignore the result.
+	kevent(descriptor, kevents, count, NULL, 0, NULL);
+}
+
+struct io_wait_arguments {
+	struct Event_Backend_KQueue *data;
+	int events;
+	int descriptor;
+};
+
+static
+VALUE io_wait_rescue(VALUE _arguments, VALUE exception) {
+	struct io_wait_arguments *arguments = (struct io_wait_arguments *)_arguments;
 	
-	// A better approach is to batch all changes:
-	int result = kevent(data->descriptor, &event, 1, NULL, 0, NULL);
+	io_remove_filters(arguments->data->descriptor, arguments->descriptor, arguments->events);
 	
-	if (result == -1) {
-		rb_sys_fail("kevent");
-	}
+	rb_exc_raise(exception);
+};
+
+static inline
+int events_from_kqueue_filter(int filter) {
+	if (filter == EVFILT_READ) return READABLE;
+	if (filter == EVFILT_WRITE) return WRITABLE;
+	
+	return 0;
+}
+
+static
+VALUE io_wait_transfer(VALUE _arguments) {
+	struct io_wait_arguments *arguments = (struct io_wait_arguments *)_arguments;
+	
+	VALUE result = rb_funcall(arguments->data->loop, id_transfer, 0);
 	
-	VALUE result = rb_funcall(data->loop, id_transfer, 0);
 	return INT2NUM(events_from_kqueue_filter(NUM2INT(result)));
+};
+
+VALUE Event_Backend_KQueue_io_wait(VALUE self, VALUE fiber, VALUE io, VALUE events) {
+	struct Event_Backend_KQueue *data = NULL;
+	TypedData_Get_Struct(self, struct Event_Backend_KQueue, &Event_Backend_KQueue_Type, data);
+	
+	int descriptor = NUM2INT(rb_funcall(io, id_fileno, 0));
+	
+	struct io_wait_arguments io_wait_arguments = {
+		.events = io_add_filters(data->descriptor, descriptor, NUM2INT(events), fiber),
+		.data = data,
+		.descriptor = descriptor,
+	};
+	
+	return rb_rescue(io_wait_transfer, (VALUE)&io_wait_arguments, io_wait_rescue, (VALUE)&io_wait_arguments);
 }
 
 static
@@ -158,7 +235,7 @@ struct timespec * make_timeout(VALUE duration, struct timespec * storage) {
 	
 	else if (RB_FLOAT_TYPE_P(duration)) {
 		double value = RFLOAT_VALUE(duration);
-		time_t seconds = duration;
+		time_t seconds = value;
 		
 		storage->tv_sec = seconds;
 		storage->tv_nsec = (value - seconds) * 1000000000L;
@@ -169,26 +246,89 @@ struct timespec * make_timeout(VALUE duration, struct timespec * storage) {
 	rb_raise(rb_eRuntimeError, "unable to convert timeout");
 }
 
+static
+int timeout_nonblocking(struct timespec * timespec) {
+	return timespec && timespec->tv_sec == 0 && timespec->tv_nsec == 0;
+}
+
+struct select_arguments {
+	struct Event_Backend_KQueue *data;
+	
+	int count;
+	struct kevent events[KQUEUE_MAX_EVENTS];
+	
+	struct timespec storage;
+	struct timespec *timeout;
+};
+
+static
+void * select_internal(void *_arguments) {
+	struct select_arguments * arguments = (struct select_arguments *)_arguments;
+	
+	arguments->count = kevent(arguments->data->descriptor, NULL, 0, arguments->events, arguments->count, arguments->timeout);
+	
+	return NULL;
+}
+
+static
+void select_internal_without_gvl(struct select_arguments *arguments) {
+	rb_thread_call_without_gvl(select_internal, (void *)arguments, RUBY_UBF_IO, 0);
+	
+	if (arguments->count == -1) {
+		rb_sys_fail("select_internal_without_gvl:kevent");
+	}
+}
+
+static
+void select_internal_with_gvl(struct select_arguments *arguments) {
+	select_internal((void *)arguments);
+	
+	if (arguments->count == -1) {
+		rb_sys_fail("select_internal_with_gvl:kevent");
+	}
+}
+
 VALUE Event_Backend_KQueue_select(VALUE self, VALUE duration) {
 	struct Event_Backend_KQueue *data = NULL;
 	TypedData_Get_Struct(self, struct Event_Backend_KQueue, &Event_Backend_KQueue_Type, data);
 	
-	struct kevent events[KQUEUE_MAX_EVENTS];
-	struct timespec storage;
+	struct select_arguments arguments = {
+		.data = data,
+		.count = KQUEUE_MAX_EVENTS,
+		.storage = {
+			.tv_sec = 0,
+			.tv_nsec = 0
+		}
+	};
 	
-	int count = kevent(data->descriptor, NULL, 0, events, KQUEUE_MAX_EVENTS, make_timeout(duration, &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;
 	
-	if (count == -1) {
-		rb_sys_fail("kevent");
+	// 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 (arguments.count == 0) {
+		arguments.timeout = make_timeout(duration, &arguments.storage);
+		
+		if (!timeout_nonblocking(arguments.timeout)) {
+			arguments.count = KQUEUE_MAX_EVENTS;
+			
+			select_internal_without_gvl(&arguments);
+		}
 	}
 	
-	for (int i = 0; i < count; i += 1) {
-		VALUE fiber = (VALUE)events[i].udata;
-		VALUE result = INT2NUM(events[i].filter);
+	for (int i = 0; i < arguments.count; i += 1) {
+		VALUE fiber = (VALUE)arguments.events[i].udata;
+		VALUE result = INT2NUM(arguments.events[i].filter);
 		rb_funcall(fiber, id_transfer, 1, result);
 	}
 	
-	return INT2NUM(count);
+	return INT2NUM(arguments.count);
 }
 
 void Init_Event_Backend_KQueue(VALUE Event_Backend) {
@@ -199,6 +339,7 @@ void Init_Event_Backend_KQueue(VALUE Event_Backend) {
 	
 	rb_define_alloc_func(Event_Backend_KQueue, Event_Backend_KQueue_allocate);
 	rb_define_method(Event_Backend_KQueue, "initialize", Event_Backend_KQueue_initialize, 1);
+	rb_define_method(Event_Backend_KQueue, "close", Event_Backend_KQueue_close, 0);
 	
 	rb_define_method(Event_Backend_KQueue, "io_wait", Event_Backend_KQueue_io_wait, 3);
 	rb_define_method(Event_Backend_KQueue, "select", Event_Backend_KQueue_select, 1);

data/ext/event/backend/uring.c

@@ -28,8 +28,8 @@
 static VALUE Event_Backend_URing = Qnil;
 static ID id_fileno, id_transfer;
 
-static const int URING_ENTRIES = 64;
-static const int URING_MAX_EVENTS = 64;
+enum {URING_ENTRIES = 128};
+enum {URING_MAX_EVENTS = 128};
 
 struct Event_Backend_URing {
 	VALUE loop;
@@ -42,14 +42,19 @@ void Event_Backend_URing_Type_mark(void *_data)
 	rb_gc_mark(data->loop);
 }
 
-void Event_Backend_URing_Type_free(void *_data)
-{
-	struct Event_Backend_URing *data = _data;
-	
+static
+void close_internal(struct Event_Backend_URing *data) {
 	if (data->ring.ring_fd >= 0) {
 		io_uring_queue_exit(&data->ring);
 		data->ring.ring_fd = -1;
 	}
+}
+
+void Event_Backend_URing_Type_free(void *_data)
+{
+	struct Event_Backend_URing *data = _data;
+	
+	close_internal(data);
 	
 	free(data);
 }
@@ -97,6 +102,15 @@ VALUE Event_Backend_URing_initialize(VALUE self, VALUE loop) {
 	return self;
 }
 
+VALUE Event_Backend_URing_close(VALUE self) {
+	struct Event_Backend_URing *data = NULL;
+	TypedData_Get_Struct(self, struct Event_Backend_URing, &Event_Backend_URing_Type, data);
+	
+	close_internal(data);
+	
+	return Qnil;
+}
+
 static inline
 short poll_flags_from_events(int events) {
 	short flags = 0;
@@ -122,28 +136,75 @@ int events_from_poll_flags(short flags) {
 	return events;
 }
 
+struct io_wait_arguments {
+	struct Event_Backend_URing *data;
+	VALUE fiber;
+	short flags;
+};
+
+struct io_uring_sqe * io_get_sqe(struct Event_Backend_URing *data) {
+	struct io_uring_sqe *sqe = io_uring_get_sqe(&data->ring);
+	
+	while (sqe == NULL) {
+		sqe = io_uring_get_sqe(&data->ring);
+	}
+	
+	return sqe;
+}
+
+static
+VALUE io_wait_rescue(VALUE _arguments, VALUE exception) {
+	struct io_wait_arguments *arguments = (struct io_wait_arguments *)_arguments;
+	struct Event_Backend_URing *data = arguments->data;
+	
+	struct io_uring_sqe *sqe = io_get_sqe(data);
+	
+	// fprintf(stderr, "poll_remove(%p, %p)\n", sqe, (void*)arguments->fiber);
+	
+	io_uring_prep_poll_remove(sqe, (void*)arguments->fiber);
+	io_uring_submit(&data->ring);
+	
+	rb_exc_raise(exception);
+};
+
+static
+VALUE io_wait_transfer(VALUE _arguments) {
+	struct io_wait_arguments *arguments = (struct io_wait_arguments *)_arguments;
+	struct Event_Backend_URing *data = arguments->data;
+	
+	VALUE result = rb_funcall(data->loop, id_transfer, 0);
+	
+	// We explicitly filter the resulting events based on the requested events.
+	// In some cases, poll will report events we didn't ask for.
+	short flags = arguments->flags & NUM2INT(result);
+	
+	return INT2NUM(events_from_poll_flags(flags));
+};
+
 VALUE Event_Backend_URing_io_wait(VALUE self, VALUE fiber, VALUE io, VALUE events) {
 	struct Event_Backend_URing *data = NULL;
 	TypedData_Get_Struct(self, struct Event_Backend_URing, &Event_Backend_URing_Type, data);
 	
 	int descriptor = NUM2INT(rb_funcall(io, id_fileno, 0));
-	struct io_uring_sqe *sqe = io_uring_get_sqe(&data->ring);
+	struct io_uring_sqe *sqe = io_get_sqe(data);
+	
+	if (!sqe) return INT2NUM(0);
 	
 	short flags = poll_flags_from_events(NUM2INT(events));
 	
-	// fprintf(stderr, "poll_add(%p, %d, %d)\n", sqe, descriptor, flags);
+	// fprintf(stderr, "poll_add(%p, %d, %d, %p)\n", sqe, descriptor, flags, (void*)fiber);
 	
 	io_uring_prep_poll_add(sqe, descriptor, flags);
 	io_uring_sqe_set_data(sqe, (void*)fiber);
 	io_uring_submit(&data->ring);
 	
-	VALUE result = rb_funcall(data->loop, id_transfer, 0);
-	
-	// We explicitly filter the resulting events based on the requested events.
-	// In some cases, poll will report events we didn't ask for.
-	flags &= NUM2INT(result);
+	struct io_wait_arguments io_wait_arguments = {
+		.data = data,
+		.fiber = fiber,
+		.flags = flags
+	};
 	
-	return INT2NUM(events_from_poll_flags(flags));
+	return rb_rescue(io_wait_transfer, (VALUE)&io_wait_arguments, io_wait_rescue, (VALUE)&io_wait_arguments);
 }
 
 inline static
@@ -176,7 +237,7 @@ VALUE Event_Backend_URing_io_read(VALUE self, VALUE fiber, VALUE io, VALUE buffe
 	resize_to_capacity(buffer, NUM2SIZET(offset), NUM2SIZET(length));
 	
 	int descriptor = NUM2INT(rb_funcall(io, id_fileno, 0));
-	struct io_uring_sqe *sqe = io_uring_get_sqe(&data->ring);
+	struct io_uring_sqe *sqe = io_get_sqe(data);
 	
 	struct iovec iovecs[1];
 	iovecs[0].iov_base = RSTRING_PTR(buffer) + NUM2SIZET(offset);
@@ -208,7 +269,7 @@ VALUE Event_Backend_URing_io_write(VALUE self, VALUE fiber, VALUE io, VALUE buff
 	}
 	
 	int descriptor = NUM2INT(rb_funcall(io, id_fileno, 0));
-	struct io_uring_sqe *sqe = io_uring_get_sqe(&data->ring);
+	struct io_uring_sqe *sqe = io_get_sqe(data);
 	
 	struct iovec iovecs[1];
 	iovecs[0].iov_base = RSTRING_PTR(buffer) + NUM2SIZET(offset);
@@ -244,7 +305,7 @@ struct __kernel_timespec * make_timeout(VALUE duration, struct __kernel_timespec
 	
 	else if (RB_FLOAT_TYPE_P(duration)) {
 		double value = RFLOAT_VALUE(duration);
-		time_t seconds = duration;
+		time_t seconds = value;
 		
 		storage->tv_sec = seconds;
 		storage->tv_nsec = (value - seconds) * 1000000000L;
@@ -255,36 +316,84 @@ struct __kernel_timespec * make_timeout(VALUE duration, struct __kernel_timespec
 	rb_raise(rb_eRuntimeError, "unable to convert timeout");
 }
 
+static
+int timeout_nonblocking(struct __kernel_timespec *timespec) {
+	return timespec && timespec->tv_sec == 0 && timespec->tv_nsec == 0;
+}
+
+struct select_arguments {
+	struct Event_Backend_URing *data;
+	
+	int count;
+	struct io_uring_cqe **cqes;
+	
+	struct __kernel_timespec storage;
+	struct __kernel_timespec *timeout;
+};
+
+static
+void * select_internal(void *_arguments) {
+	struct select_arguments * arguments = (struct select_arguments *)_arguments;
+	
+	arguments->count = io_uring_wait_cqes(&arguments->data->ring, arguments->cqes, 1, arguments->timeout, NULL);
+	
+	// If waiting resulted in a timeout, there are 0 events.
+	if (arguments->count == -ETIME) {
+		arguments->count = 0;
+	}
+	
+	return NULL;
+}
+
+static
+int select_internal_without_gvl(struct select_arguments *arguments) {
+	rb_thread_call_without_gvl(select_internal, (void *)arguments, RUBY_UBF_IO, 0);
+	
+	if (arguments->count < 0) {
+		rb_syserr_fail(-arguments->count, "select_internal_without_gvl:io_uring_wait_cqes");
+	}
+	
+	return arguments->count;
+}
+
 VALUE Event_Backend_URing_select(VALUE self, VALUE duration) {
 	struct Event_Backend_URing *data = NULL;
 	TypedData_Get_Struct(self, struct Event_Backend_URing, &Event_Backend_URing_Type, data);
 	
 	struct io_uring_cqe *cqes[URING_MAX_EVENTS];
-	struct __kernel_timespec storage;
 	
+	// This is a non-blocking operation:
 	int result = io_uring_peek_batch_cqe(&data->ring, cqes, URING_MAX_EVENTS);
 	
-	// fprintf(stderr, "result = %d\n", result);
-	
 	if (result < 0) {
 		rb_syserr_fail(-result, strerror(-result));
-	} else if (result == 0 && duration != Qnil) {
-		result = io_uring_wait_cqes(&data->ring, cqes, 1, make_timeout(duration, &storage), NULL);
+	} else if (result == 0) {
+		// We might need to wait for events:
+		struct select_arguments arguments = {
+			.data = data,
+			.cqes = cqes,
+			.timeout = NULL,
+		};
 		
-		// fprintf(stderr, "result (timeout) = %d\n", result);
+		arguments.timeout = make_timeout(duration, &arguments.storage);
 		
-		if (result == -ETIME) {
-			result = 0;
-		} else if (result < 0) {
-			rb_syserr_fail(-result, strerror(-result));
+		if (!timeout_nonblocking(arguments.timeout)) {
+			result = select_internal_without_gvl(&arguments);
 		}
 	}
 	
+	// fprintf(stderr, "cqes count=%d\n", result);
+	
 	for (int i = 0; i < result; i += 1) {
+		// If the operation was cancelled, or the operation has no user data (fiber):
+		if (cqes[i]->res == -ECANCELED || cqes[i]->user_data == 0) {
+			continue;
+		}
+		
 		VALUE fiber = (VALUE)io_uring_cqe_get_data(cqes[i]);
 		VALUE result = INT2NUM(cqes[i]->res);
 		
-		// fprintf(stderr, "cqes[i]->res = %d\n", cqes[i]->res);
+		// fprintf(stderr, "cqes[i] res=%d user_data=%p\n", cqes[i]->res, (void*)cqes[i]->user_data);
 		
 		io_uring_cqe_seen(&data->ring, cqes[i]);
 		
@@ -302,6 +411,7 @@ void Init_Event_Backend_URing(VALUE Event_Backend) {
 	
 	rb_define_alloc_func(Event_Backend_URing, Event_Backend_URing_allocate);
 	rb_define_method(Event_Backend_URing, "initialize", Event_Backend_URing_initialize, 1);
+	rb_define_method(Event_Backend_URing, "close", Event_Backend_URing_close, 0);
 	
 	rb_define_method(Event_Backend_URing, "io_wait", Event_Backend_URing_io_wait, 3);
 	rb_define_method(Event_Backend_URing, "select", Event_Backend_URing_select, 1);

data/ext/event/backend/uring.h

@@ -25,3 +25,4 @@
 #define EVENT_BACKEND_URING
 
 void Init_Event_Backend_URing(VALUE Event_Backend);
+VALUE Event_Backend_URing_select(VALUE self, VALUE duration);

data/ext/event/extconf.rb

@@ -28,6 +28,8 @@ extension_name = 'event'
 # The destination
 dir_config(extension_name)
 
+$CFLAGS << " -Wall"
+
 $srcs = ["event.c"]
 $VPATH << "$(srcdir)/backend"
 

data/lib/event.rb

@@ -19,7 +19,7 @@
 # THE SOFTWARE.
 
 require_relative 'event/version'
-require_relative 'event/backend/select'
+require_relative 'event/backend'
 
 module Event
 	# These constants are the same as those defined in IO.

data/lib/event/backend.rb

@@ -0,0 +1,49 @@
+# 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.
+
+require_relative 'backend/select'
+
+module Event
+	module Backend
+		def self.default(env = ENV)
+			if backend = env['EVENT_BACKEND']&.to_sym
+				if Event::Backend.const_defined?(backend)
+					return Event::Backend.const_get(backend)
+				else
+					warn "Could not find EVENT_BACKEND=#{backend}!"
+				end
+			end
+			
+			if self.const_defined?(:URing)
+				return Event::Backend::URing
+			elsif self.const_defined?(:KQueue)
+				return Event::Backend::KQueue
+			elsif self.const_defined?(:EPoll)
+				return Event::Backend::EPoll
+			else
+				return Event::Backend::Select
+			end
+		end
+		
+		def self.new(...)
+			default.new(...)
+		end
+	end
+end

data/lib/event/backend/select.rb

@@ -28,16 +28,29 @@ module Event
 				@writable = {}
 			end
 			
+			def close
+				@loop = nil
+				@readable = nil
+				@writable = nil
+			end
+			
 			def io_wait(fiber, io, events)
+				remove_readable = remove_writable = false
+				
 				if (events & READABLE) > 0 or (events & PRIORITY) > 0
 					@readable[io] = fiber
+					remove_readable = true
 				end
 				
 				if (events & WRITABLE) > 0
 					@writable[io] = fiber
+					remove_writable = true
 				end
 				
 				@loop.transfer
+			ensure
+				@readable.delete(io) if remove_readable
+				@writable.delete(io) if remove_writable
 			end
 			
 			def select(duration = nil)

data/lib/event/debug/selector.rb

@@ -31,6 +31,15 @@ module Event
 				@priority = {}
 			end
 			
+			def close
+				if @selector.nil?
+					raise "Selector already closed!"
+				end
+				
+				@selector.close
+				@selector = nil
+			end
+			
 			def io_wait(fiber, io, events)
 				register_readable(fiber, io, events)
 			end

data/lib/event/version.rb

@@ -1,3 +1,3 @@
 module Event
-	VERSION = "0.2.2"
+	VERSION = "0.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: event
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.4.2
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-28 00:00:00.000000000 Z
+date: 2021-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bake
@@ -73,7 +73,6 @@ extensions:
 - ext/event/extconf.rb
 extra_rdoc_files: []
 files:
-- ext/event/Makefile
 - ext/event/backend/backend.h
 - ext/event/backend/epoll.c
 - ext/event/backend/epoll.h
@@ -85,6 +84,7 @@ files:
 - ext/event/event.h
 - ext/event/extconf.rb
 - lib/event.rb
+- lib/event/backend.rb
 - lib/event/backend/select.rb
 - lib/event/debug/selector.rb
 - lib/event/selector.rb
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: An event loop.

data/ext/event/Makefile

@@ -1,266 +0,0 @@
-
-SHELL = /bin/sh
-
-# V=0 quiet, V=1 verbose.  other values don't work.
-V = 0
-Q1 = $(V:1=)
-Q = $(Q1:0=@)
-ECHO1 = $(V:1=@ :)
-ECHO = $(ECHO1:0=@ echo)
-NULLCMD = :
-
-#### Start of system configuration section. ####
-
-srcdir = .
-topdir = /home/samuel/.rubies/ruby-3.0.0/include/ruby-3.0.0
-hdrdir = $(topdir)
-arch_hdrdir = /home/samuel/.rubies/ruby-3.0.0/include/ruby-3.0.0/x86_64-linux
-PATH_SEPARATOR = :
-VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby:$(srcdir)/backend
-prefix = $(DESTDIR)/home/samuel/.rubies/ruby-3.0.0
-rubysitearchprefix = $(rubylibprefix)/$(sitearch)
-rubyarchprefix = $(rubylibprefix)/$(arch)
-rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
-exec_prefix = $(prefix)
-vendorarchhdrdir = $(vendorhdrdir)/$(sitearch)
-sitearchhdrdir = $(sitehdrdir)/$(sitearch)
-rubyarchhdrdir = $(rubyhdrdir)/$(arch)
-vendorhdrdir = $(rubyhdrdir)/vendor_ruby
-sitehdrdir = $(rubyhdrdir)/site_ruby
-rubyhdrdir = $(includedir)/$(RUBY_VERSION_NAME)
-vendorarchdir = $(vendorlibdir)/$(sitearch)
-vendorlibdir = $(vendordir)/$(ruby_version)
-vendordir = $(rubylibprefix)/vendor_ruby
-sitearchdir = $(sitelibdir)/$(sitearch)
-sitelibdir = $(sitedir)/$(ruby_version)
-sitedir = $(rubylibprefix)/site_ruby
-rubyarchdir = $(rubylibdir)/$(arch)
-rubylibdir = $(rubylibprefix)/$(ruby_version)
-sitearchincludedir = $(includedir)/$(sitearch)
-archincludedir = $(includedir)/$(arch)
-sitearchlibdir = $(libdir)/$(sitearch)
-archlibdir = $(libdir)/$(arch)
-ridir = $(datarootdir)/$(RI_BASE_NAME)
-mandir = $(datarootdir)/man
-localedir = $(datarootdir)/locale
-libdir = $(exec_prefix)/lib
-psdir = $(docdir)
-pdfdir = $(docdir)
-dvidir = $(docdir)
-htmldir = $(docdir)
-infodir = $(datarootdir)/info
-docdir = $(datarootdir)/doc/$(PACKAGE)
-oldincludedir = $(DESTDIR)/usr/include
-includedir = $(prefix)/include
-runstatedir = $(localstatedir)/run
-localstatedir = $(prefix)/var
-sharedstatedir = $(prefix)/com
-sysconfdir = $(prefix)/etc
-datadir = $(datarootdir)
-datarootdir = $(prefix)/share
-libexecdir = $(exec_prefix)/libexec
-sbindir = $(exec_prefix)/sbin
-bindir = $(exec_prefix)/bin
-archdir = $(rubyarchdir)
-
-
-CC_WRAPPER = 
-CC = gcc
-CXX = g++
-LIBRUBY = $(LIBRUBY_A)
-LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
-LIBRUBYARG_SHARED = -Wl,-rpath,$(libdir) -L$(libdir) 
-LIBRUBYARG_STATIC = -Wl,-rpath,$(libdir) -L$(libdir) -l$(RUBY_SO_NAME)-static $(MAINLIBS)
-empty =
-OUTFLAG = -o $(empty)
-COUTFLAG = -o $(empty)
-CSRCFLAG = $(empty)
-
-RUBY_EXTCONF_H = extconf.h
-cflags   = $(optflags) $(debugflags) $(warnflags)
-cxxflags = 
-optflags = -O3
-debugflags = -ggdb3
-warnflags = -Wall -Wextra -Wdeprecated-declarations -Wduplicated-cond -Wimplicit-function-declaration -Wimplicit-int -Wmisleading-indentation -Wpointer-arith -Wwrite-strings -Wimplicit-fallthrough=0 -Wmissing-noreturn -Wno-cast-function-type -Wno-constant-logical-operand -Wno-long-long -Wno-missing-field-initializers -Wno-overlength-strings -Wno-packed-bitfield-compat -Wno-parentheses-equality -Wno-self-assign -Wno-tautological-compare -Wno-unused-parameter -Wno-unused-value -Wsuggest-attribute=format -Wsuggest-attribute=noreturn -Wunused-variable
-cppflags = 
-CCDLFLAGS = -fPIC
-CFLAGS   = $(CCDLFLAGS) $(cflags) $(ARCH_FLAG)
-INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
-DEFS     = 
-CPPFLAGS = -DRUBY_EXTCONF_H=\"$(RUBY_EXTCONF_H)\"  $(DEFS) $(cppflags)
-CXXFLAGS = $(CCDLFLAGS)  $(ARCH_FLAG)
-ldflags  = -L. -fstack-protector-strong -rdynamic -Wl,-export-dynamic
-dldflags = -Wl,--compress-debug-sections=zlib 
-ARCH_FLAG = 
-DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG)
-LDSHARED = $(CC) -shared
-LDSHAREDXX = $(CXX) -shared
-AR = gcc-ar
-EXEEXT = 
-
-RUBY_INSTALL_NAME = $(RUBY_BASE_NAME)
-RUBY_SO_NAME = ruby
-RUBYW_INSTALL_NAME = 
-RUBY_VERSION_NAME = $(RUBY_BASE_NAME)-$(ruby_version)
-RUBYW_BASE_NAME = rubyw
-RUBY_BASE_NAME = ruby
-
-arch = x86_64-linux
-sitearch = $(arch)
-ruby_version = 3.0.0
-ruby = $(bindir)/$(RUBY_BASE_NAME)
-RUBY = $(ruby)
-ruby_headers = $(hdrdir)/ruby.h $(hdrdir)/ruby/backward.h $(hdrdir)/ruby/ruby.h $(hdrdir)/ruby/defines.h $(hdrdir)/ruby/missing.h $(hdrdir)/ruby/intern.h $(hdrdir)/ruby/st.h $(hdrdir)/ruby/subst.h $(arch_hdrdir)/ruby/config.h $(RUBY_EXTCONF_H)
-
-RM = rm -f
-RM_RF = $(RUBY) -run -e rm -- -rf
-RMDIRS = rmdir --ignore-fail-on-non-empty -p
-MAKEDIRS = /usr/bin/mkdir -p
-INSTALL = /usr/bin/install -c
-INSTALL_PROG = $(INSTALL) -m 0755
-INSTALL_DATA = $(INSTALL) -m 644
-COPY = cp
-TOUCH = exit >
-
-#### End of system configuration section. ####
-
-preload = 
-libpath = . $(libdir)
-LIBPATH =  -L. -L$(libdir) -Wl,-rpath,$(libdir)
-DEFFILE = 
-
-CLEANFILES = mkmf.log
-DISTCLEANFILES = 
-DISTCLEANDIRS = 
-
-extout = 
-extout_prefix = 
-target_prefix = /event
-LOCAL_LIBS = 
-LIBS =  -luring  -lm   -lc
-ORIG_SRCS = event.c
-SRCS = $(ORIG_SRCS) event.c uring.c epoll.c
-OBJS = event.o uring.o epoll.o
-HDRS = $(srcdir)/event.h $(srcdir)/extconf.h
-LOCAL_HDRS = 
-TARGET = event
-TARGET_NAME = event
-TARGET_ENTRY = Init_$(TARGET_NAME)
-DLLIB = $(TARGET).so
-EXTSTATIC = 
-STATIC_LIB = 
-
-TIMESTAMP_DIR = .
-BINDIR        = $(bindir)
-RUBYCOMMONDIR = $(sitedir)$(target_prefix)
-RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
-RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
-HDRDIR        = $(rubyhdrdir)/ruby$(target_prefix)
-ARCHHDRDIR    = $(rubyhdrdir)/$(arch)/ruby$(target_prefix)
-TARGET_SO_DIR =
-TARGET_SO     = $(TARGET_SO_DIR)$(DLLIB)
-CLEANLIBS     = $(TARGET_SO) 
-CLEANOBJS     = *.o  *.bak
-
-all:    $(DLLIB)
-static: $(STATIC_LIB)
-.PHONY: all install static install-so install-rb
-.PHONY: clean clean-so clean-static clean-rb
-
-clean-static::
-clean-rb-default::
-clean-rb::
-clean-so::
-clean: clean-so clean-static clean-rb-default clean-rb
-		-$(Q)$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES) .*.time
-
-distclean-rb-default::
-distclean-rb::
-distclean-so::
-distclean-static::
-distclean: clean distclean-so distclean-static distclean-rb-default distclean-rb
-		-$(Q)$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
-		-$(Q)$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
-		-$(Q)$(RMDIRS) $(DISTCLEANDIRS) 2> /dev/null || true
-
-realclean: distclean
-install: install-so install-rb
-
-install-so: $(DLLIB) $(TIMESTAMP_DIR)/.sitearchdir.-.event.time
-	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
-clean-static::
-	-$(Q)$(RM) $(STATIC_LIB)
-install-rb: pre-install-rb do-install-rb install-rb-default
-install-rb-default: pre-install-rb-default do-install-rb-default
-pre-install-rb: Makefile
-pre-install-rb-default: Makefile
-do-install-rb:
-do-install-rb-default:
-pre-install-rb-default:
-	@$(NULLCMD)
-$(TIMESTAMP_DIR)/.sitearchdir.-.event.time:
-	$(Q) $(MAKEDIRS) $(@D) $(RUBYARCHDIR)
-	$(Q) $(TOUCH) $@
-
-site-install: site-install-so site-install-rb
-site-install-so: install-so
-site-install-rb: install-rb
-
-.SUFFIXES: .c .m .cc .mm .cxx .cpp .o .S
-
-.cc.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
-
-.cc.S:
-	$(ECHO) translating $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
-
-.mm.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
-
-.mm.S:
-	$(ECHO) translating $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
-
-.cxx.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
-
-.cxx.S:
-	$(ECHO) translating $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
-
-.cpp.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
-
-.cpp.S:
-	$(ECHO) translating $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
-
-.c.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
-
-.c.S:
-	$(ECHO) translating $(<)
-	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
-
-.m.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
-
-.m.S:
-	$(ECHO) translating $(<)
-	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
-
-$(TARGET_SO): $(OBJS) Makefile
-	$(ECHO) linking shared-object event/$(DLLIB)
-	-$(Q)$(RM) $(@)
-	$(Q) $(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
-
-
-
-$(OBJS): $(HDRS) $(ruby_headers)