event 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71ed23db589d68545077cbf271afe2145054b040e3c8001b052366c8588a76e1
-  data.tar.gz: 4c4e1e991044cc3abfbdd388dbfc6e4254de4ac3e97bec9faab60142c1f63525
+  metadata.gz: bbc589826b45d926acc5b2e3fd2ef49f67832b8e64562b5d860b43a74f850b72
+  data.tar.gz: 66ae0f0df1693d58cd6929ca8187ad2f0b9892920555d28595d7a0f94c07ffd4
 SHA512:
-  metadata.gz: 2f9ec25ff8d890e41589099ca347fc7c1ca1279dcc40c0065b759ac9e9c04ede4a9ad772f4beaadb794360b0af0a132db6f4e664ff36503995cc02a6ab3f7ff1
-  data.tar.gz: 6767cd4dfc6bc9c69bcfdc9ecb08e327315480919805fcca78c31c32eed19a7decbbdd2fc858897b678db06d58d40d935e77697e0a67ca1ee8408188da02861a
+  metadata.gz: 47addf50f1785a0f632776536186c7b6575de70bf4b4cdcf4f0ab816e6455737615f3ce3640980c3da23971f7f24509652c4c3aed898220f86fa7f394c4f549b
+  data.tar.gz: c584fbaa4b9fb3c73e6ed31c7eeaf86c8da69402d4233d2790e7cb0c4fbe31bf9d0ebabca0b94a855ae55da0dc18eeba77e83dfa7e8deb8d270e9a5c1b9b85f5

data/ext/event/Makefile

@@ -16,7 +16,7 @@ topdir = /Users/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0
 hdrdir = $(topdir)
 arch_hdrdir = /Users/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0/x86_64-darwin20
 PATH_SEPARATOR = :
-VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby:$(srcdir)/backend
+VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby:$(srcdir)/selector
 prefix = $(DESTDIR)/Users/samuel/.rubies/ruby-3.0.1
 rubysitearchprefix = $(rubylibprefix)/$(sitearch)
 rubyarchprefix = $(rubylibprefix)/$(arch)
@@ -139,8 +139,8 @@ target_prefix = /event
 LOCAL_LIBS = 
 LIBS =    
 ORIG_SRCS = event.c
-SRCS = $(ORIG_SRCS) event.c backend.c kqueue.c
-OBJS = event.o backend.o kqueue.o
+SRCS = $(ORIG_SRCS) event.c selector.c kqueue.c
+OBJS = event.o selector.o kqueue.o
 HDRS = $(srcdir)/event.h $(srcdir)/extconf.h
 LOCAL_HDRS = 
 TARGET = event

data/ext/event/event.c

@@ -19,10 +19,10 @@
 // THE SOFTWARE.
 
 #include "event.h"
-#include "backend/backend.h"
+#include "selector/selector.h"
 
 VALUE Event = Qnil;
-VALUE Event_Backend = Qnil;
+VALUE Event_Selector = Qnil;
 
 void Init_event()
 {
@@ -31,19 +31,19 @@ void Init_event()
 	#endif
 	
 	Event = rb_define_module("Event");
-	Event_Backend = rb_define_module_under(Event, "Backend");
+	Event_Selector = rb_define_module_under(Event, "Selector");
 	
-	Init_Event_Backend(Event_Backend);
+	Init_Event_Selector(Event_Selector);
 	
-	#ifdef EVENT_BACKEND_URING
-	Init_Event_Backend_URing(Event_Backend);
+	#ifdef EVENT_SELECTOR_URING
+	Init_Event_Selector_URing(Event_Selector);
 	#endif
 	
-	#ifdef EVENT_BACKEND_EPOLL
-	Init_Event_Backend_EPoll(Event_Backend);
+	#ifdef EVENT_SELECTOR_EPOLL
+	Init_Event_Selector_EPoll(Event_Selector);
 	#endif
 	
-	#ifdef EVENT_BACKEND_KQUEUE
-	Init_Event_Backend_KQueue(Event_Backend);
+	#ifdef EVENT_SELECTOR_KQUEUE
+	Init_Event_Selector_KQueue(Event_Selector);
 	#endif
 }

data/ext/event/event.h

@@ -27,13 +27,13 @@
 void Init_event();
 
 #ifdef HAVE_LIBURING_H
-#include "backend/uring.h"
+#include "selector/uring.h"
 #endif
 
 #ifdef HAVE_SYS_EPOLL_H
-#include "backend/epoll.h"
+#include "selector/epoll.h"
 #endif
 
 #ifdef HAVE_SYS_EVENT_H
-#include "backend/kqueue.h"
+#include "selector/kqueue.h"
 #endif

data/ext/event/extconf.rb

@@ -30,25 +30,26 @@ dir_config(extension_name)
 
 $CFLAGS << " -Wall"
 
-$srcs = ["event.c", "backend/backend.c"]
-$VPATH << "$(srcdir)/backend"
+$srcs = ["event.c", "selector/selector.c"]
+$VPATH << "$(srcdir)/selector"
 
 have_func('&rb_fiber_transfer')
 
 if have_library('uring') and have_header('liburing.h')
-	$srcs << "backend/uring.c"
+	$srcs << "selector/uring.c"
 end
 
 if have_header('sys/epoll.h')
-	$srcs << "backend/epoll.c"
+	$srcs << "selector/epoll.c"
 end
 
 if have_header('sys/event.h')
-	$srcs << "backend/kqueue.c"
+	$srcs << "selector/kqueue.c"
 end
 
 have_func("rb_io_descriptor")
 have_func("&rb_process_status_wait")
+have_func("&rb_fiber_raise")
 
 have_header('ruby/io/buffer.h')
 

data/ext/event/mkmf.log

@@ -118,7 +118,7 @@ checked program was:
 "clang -fdeclspec -o conftest -I/Users/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0/x86_64-darwin20 -I/Users/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0/ruby/backward -I/Users/samuel/.rubies/ruby-3.0.1/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.1/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   "
 Undefined symbols for architecture x86_64:
   "_rb_io_descriptor", referenced from:
-      _t in conftest-9dccb6.o
+      _t in conftest-839f76.o
 ld: symbol(s) not found for architecture x86_64
 clang: error: linker command failed with exit code 1 (use -v to see invocation)
 checked program was:
@@ -169,6 +169,37 @@ checked program was:
 
 --------------------
 
+have_func: checking for &rb_fiber_raise()... -------------------- no
+
+"clang -fdeclspec -o conftest -I/Users/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0/x86_64-darwin20 -I/Users/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0/ruby/backward -I/Users/samuel/.rubies/ruby-3.0.1/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.1/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   "
+conftest.c:14:76: error: use of undeclared identifier 'rb_fiber_raise'; did you mean 'rb_fiber_resume'?
+int t(void) { const volatile void *volatile p; p = (const volatile void *)&rb_fiber_raise; return !p; }
+                                                                           ^~~~~~~~~~~~~~
+                                                                           rb_fiber_resume
+/Users/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0/ruby/internal/intern/cont.h:32:7: note: 'rb_fiber_resume' declared here
+VALUE rb_fiber_resume(VALUE fib, int argc, const VALUE *argv);
+      ^
+1 error generated.
+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: int t(void) { const volatile void *volatile p; p = (const volatile void *)&rb_fiber_raise; return !p; }
+/* end */
+
+--------------------
+
 have_header: checking for ruby/io/buffer.h... -------------------- no
 
 "clang -E -I/Users/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0/x86_64-darwin20 -I/Users/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0/ruby/backward -I/Users/samuel/.rubies/ruby-3.0.1/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"

data/ext/event/{backend → selector}/epoll.c

@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 #include "kqueue.h"
-#include "backend.h"
+#include "selector.h"
 
 #include <sys/epoll.h>
 #include <time.h>
@@ -27,69 +27,69 @@
 
 #include "pidfd.c"
 
-static VALUE Event_Backend_EPoll = Qnil;
+static VALUE Event_Selector_EPoll = Qnil;
 
 enum {EPOLL_MAX_EVENTS = 64};
 
-struct Event_Backend_EPoll {
-	struct Event_Backend backend;
+struct Event_Selector_EPoll {
+	struct Event_Selector backend;
 	int descriptor;
 };
 
-void Event_Backend_EPoll_Type_mark(void *_data)
+void Event_Selector_EPoll_Type_mark(void *_data)
 {
-	struct Event_Backend_EPoll *data = _data;
-	Event_Backend_mark(&data->backend);
+	struct Event_Selector_EPoll *data = _data;
+	Event_Selector_mark(&data->backend);
 }
 
 static
-void close_internal(struct Event_Backend_EPoll *data) {
+void close_internal(struct Event_Selector_EPoll *data) {
 	if (data->descriptor >= 0) {
 		close(data->descriptor);
 		data->descriptor = -1;
 	}
 }
 
-void Event_Backend_EPoll_Type_free(void *_data)
+void Event_Selector_EPoll_Type_free(void *_data)
 {
-	struct Event_Backend_EPoll *data = _data;
+	struct Event_Selector_EPoll *data = _data;
 	
 	close_internal(data);
 	
 	free(data);
 }
 
-size_t Event_Backend_EPoll_Type_size(const void *data)
+size_t Event_Selector_EPoll_Type_size(const void *data)
 {
-	return sizeof(struct Event_Backend_EPoll);
+	return sizeof(struct Event_Selector_EPoll);
 }
 
-static const rb_data_type_t Event_Backend_EPoll_Type = {
+static const rb_data_type_t Event_Selector_EPoll_Type = {
 	.wrap_struct_name = "Event::Backend::EPoll",
 	.function = {
-		.dmark = Event_Backend_EPoll_Type_mark,
-		.dfree = Event_Backend_EPoll_Type_free,
-		.dsize = Event_Backend_EPoll_Type_size,
+		.dmark = Event_Selector_EPoll_Type_mark,
+		.dfree = Event_Selector_EPoll_Type_free,
+		.dsize = Event_Selector_EPoll_Type_size,
 	},
 	.data = NULL,
 	.flags = RUBY_TYPED_FREE_IMMEDIATELY,
 };
 
-VALUE Event_Backend_EPoll_allocate(VALUE self) {
-	struct Event_Backend_EPoll *data = NULL;
-	VALUE instance = TypedData_Make_Struct(self, struct Event_Backend_EPoll, &Event_Backend_EPoll_Type, data);
+VALUE Event_Selector_EPoll_allocate(VALUE self) {
+	struct Event_Selector_EPoll *data = NULL;
+	VALUE instance = TypedData_Make_Struct(self, struct Event_Selector_EPoll, &Event_Selector_EPoll_Type, data);
 	
-	Event_Backend_initialize(&data->backend, Qnil);
+	Event_Selector_initialize(&data->backend, Qnil);
 	data->descriptor = -1;
 	
 	return instance;
 }
 
-VALUE Event_Backend_EPoll_initialize(VALUE self, VALUE loop) {
-	struct Event_Backend_EPoll *data = NULL;
-	TypedData_Get_Struct(self, struct Event_Backend_EPoll, &Event_Backend_EPoll_Type, data);
+VALUE Event_Selector_EPoll_initialize(VALUE self, VALUE loop) {
+	struct Event_Selector_EPoll *data = NULL;
+	TypedData_Get_Struct(self, struct Event_Selector_EPoll, &Event_Selector_EPoll_Type, data);
 	
-	Event_Backend_initialize(&data->backend, loop);
+	Event_Selector_initialize(&data->backend, loop);
 	int result = epoll_create1(EPOLL_CLOEXEC);
 	
 	if (result == -1) {
@@ -103,44 +103,62 @@ 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);
+VALUE Event_Selector_EPoll_close(VALUE self) {
+	struct Event_Selector_EPoll *data = NULL;
+	TypedData_Get_Struct(self, struct Event_Selector_EPoll, &Event_Selector_EPoll_Type, data);
 	
 	close_internal(data);
 	
 	return Qnil;
 }
 
-VALUE Event_Backend_EPoll_transfer(VALUE self, VALUE fiber)
+VALUE Event_Selector_EPoll_transfer(int argc, VALUE *argv, VALUE self)
 {
-	struct Event_Backend_EPoll *data = NULL;
-	TypedData_Get_Struct(self, struct Event_Backend_EPoll, &Event_Backend_EPoll_Type, data);
+	struct Event_Selector_EPoll *data = NULL;
+	TypedData_Get_Struct(self, struct Event_Selector_EPoll, &Event_Selector_EPoll_Type, data);
 	
-	Event_Backend_wait_and_transfer(&data->backend, fiber);
+	Event_Selector_wait_and_transfer(&data->backend, argc, argv);
 	
 	return Qnil;
 }
 
-VALUE Event_Backend_EPoll_defer(VALUE self)
+VALUE Event_Selector_EPoll_yield(VALUE self)
 {
-	struct Event_Backend_EPoll *data = NULL;
-	TypedData_Get_Struct(self, struct Event_Backend_EPoll, &Event_Backend_EPoll_Type, data);
+	struct Event_Selector_EPoll *data = NULL;
+	TypedData_Get_Struct(self, struct Event_Selector_EPoll, &Event_Selector_EPoll_Type, data);
 	
-	Event_Backend_defer(&data->backend);
+	Event_Selector_yield(&data->backend);
 	
 	return Qnil;
 }
 
-VALUE Event_Backend_EPoll_ready_p(VALUE self) {
-	struct Event_Backend_EPoll *data = NULL;
-	TypedData_Get_Struct(self, struct Event_Backend_EPoll, &Event_Backend_EPoll_Type, data);
+VALUE Event_Selector_EPoll_push(VALUE self, VALUE fiber)
+{
+	struct Event_Selector_EPoll *data = NULL;
+	TypedData_Get_Struct(self, struct Event_Selector_EPoll, &Event_Selector_EPoll_Type, data);
+	
+	Event_Selector_queue_push(&data->backend, fiber);
+	
+	return Qnil;
+}
+
+VALUE Event_Selector_EPoll_raise(int argc, VALUE *argv, VALUE self)
+{
+	struct Event_Selector_EPoll *data = NULL;
+	TypedData_Get_Struct(self, struct Event_Selector_EPoll, &Event_Selector_EPoll_Type, data);
+	
+	return Event_Selector_wait_and_raise(&data->backend, argc, argv);
+}
+
+VALUE Event_Selector_EPoll_ready_p(VALUE self) {
+	struct Event_Selector_EPoll *data = NULL;
+	TypedData_Get_Struct(self, struct Event_Selector_EPoll, &Event_Selector_EPoll_Type, data);
 	
 	return data->backend.ready ? Qtrue : Qfalse;
 }
 
 struct process_wait_arguments {
-	struct Event_Backend_EPoll *data;
+	struct Event_Selector_EPoll *data;
 	pid_t pid;
 	int flags;
 	int descriptor;
@@ -150,9 +168,9 @@ static
 VALUE process_wait_transfer(VALUE _arguments) {
 	struct process_wait_arguments *arguments = (struct process_wait_arguments *)_arguments;
 	
-	Event_Backend_fiber_transfer(arguments->data->backend.loop);
+	Event_Selector_fiber_transfer(arguments->data->backend.loop, 0, NULL);
 	
-	return Event_Backend_process_status_wait(arguments->pid);
+	return Event_Selector_process_status_wait(arguments->pid);
 }
 
 static
@@ -166,9 +184,9 @@ VALUE process_wait_ensure(VALUE _arguments) {
 	return Qnil;
 }
 
-VALUE Event_Backend_EPoll_process_wait(VALUE self, VALUE fiber, VALUE pid, VALUE flags) {
-	struct Event_Backend_EPoll *data = NULL;
-	TypedData_Get_Struct(self, struct Event_Backend_EPoll, &Event_Backend_EPoll_Type, data);
+VALUE Event_Selector_EPoll_process_wait(VALUE self, VALUE fiber, VALUE pid, VALUE flags) {
+	struct Event_Selector_EPoll *data = NULL;
+	TypedData_Get_Struct(self, struct Event_Selector_EPoll, &Event_Selector_EPoll_Type, data);
 	
 	struct process_wait_arguments process_wait_arguments = {
 		.data = data,
@@ -197,9 +215,9 @@ static inline
 uint32_t epoll_flags_from_events(int events) {
 	uint32_t flags = 0;
 	
-	if (events & READABLE) flags |= EPOLLIN;
-	if (events & PRIORITY) flags |= EPOLLPRI;
-	if (events & WRITABLE) flags |= EPOLLOUT;
+	if (events & EVENT_READABLE) flags |= EPOLLIN;
+	if (events & EVENT_PRIORITY) flags |= EPOLLPRI;
+	if (events & EVENT_WRITABLE) flags |= EPOLLOUT;
 	
 	flags |= EPOLLRDHUP;
 	flags |= EPOLLONESHOT;
@@ -211,15 +229,15 @@ static inline
 int events_from_epoll_flags(uint32_t flags) {
 	int events = 0;
 	
-	if (flags & EPOLLIN) events |= READABLE;
-	if (flags & EPOLLPRI) events |= PRIORITY;
-	if (flags & EPOLLOUT) events |= WRITABLE;
+	if (flags & EPOLLIN) events |= EVENT_READABLE;
+	if (flags & EPOLLPRI) events |= EVENT_PRIORITY;
+	if (flags & EPOLLOUT) events |= EVENT_WRITABLE;
 	
 	return events;
 }
 
 struct io_wait_arguments {
-	struct Event_Backend_EPoll *data;
+	struct Event_Selector_EPoll *data;
 	int descriptor;
 	int duplicate;
 };
@@ -243,18 +261,18 @@ static
 VALUE io_wait_transfer(VALUE _arguments) {
 	struct io_wait_arguments *arguments = (struct io_wait_arguments *)_arguments;
 	
-	VALUE result = Event_Backend_fiber_transfer(arguments->data->backend.loop);
+	VALUE result = Event_Selector_fiber_transfer(arguments->data->backend.loop, 0, NULL);
 	
 	return INT2NUM(events_from_epoll_flags(NUM2INT(result)));
 };
 
-VALUE Event_Backend_EPoll_io_wait(VALUE self, VALUE fiber, VALUE io, VALUE events) {
-	struct Event_Backend_EPoll *data = NULL;
-	TypedData_Get_Struct(self, struct Event_Backend_EPoll, &Event_Backend_EPoll_Type, data);
+VALUE Event_Selector_EPoll_io_wait(VALUE self, VALUE fiber, VALUE io, VALUE events) {
+	struct Event_Selector_EPoll *data = NULL;
+	TypedData_Get_Struct(self, struct Event_Selector_EPoll, &Event_Selector_EPoll_Type, data);
 	
 	struct epoll_event event = {0};
 	
-	int descriptor = Event_Backend_io_descriptor(io);
+	int descriptor = Event_Selector_io_descriptor(io);
 	int duplicate = -1;
 	
 	event.events = epoll_flags_from_events(NUM2INT(events));
@@ -326,9 +344,9 @@ VALUE io_read_loop(VALUE _arguments) {
 			offset += result;
 			length -= result;
 		} else if (errno == EAGAIN || errno == EWOULDBLOCK) {
-			Event_Backend_EPoll_io_wait(arguments->self, arguments->fiber, arguments->io, RB_INT2NUM(READABLE));
+			Event_Selector_EPoll_io_wait(arguments->self, arguments->fiber, arguments->io, RB_INT2NUM(EVENT_READABLE));
 		} else {
-			rb_sys_fail("Event_Backend_EPoll_io_read");
+			rb_sys_fail("Event_Selector_EPoll_io_read");
 		}
 	}
 	
@@ -339,13 +357,13 @@ static
 VALUE io_read_ensure(VALUE _arguments) {
 	struct io_read_arguments *arguments = (struct io_read_arguments *)_arguments;
 	
-	Event_Backend_nonblock_restore(arguments->descriptor, arguments->flags);
+	Event_Selector_nonblock_restore(arguments->descriptor, arguments->flags);
 	
 	return Qnil;
 }
 
-VALUE Event_Backend_EPoll_io_read(VALUE self, VALUE fiber, VALUE io, VALUE buffer, VALUE _length) {
-	int descriptor = Event_Backend_io_descriptor(io);
+VALUE Event_Selector_EPoll_io_read(VALUE self, VALUE fiber, VALUE io, VALUE buffer, VALUE _length) {
+	int descriptor = Event_Selector_io_descriptor(io);
 	
 	size_t length = NUM2SIZET(_length);
 	
@@ -354,7 +372,7 @@ VALUE Event_Backend_EPoll_io_read(VALUE self, VALUE fiber, VALUE io, VALUE buffe
 		.fiber = fiber,
 		.io = io,
 		
-		.flags = Event_Backend_nonblock_set(descriptor),
+		.flags = Event_Selector_nonblock_set(descriptor),
 		.descriptor = descriptor,
 		.buffer = buffer,
 		.length = length,
@@ -398,9 +416,9 @@ VALUE io_write_loop(VALUE _arguments) {
 			offset += result;
 			length -= result;
 		} else if (errno == EAGAIN || errno == EWOULDBLOCK) {
-			Event_Backend_EPoll_io_wait(arguments->self, arguments->fiber, arguments->io, RB_INT2NUM(WRITABLE));
+			Event_Selector_EPoll_io_wait(arguments->self, arguments->fiber, arguments->io, RB_INT2NUM(EVENT_WRITABLE));
 		} else {
-			rb_sys_fail("Event_Backend_EPoll_io_write");
+			rb_sys_fail("Event_Selector_EPoll_io_write");
 		}
 	}
 	
@@ -411,13 +429,13 @@ static
 VALUE io_write_ensure(VALUE _arguments) {
 	struct io_write_arguments *arguments = (struct io_write_arguments *)_arguments;
 	
-	Event_Backend_nonblock_restore(arguments->descriptor, arguments->flags);
+	Event_Selector_nonblock_restore(arguments->descriptor, arguments->flags);
 	
 	return Qnil;
 };
 
-VALUE Event_Backend_EPoll_io_write(VALUE self, VALUE fiber, VALUE io, VALUE buffer, VALUE _length) {
-	int descriptor = Event_Backend_io_descriptor(io);
+VALUE Event_Selector_EPoll_io_write(VALUE self, VALUE fiber, VALUE io, VALUE buffer, VALUE _length) {
+	int descriptor = Event_Selector_io_descriptor(io);
 	
 	size_t length = NUM2SIZET(_length);
 	
@@ -426,7 +444,7 @@ VALUE Event_Backend_EPoll_io_write(VALUE self, VALUE fiber, VALUE io, VALUE buff
 		.fiber = fiber,
 		.io = io,
 		
-		.flags = Event_Backend_nonblock_set(descriptor),
+		.flags = Event_Selector_nonblock_set(descriptor),
 		.descriptor = descriptor,
 		.buffer = buffer,
 		.length = length,
@@ -457,7 +475,7 @@ int make_timeout(VALUE duration) {
 }
 
 struct select_arguments {
-	struct Event_Backend_EPoll *data;
+	struct Event_Selector_EPoll *data;
 	
 	int count;
 	struct epoll_event events[EPOLL_MAX_EVENTS];
@@ -492,11 +510,11 @@ void select_internal_with_gvl(struct select_arguments *arguments) {
 	}
 }
 
-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);
+VALUE Event_Selector_EPoll_select(VALUE self, VALUE duration) {
+	struct Event_Selector_EPoll *data = NULL;
+	TypedData_Get_Struct(self, struct Event_Selector_EPoll, &Event_Selector_EPoll_Type, data);
 	
-	Event_Backend_ready_pop(&data->backend);
+	int ready = Event_Selector_queue_flush(&data->backend);
 	
 	struct select_arguments arguments = {
 		.data = data,
@@ -505,10 +523,10 @@ VALUE Event_Backend_EPoll_select(VALUE self, VALUE duration) {
 	
 	select_internal_with_gvl(&arguments);
 	
-	if (arguments.count == 0) {
+	if (!ready && arguments.count == 0) {
 		arguments.timeout = make_timeout(duration);
 		
-		if (!data->backend.ready && arguments.timeout != 0) {
+		if (arguments.timeout != 0) {
 			select_internal_without_gvl(&arguments);
 		}
 	}
@@ -519,29 +537,34 @@ VALUE Event_Backend_EPoll_select(VALUE self, VALUE duration) {
 		
 		// fprintf(stderr, "-> fiber=%p descriptor=%d\n", (void*)fiber, events[i].data.fd);
 		
-		Event_Backend_fiber_transfer_result(fiber, result);
+		Event_Selector_fiber_transfer(fiber, 1, &result);
 	}
 	
 	return INT2NUM(arguments.count);
 }
 
-void Init_Event_Backend_EPoll(VALUE Event_Backend) {
-	Event_Backend_EPoll = rb_define_class_under(Event_Backend, "EPoll", rb_cObject);
+void Init_Event_Selector_EPoll(VALUE Event_Selector) {
+	Event_Selector_EPoll = rb_define_class_under(Event_Selector, "EPoll", rb_cObject);
+	
+	rb_define_alloc_func(Event_Selector_EPoll, Event_Selector_EPoll_allocate);
+	rb_define_method(Event_Selector_EPoll, "initialize", Event_Selector_EPoll_initialize, 1);
+	
+	rb_define_method(Event_Selector_EPoll, "transfer", Event_Selector_EPoll_transfer, -1);
+	rb_define_method(Event_Selector_EPoll, "yield", Event_Selector_EPoll_yield, 0);
+	rb_define_method(Event_Selector_EPoll, "push", Event_Selector_EPoll_push, 1);
+	rb_define_method(Event_Selector_EPoll, "raise", Event_Selector_EPoll_raise, -1);
+	
+	rb_define_method(Event_Selector_EPoll, "ready?", Event_Selector_EPoll_ready_p, 0);
 	
-	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, "transfer", Event_Backend_EPoll_transfer, 1);
-	rb_define_method(Event_Backend_EPoll, "defer", Event_Backend_EPoll_defer, 0);
-	rb_define_method(Event_Backend_EPoll, "ready?", Event_Backend_EPoll_ready_p, 0);
-	rb_define_method(Event_Backend_EPoll, "select", Event_Backend_EPoll_select, 1);
-	rb_define_method(Event_Backend_EPoll, "close", Event_Backend_EPoll_close, 0);
+	rb_define_method(Event_Selector_EPoll, "select", Event_Selector_EPoll_select, 1);
+	rb_define_method(Event_Selector_EPoll, "close", Event_Selector_EPoll_close, 0);
 	
-	rb_define_method(Event_Backend_EPoll, "io_wait", Event_Backend_EPoll_io_wait, 3);
+	rb_define_method(Event_Selector_EPoll, "io_wait", Event_Selector_EPoll_io_wait, 3);
 	
 #ifdef HAVE_RUBY_IO_BUFFER_H
-	rb_define_method(Event_Backend_EPoll, "io_read", Event_Backend_EPoll_io_read, 4);
-	rb_define_method(Event_Backend_EPoll, "io_write", Event_Backend_EPoll_io_write, 4);
+	rb_define_method(Event_Selector_EPoll, "io_read", Event_Selector_EPoll_io_read, 4);
+	rb_define_method(Event_Selector_EPoll, "io_write", Event_Selector_EPoll_io_write, 4);
 #endif
 	
-	rb_define_method(Event_Backend_EPoll, "process_wait", Event_Backend_EPoll_process_wait, 3);
+	rb_define_method(Event_Selector_EPoll, "process_wait", Event_Selector_EPoll_process_wait, 3);
 }