event 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e032d8ef7daf3803999a2ac9cba5a72e95f6a3b6551f4724be451eb026b03e0
-  data.tar.gz: 1cdb73bcd9a5f52483faa2da537c1033ebfaba64b41abc80734b475afbd1fd72
+  metadata.gz: 9a363339a1d384ea4d844450be2ff46cbc091bc0aca240e869491bf6a5d61300
+  data.tar.gz: b1b3c431481f4499bf6605010392283acfb6f54a59aed232f25217d2cce4a221
 SHA512:
-  metadata.gz: 471fbc3ded644b8bfadbc4e1cca562f926bcd203141a59c6981e5ca85e225a9a1b09df4ed2f0792077272b2652ef50a81ea208c0fd44bd35b05158bfdb949c9b
-  data.tar.gz: a22b2804acdc8ad4dc5bc300fb23aa5991a2d69db301c2d6d5d71016643848e13cb1d9392c6367eebf4f3b179357b60c86cdbcd5b2bad8053c0dd0e1b42f38f9
+  metadata.gz: 3321631a8be1353038cdc9c63a2b6b17f02ea66924b11f5fb9126f9db1072ea4ee59141858f26e8879e1b52fe265471a2552afcab56cddd84b1e28d1611235d9
+  data.tar.gz: 7196977bd770153c5be35d16701e32a635c84cf53edf2880b4c5f095b8644825c7dcd1254a4da8f72655fb48e3ac3ec529d2ae2496691fb9ead30bb595cae357

data/ext/event/Makefile

@@ -12,12 +12,12 @@ NULLCMD = :
 #### Start of system configuration section. ####
 
 srcdir = .
-topdir = /home/samuel/.rubies/ruby-3.0.0/include/ruby-3.0.0
+topdir = /Users/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
+arch_hdrdir = /Users/samuel/.rubies/ruby-3.0.0/include/ruby-3.0.0/x86_64-darwin20
 PATH_SEPARATOR = :
 VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby:$(srcdir)/backend
-prefix = $(DESTDIR)/home/samuel/.rubies/ruby-3.0.0
+prefix = $(DESTDIR)/Users/samuel/.rubies/ruby-3.0.0
 rubysitearchprefix = $(rubylibprefix)/$(sitearch)
 rubyarchprefix = $(rubylibprefix)/$(arch)
 rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
@@ -50,7 +50,7 @@ dvidir = $(docdir)
 htmldir = $(docdir)
 infodir = $(datarootdir)/info
 docdir = $(datarootdir)/doc/$(PACKAGE)
-oldincludedir = $(DESTDIR)/usr/include
+oldincludedir = $(SDKROOT)/usr/include
 includedir = $(prefix)/include
 runstatedir = $(localstatedir)/run
 localstatedir = $(prefix)/var
@@ -65,12 +65,12 @@ archdir = $(rubyarchdir)
 
 
 CC_WRAPPER = 
-CC = gcc
-CXX = g++
+CC = clang -fdeclspec
+CXX = clang++ -fdeclspec
 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)
+LIBRUBYARG_SHARED = 
+LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static -framework Security -framework Foundation $(MAINLIBS)
 empty =
 OUTFLAG = -o $(empty)
 COUTFLAG = -o $(empty)
@@ -81,31 +81,31 @@ 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
+warnflags = -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
 cppflags = 
-CCDLFLAGS = -fPIC
-CFLAGS   = $(CCDLFLAGS) $(cflags) $(ARCH_FLAG)
+CCDLFLAGS = -fno-common
+CFLAGS   = $(CCDLFLAGS) $(cflags)  -pipe -Wall $(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)
+CPPFLAGS = -DRUBY_EXTCONF_H=\"$(RUBY_EXTCONF_H)\"  -I/opt/local/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT $(DEFS) $(cppflags)
 CXXFLAGS = $(CCDLFLAGS)  $(ARCH_FLAG)
-ldflags  = -L. -fstack-protector-strong -rdynamic -Wl,-export-dynamic
-dldflags = -Wl,--compress-debug-sections=zlib 
+ldflags  = -L. -fstack-protector-strong -L/opt/local/lib
+dldflags = -Wl,-undefined,dynamic_lookup -Wl,-multiply_defined,suppress -L/opt/local/lib 
 ARCH_FLAG = 
 DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG)
-LDSHARED = $(CC) -shared
-LDSHAREDXX = $(CXX) -shared
-AR = gcc-ar
+LDSHARED = $(CC) -dynamic -bundle
+LDSHAREDXX = $(CXX) -dynamic -bundle
+AR = ar
 EXEEXT = 
 
 RUBY_INSTALL_NAME = $(RUBY_BASE_NAME)
-RUBY_SO_NAME = ruby
+RUBY_SO_NAME = ruby.3.0
 RUBYW_INSTALL_NAME = 
 RUBY_VERSION_NAME = $(RUBY_BASE_NAME)-$(ruby_version)
 RUBYW_BASE_NAME = rubyw
 RUBY_BASE_NAME = ruby
 
-arch = x86_64-linux
+arch = x86_64-darwin20
 sitearch = $(arch)
 ruby_version = 3.0.0
 ruby = $(bindir)/$(RUBY_BASE_NAME)
@@ -114,8 +114,8 @@ ruby_headers = $(hdrdir)/ruby.h $(hdrdir)/ruby/backward.h $(hdrdir)/ruby/ruby.h
 
 RM = rm -f
 RM_RF = $(RUBY) -run -e rm -- -rf
-RMDIRS = rmdir --ignore-fail-on-non-empty -p
-MAKEDIRS = /usr/bin/mkdir -p
+RMDIRS = rmdir -p
+MAKEDIRS = /opt/local/bin/gmkdir -p
 INSTALL = /usr/bin/install -c
 INSTALL_PROG = $(INSTALL) -m 0755
 INSTALL_DATA = $(INSTALL) -m 644
@@ -125,8 +125,8 @@ TOUCH = exit >
 #### End of system configuration section. ####
 
 preload = 
-libpath = . $(libdir)
-LIBPATH =  -L. -L$(libdir) -Wl,-rpath,$(libdir)
+libpath = . $(libdir) /opt/local/lib
+LIBPATH =  -L. -L$(libdir) -L/opt/local/lib
 DEFFILE = 
 
 CLEANFILES = mkmf.log
@@ -137,16 +137,16 @@ extout =
 extout_prefix = 
 target_prefix = /event
 LOCAL_LIBS = 
-LIBS =  -luring  -lm   -lc
+LIBS =    
 ORIG_SRCS = event.c
-SRCS = $(ORIG_SRCS) event.c uring.c epoll.c
-OBJS = event.o uring.o epoll.o
+SRCS = $(ORIG_SRCS) event.c kqueue.c
+OBJS = event.o kqueue.o
 HDRS = $(srcdir)/event.h $(srcdir)/extconf.h
 LOCAL_HDRS = 
 TARGET = event
 TARGET_NAME = event
 TARGET_ENTRY = Init_$(TARGET_NAME)
-DLLIB = $(TARGET).so
+DLLIB = $(TARGET).bundle
 EXTSTATIC = 
 STATIC_LIB = 
 
@@ -260,6 +260,7 @@ $(TARGET_SO): $(OBJS) Makefile
 	$(ECHO) linking shared-object event/$(DLLIB)
 	-$(Q)$(RM) $(@)
 	$(Q) $(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
+	$(Q) $(POSTLINK)
 
 
 

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;
@@ -212,28 +212,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_without_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_with_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) {

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;
@@ -97,50 +97,112 @@ 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;
+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 (events & READABLE) filter |= EVFILT_READ;
-	if (events & PRIORITY) filter |= EV_OOBAND;
-	if (events & WRITABLE) filter |= EVFILT_WRITE;
+	if (result == -1) {
+		rb_sys_fail("kevent(register)");
+	}
 	
-	return filter;
+	return events;
 }
 
-static inline
-int events_from_kqueue_filter(u_short filter) {
-	int events = 0;
+static
+void io_remove_filters(int descriptor, int ident, int events) {
+	int count = 0;
+	struct kevent kevents[2] = {0};
 	
-	if (filter & EVFILT_READ) events |= READABLE;
-	if (filter & EV_OOBAND) events |= PRIORITY;
-	if (filter & EVFILT_WRITE) events |= WRITABLE;
+	if (events & READABLE) {
+		kevents[count].ident = ident;
+		kevents[count].filter = EVFILT_READ;
+		kevents[count].flags = EV_DELETE;
+		
+		count++;
+	}
+	
+	if (events & WRITABLE) {
+		kevents[count].ident = ident;
+		kevents[count].filter = EVFILT_WRITE;
+		kevents[count].flags = EV_DELETE;
+		count++;
+	}
 	
-	return INT2NUM(events);
+	// 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;
+	
+	io_remove_filters(arguments->data->descriptor, arguments->descriptor, arguments->events);
+	
+	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);
+	
+	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);
 	
-	struct kevent event = {0};
-	
 	int descriptor = NUM2INT(rb_funcall(io, id_fileno, 0));
 	
-	event.ident = descriptor;
-	event.filter = kqueue_filters_from_events(events);
-	event.flags = EV_ADD | EV_ENABLE | EV_ONESHOT;
-	event.udata = (void*)fiber;
-	
-	// A better approach is to batch all changes:
-	int result = kevent(data->descriptor, &event, 1, NULL, 0, NULL);
-	
-	if (result == -1) {
-		rb_sys_fail("kevent");
-	}
+	struct io_wait_arguments io_wait_arguments = {
+		.events = io_add_filters(data->descriptor, descriptor, NUM2INT(events), fiber),
+		.data = data,
+		.descriptor = descriptor,
+	};
 	
-	VALUE result = rb_funcall(data->loop, id_transfer, 0);
-	return INT2NUM(events_from_kqueue_filter(NUM2INT(result)));
+	return rb_rescue(io_wait_transfer, (VALUE)&io_wait_arguments, io_wait_rescue, (VALUE)&io_wait_arguments);
 }
 
 static
@@ -158,7 +220,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 +231,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) {

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 = 64};
+enum {URING_MAX_EVENTS = 64};
 
 struct Event_Backend_URing {
 	VALUE loop;
@@ -122,28 +122,76 @@ int events_from_poll_flags(short flags) {
 	return events;
 }
 
+struct io_wait_arguments {
+	struct Event_Backend_URing *data;
+	VALUE fiber;
+	short flags;
+};
+
+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 = Event_Backend_URing_io_uring_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));
+};
+
+struct io_uring_sqe *Event_Backend_URing_io_uring_get_sqe(struct Event_Backend_URing *data) {
+	struct io_uring_sqe *sqe = NULL;
+
+	while (true) {
+		sqe = io_uring_get_sqe(&data->ring);
+		if (sqe != NULL) {
+			return sqe;
+		}
+		// The sqe is full, we need to poll before submitting more events.
+		Event_Backend_URing_select(self, INT2NUM(0));
+	}
+}
+
 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 = Event_Backend_URing_io_uring_get_sqe(data);
 	
 	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 +224,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 = Event_Backend_URing_io_uring_get_sqe(data);
 	
 	struct iovec iovecs[1];
 	iovecs[0].iov_base = RSTRING_PTR(buffer) + NUM2SIZET(offset);
@@ -208,7 +256,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 = Event_Backend_URing_io_uring_get_sqe(data);
 	
 	struct iovec iovecs[1];
 	iovecs[0].iov_base = RSTRING_PTR(buffer) + NUM2SIZET(offset);
@@ -244,7 +292,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 +303,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]);
 		

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.h

@@ -0,0 +1,4 @@
+#ifndef EXTCONF_H
+#define EXTCONF_H
+#define HAVE_SYS_EVENT_H 1
+#endif

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/ext/event/mkmf.log

@@ -0,0 +1,73 @@
+have_library: checking for -luring... -------------------- no
+
+"clang -fdeclspec -o conftest -I/Users/samuel/.rubies/ruby-3.0.0/include/ruby-3.0.0/x86_64-darwin20 -I/Users/samuel/.rubies/ruby-3.0.0/include/ruby-3.0.0/ruby/backward -I/Users/samuel/.rubies/ruby-3.0.0/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.0/lib -L/opt/local/lib -L. -fstack-protector-strong -L/opt/local/lib     -lruby.3.0-static -framework Security -framework Foundation -lpthread -lgmp -ldl -lobjc   "
+checked program was:
+/* begin */
+1: #include "ruby.h"
+2: 
+3: int main(int argc, char **argv)
+4: {
+5:   return !!argv[argc];
+6: }
+/* end */
+
+"clang -fdeclspec -o conftest -I/Users/samuel/.rubies/ruby-3.0.0/include/ruby-3.0.0/x86_64-darwin20 -I/Users/samuel/.rubies/ruby-3.0.0/include/ruby-3.0.0/ruby/backward -I/Users/samuel/.rubies/ruby-3.0.0/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.0/lib -L/opt/local/lib -L. -fstack-protector-strong -L/opt/local/lib     -lruby.3.0-static -framework Security -framework Foundation -lpthread -lgmp -ldl -lobjc -luring   "
+ld: library not found for -luring
+clang: error: linker command failed with exit code 1 (use -v to see invocation)
+checked program was:
+/* begin */
+ 1: #include "ruby.h"
+ 2: 
+ 3: /*top*/
+ 4: extern int t(void);
+ 5: int main(int argc, char **argv)
+ 6: {
+ 7:   if (argc > 1000000) {
+ 8:     int (* volatile tp)(void)=(int (*)(void))&t;
+ 9:     printf("%d", (*tp)());
+10:   }
+11: 
+12:   return !!argv[argc];
+13: }
+14: 
+15: int t(void) { ; return 0; }
+/* end */
+
+--------------------
+
+have_header: checking for sys/epoll.h... -------------------- no
+
+"clang -E -I/Users/samuel/.rubies/ruby-3.0.0/include/ruby-3.0.0/x86_64-darwin20 -I/Users/samuel/.rubies/ruby-3.0.0/include/ruby-3.0.0/ruby/backward -I/Users/samuel/.rubies/ruby-3.0.0/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/epoll.h' file not found
+#include <sys/epoll.h>
+         ^~~~~~~~~~~~~
+1 error generated.
+checked program was:
+/* begin */
+1: #include "ruby.h"
+2: 
+3: #include <sys/epoll.h>
+/* end */
+
+--------------------
+
+have_header: checking for sys/event.h... -------------------- yes
+
+"clang -E -I/Users/samuel/.rubies/ruby-3.0.0/include/ruby-3.0.0/x86_64-darwin20 -I/Users/samuel/.rubies/ruby-3.0.0/include/ruby-3.0.0/ruby/backward -I/Users/samuel/.rubies/ruby-3.0.0/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"
+checked program was:
+/* begin */
+1: #include "ruby.h"
+2: 
+3: #include <sys/event.h>
+/* end */
+
+--------------------
+
+extconf.h is:
+/* begin */
+1: #ifndef EXTCONF_H
+2: #define EXTCONF_H
+3: #define HAVE_SYS_EVENT_H 1
+4: #endif
+/* end */
+

data/lib/event/backend/select.rb

@@ -29,15 +29,23 @@ module Event
 			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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: event
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-28 00:00:00.000000000 Z
+date: 2021-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bake
@@ -81,9 +81,14 @@ files:
 - ext/event/backend/kqueue.h
 - ext/event/backend/uring.c
 - ext/event/backend/uring.h
+- ext/event/event.bundle
 - ext/event/event.c
 - ext/event/event.h
+- ext/event/event.o
+- ext/event/extconf.h
 - ext/event/extconf.rb
+- ext/event/kqueue.o
+- ext/event/mkmf.log
 - lib/event.rb
 - lib/event/backend/select.rb
 - lib/event/debug/selector.rb
@@ -108,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: An event loop.