event 0.6.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0380b6d95d8bd8f8d378820eefa77e6c6f0f1aaceb2afec54cb4d38f57747cbc'
-  data.tar.gz: 2a0bfede977154f30a402fda4ec445eedc4daf3893bae8760eceaa1e58c999be
+  metadata.gz: 62bded3e0e8e8929ef5f76b427a975f1444c215d3566423e17b6aecdcbbb1f0b
+  data.tar.gz: 6c241f562c00af271443406efa52c935f84fb6b30023b4c7086a8c4ee5b7b965
 SHA512:
-  metadata.gz: d12fab2ce89b8c22d583a7472670f8bdb5b5b3428832938f9c51ce3635f08bfaf7d107b6568f762849a4fa8b32fdb0d79823bbd4ebd795b690e885b0eff52798
-  data.tar.gz: 793cf18caeb1457cd5499ee3d0fd2108dbf46e953cbc11b80e7c800efeb6beac279395a24da420b4c751a89ee5ecd54ad53a3b3a58d4b07d75e9a89d84a8be4d
+  metadata.gz: 75b5af033d60eb53df18b9b6fe9805827ccd4bfef0f4e26943428ddb4aee43006ce4eb12897102d33d50b31834c7bbd0be70821f2bcd6fe30cab5a657839321a
+  data.tar.gz: 57d719b1318c0740c58df4476ffb44719c8ded66d78889eeb60e15aead7d86e9778ad464a460dda4a2318f3435450e43778873aac8ea7a9c0150c37f828b4646

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,23 +30,29 @@ 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')
+
 create_header
 
 # Generate the makefile to compile the native binary into `lib`:

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,70 +27,69 @@
 
 #include "pidfd.c"
 
-static VALUE Event_Backend_EPoll = Qnil;
-static ID id_fileno;
+static VALUE Event_Selector_EPoll = Qnil;
 
 enum {EPOLL_MAX_EVENTS = 64};
 
-struct Event_Backend_EPoll {
-	VALUE loop;
+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;
-	rb_gc_mark(data->loop);
+	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);
 	
-	data->loop = 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);
 	
-	data->loop = loop;
+	Event_Selector_initialize(&data->backend, loop);
 	int result = epoll_create1(EPOLL_CLOEXEC);
 	
 	if (result == -1) {
@@ -104,17 +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_Selector_EPoll_transfer(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);
+	
+	Event_Selector_wait_and_transfer(&data->backend, argc, argv);
+	
+	return Qnil;
+}
+
+VALUE Event_Selector_EPoll_yield(VALUE self)
+{
+	struct Event_Selector_EPoll *data = NULL;
+	TypedData_Get_Struct(self, struct Event_Selector_EPoll, &Event_Selector_EPoll_Type, data);
+	
+	Event_Selector_yield(&data->backend);
+	
+	return Qnil;
+}
+
+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;
@@ -124,9 +168,9 @@ static
 VALUE process_wait_transfer(VALUE _arguments) {
 	struct process_wait_arguments *arguments = (struct process_wait_arguments *)_arguments;
 	
-	Event_Backend_transfer(arguments->data->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
@@ -140,10 +184,10 @@ 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,
 		.pid = NUM2PIDT(pid),
@@ -171,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;
@@ -185,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;
 };
@@ -217,18 +261,18 @@ static
 VALUE io_wait_transfer(VALUE _arguments) {
 	struct io_wait_arguments *arguments = (struct io_wait_arguments *)_arguments;
 	
-	VALUE result = Event_Backend_transfer(arguments->data->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 = NUM2INT(rb_funcall(io, id_fileno, 0));
+	int descriptor = Event_Selector_io_descriptor(io);
 	int duplicate = -1;
 	
 	event.events = epoll_flags_from_events(NUM2INT(events));
@@ -264,6 +308,8 @@ VALUE Event_Backend_EPoll_io_wait(VALUE self, VALUE fiber, VALUE io, VALUE event
 	return rb_ensure(io_wait_transfer, (VALUE)&io_wait_arguments, io_wait_ensure, (VALUE)&io_wait_arguments);
 }
 
+#ifdef HAVE_RUBY_IO_BUFFER_H
+
 struct io_read_arguments {
 	VALUE self;
 	VALUE fiber;
@@ -274,7 +320,6 @@ struct io_read_arguments {
 	int descriptor;
 	
 	VALUE buffer;
-	size_t offset;
 	size_t length;
 };
 
@@ -282,58 +327,54 @@ static
 VALUE io_read_loop(VALUE _arguments) {
 	struct io_read_arguments *arguments = (struct io_read_arguments *)_arguments;
 	
-	size_t offset = arguments->offset;
+	void *base;
+	size_t size;
+	rb_io_buffer_get_mutable(arguments->buffer, &base, &size);
+	
+	size_t offset = 0;
 	size_t length = arguments->length;
-	size_t total = 0;
 	
 	while (length > 0) {
-		char *buffer = Event_Backend_resize_to_capacity(arguments->buffer, offset, length);
-		ssize_t result = read(arguments->descriptor, buffer+offset, length);
+		size_t maximum_size = size - offset;
+		ssize_t result = read(arguments->descriptor, (char*)base+offset, maximum_size);
 		
-		if (result >= 0) {
+		if (result == 0) {
+			break;
+		} else if (result > 0) {
 			offset += result;
 			length -= result;
-			total += 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");
 		}
 	}
 	
-	Event_Backend_resize_to_fit(arguments->buffer, arguments->offset, arguments->length);
-	
-	return SIZET2NUM(total);
+	return SIZET2NUM(offset);
 }
 
 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 _offset, VALUE _length) {
-	struct Event_Backend_EPoll *data = NULL;
-	TypedData_Get_Struct(self, struct Event_Backend_EPoll, &Event_Backend_EPoll_Type, data);
-	
-	int descriptor = RB_NUM2INT(rb_funcall(io, id_fileno, 0));
+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 offset = NUM2SIZET(_offset);
 	size_t length = NUM2SIZET(_length);
 	
-	
 	struct io_read_arguments io_read_arguments = {
 		.self = self,
 		.fiber = fiber,
 		.io = io,
 		
-		.flags = Event_Backend_nonblock_set(descriptor),
+		.flags = Event_Selector_nonblock_set(descriptor),
 		.descriptor = descriptor,
 		.buffer = buffer,
-		.offset = offset,
 		.length = length,
 	};
 	
@@ -350,7 +391,6 @@ struct io_write_arguments {
 	int descriptor;
 	
 	VALUE buffer;
-	size_t offset;
 	size_t length;
 };
 
@@ -358,44 +398,45 @@ static
 VALUE io_write_loop(VALUE _arguments) {
 	struct io_write_arguments *arguments = (struct io_write_arguments *)_arguments;
 	
-	size_t offset = arguments->offset;
+	const void *base;
+	size_t size;
+	rb_io_buffer_get_immutable(arguments->buffer, &base, &size);
+	
+	size_t offset = 0;
 	size_t length = arguments->length;
-	size_t total = 0;
+	
+	if (length > size) {
+		rb_raise(rb_eRuntimeError, "Length exceeds size of buffer!");
+	}
 	
 	while (length > 0) {
-		char *buffer = Event_Backend_verify_size(arguments->buffer, offset, length);
-		ssize_t result = write(arguments->descriptor, buffer+offset, length);
+		ssize_t result = write(arguments->descriptor, (char*)base+offset, length);
 		
 		if (result >= 0) {
-			length -= result;
 			offset += result;
-			total += 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");
 		}
 	}
 	
-	return SIZET2NUM(total);
+	return SIZET2NUM(offset);
 };
 
 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 _offset, VALUE _length) {
-	struct Event_Backend_EPoll *data = NULL;
-	TypedData_Get_Struct(self, struct Event_Backend_EPoll, &Event_Backend_EPoll_Type, data);
+VALUE Event_Selector_EPoll_io_write(VALUE self, VALUE fiber, VALUE io, VALUE buffer, VALUE _length) {
+	int descriptor = Event_Selector_io_descriptor(io);
 	
-	int descriptor = NUM2INT(rb_funcall(io, id_fileno, 0));
-	
-	size_t offset = NUM2SIZET(_offset);
 	size_t length = NUM2SIZET(_length);
 	
 	struct io_write_arguments io_write_arguments = {
@@ -403,16 +444,17 @@ 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,
-		.offset = offset,
 		.length = length,
 	};
 	
 	return rb_ensure(io_write_loop, (VALUE)&io_write_arguments, io_write_ensure, (VALUE)&io_write_arguments);
 }
 
+#endif
+
 static
 int make_timeout(VALUE duration) {
 	if (duration == Qnil) {
@@ -433,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];
@@ -468,9 +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);
+	
+	int ready = Event_Selector_queue_flush(&data->backend);
 	
 	struct select_arguments arguments = {
 		.data = data,
@@ -478,8 +522,9 @@ VALUE Event_Backend_EPoll_select(VALUE self, VALUE duration) {
 	};
 	
 	select_internal_with_gvl(&arguments);
-	
-	if (arguments.count == 0) {
+
+	// If the ready list was empty and no events were processed:	
+	if (!ready && arguments.count == 0) {
 		arguments.timeout = make_timeout(duration);
 		
 		if (arguments.timeout != 0) {
@@ -493,25 +538,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_transfer_result(fiber, result);
+		Event_Selector_fiber_transfer(fiber, 1, &result);
 	}
 	
 	return INT2NUM(arguments.count);
 }
 
-void Init_Event_Backend_EPoll(VALUE Event_Backend) {
-	id_fileno = rb_intern("fileno");
+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);
 	
-	Event_Backend_EPoll = rb_define_class_under(Event_Backend, "EPoll", rb_cObject);
+	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_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, "select", Event_Backend_EPoll_select, 1);
-	rb_define_method(Event_Backend_EPoll, "close", Event_Backend_EPoll_close, 0);
+	rb_define_method(Event_Selector_EPoll, "io_wait", Event_Selector_EPoll_io_wait, 3);
 	
-	rb_define_method(Event_Backend_EPoll, "io_wait", Event_Backend_EPoll_io_wait, 3);
-	rb_define_method(Event_Backend_EPoll, "io_read", Event_Backend_EPoll_io_read, 5);
-	rb_define_method(Event_Backend_EPoll, "io_write", Event_Backend_EPoll_io_write, 5);
+#ifdef HAVE_RUBY_IO_BUFFER_H
+	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);
 }