event 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0380b6d95d8bd8f8d378820eefa77e6c6f0f1aaceb2afec54cb4d38f57747cbc'
-  data.tar.gz: 2a0bfede977154f30a402fda4ec445eedc4daf3893bae8760eceaa1e58c999be
+  metadata.gz: 71ed23db589d68545077cbf271afe2145054b040e3c8001b052366c8588a76e1
+  data.tar.gz: 4c4e1e991044cc3abfbdd388dbfc6e4254de4ac3e97bec9faab60142c1f63525
 SHA512:
-  metadata.gz: d12fab2ce89b8c22d583a7472670f8bdb5b5b3428832938f9c51ce3635f08bfaf7d107b6568f762849a4fa8b32fdb0d79823bbd4ebd795b690e885b0eff52798
-  data.tar.gz: 793cf18caeb1457cd5499ee3d0fd2108dbf46e953cbc11b80e7c800efeb6beac279395a24da420b4c751a89ee5ecd54ad53a3b3a58d4b07d75e9a89d84a8be4d
+  metadata.gz: 2f9ec25ff8d890e41589099ca347fc7c1ca1279dcc40c0065b759ac9e9c04ede4a9ad772f4beaadb794360b0af0a132db6f4e664ff36503995cc02a6ab3f7ff1
+  data.tar.gz: 6767cd4dfc6bc9c69bcfdc9ecb08e327315480919805fcca78c31c32eed19a7decbbdd2fc858897b678db06d58d40d935e77697e0a67ca1ee8408188da02861a

data/ext/event/backend/backend.c

@@ -21,88 +21,158 @@
 #include "backend.h"
 #include <fcntl.h>
 
-static ID id_transfer, id_wait;
-static VALUE rb_Process_Status = Qnil;
-
-void Init_Event_Backend(VALUE Event_Backend) {
-	id_transfer = rb_intern("transfer");
-	id_wait = rb_intern("wait");
-	// id_alive_p = rb_intern("alive?");
-	rb_Process_Status = rb_const_get_at(rb_mProcess, rb_intern("Status"));
-}
+#ifndef HAVE__RB_FIBER_TRANSFER
+static ID id_transfer;
 
 VALUE
-Event_Backend_transfer(VALUE fiber) {
-#ifdef HAVE__RB_FIBER_TRANSFER
-	return rb_fiber_transfer(fiber, 0, NULL);
-#else
+Event_Backend_fiber_transfer(VALUE fiber) {
 	return rb_funcall(fiber, id_transfer, 0);
-#endif
 }
 
 VALUE
-Event_Backend_transfer_result(VALUE fiber, VALUE result) {
-	// if (!RTEST(rb_fiber_alive_p(fiber))) {
-	// 	return Qnil;
-	// }
-	
-#ifdef HAVE__RB_FIBER_TRANSFER
-	return rb_fiber_transfer(fiber, 1, &result);
-#else
+Event_Backend_fiber_transfer_result(VALUE fiber, VALUE result) {
 	return rb_funcall(fiber, id_transfer, 1, result);
+}
 #endif
+
+#ifndef HAVE_RB_IO_DESCRIPTOR
+static ID id_fileno;
+
+int Event_Backend_io_descriptor(VALUE io) {
+	return RB_NUM2INT(rb_funcall(io, id_fileno, 0));
 }
+#endif
+
+#ifndef HAVE_RB_PROCESS_STATUS_WAIT
+static ID id_wait;
+static VALUE rb_Process_Status = Qnil;
 
 VALUE Event_Backend_process_status_wait(rb_pid_t pid)
 {
 	return rb_funcall(rb_Process_Status, id_wait, 2, PIDT2NUM(pid), INT2NUM(WNOHANG));
 }
+#endif
 
-char* Event_Backend_verify_size(VALUE buffer, size_t offset, size_t length) {
-	if ((size_t)RSTRING_LEN(buffer) < offset + length) {
-		rb_raise(rb_eRuntimeError, "invalid offset/length exceeds bounds of buffer");
+int Event_Backend_nonblock_set(int file_descriptor)
+{
+	int flags = fcntl(file_descriptor, F_GETFL, 0);
+	
+	if (!(flags & O_NONBLOCK)) {
+		fcntl(file_descriptor, F_SETFL, flags | O_NONBLOCK);
 	}
 	
-	return RSTRING_PTR(buffer);
+	return flags;
 }
 
-char* Event_Backend_resize_to_capacity(VALUE string, size_t offset, size_t length) {
-	size_t current_length = RSTRING_LEN(string);
-	long difference = (long)(offset + length) - (long)current_length;
+void Event_Backend_nonblock_restore(int file_descriptor, int flags)
+{
+	if (!(flags & O_NONBLOCK)) {
+		fcntl(file_descriptor, F_SETFL, flags & ~flags);
+	}
+}
+
+void Init_Event_Backend(VALUE Event_Backend) {
+#ifndef HAVE_RB_IO_DESCRIPTOR
+	id_fileno = rb_intern("fileno");
+#endif
+	
+#ifndef HAVE__RB_FIBER_TRANSFER
+	id_transfer = rb_intern("transfer");
+#endif
 	
-	difference += 1;
+#ifndef HAVE_RB_PROCESS_STATUS_WAIT
+	id_wait = rb_intern("wait");
+	rb_Process_Status = rb_const_get_at(rb_mProcess, rb_intern("Status"));
+#endif
+}
+
+struct wait_and_transfer_arguments {
+	struct Event_Backend *backend;
+	struct Event_Backend_Queue *waiting;
+};
+
+static void queue_pop(struct Event_Backend *backend, struct Event_Backend_Queue *waiting) {
+	if (waiting->behind) {
+		waiting->behind->infront = waiting->infront;
+	} else {
+		backend->waiting = waiting->infront;
+	}
 	
-	if (difference > 0) {
-		rb_str_modify_expand(string, difference);
+	if (waiting->infront) {
+		waiting->infront->behind = waiting->behind;
+	} else {
+		backend->ready = waiting->behind;
+	}
+}
+
+static void queue_push(struct Event_Backend *backend, struct Event_Backend_Queue *waiting) {
+	if (backend->waiting) {
+		backend->waiting->behind = waiting;
+		waiting->infront = backend->waiting;
 	} else {
-		rb_str_modify(string);
+		backend->ready = waiting;
 	}
 	
-	return RSTRING_PTR(string);
+	backend->waiting = waiting;
+}
+
+static VALUE wait_and_transfer(VALUE fiber) {
+	return Event_Backend_fiber_transfer(fiber);
 }
 
-void Event_Backend_resize_to_fit(VALUE string, size_t offset, size_t length) {
-	size_t current_length = RSTRING_LEN(string);
+static VALUE wait_and_transfer_ensure(VALUE _arguments) {
+	struct wait_and_transfer_arguments *arguments = (struct wait_and_transfer_arguments *)_arguments;
 	
-	if (current_length < (offset + length)) {
-		rb_str_set_len(string, offset + length);
-	}
+	queue_pop(arguments->backend, arguments->waiting);
+	
+	return Qnil;
 }
 
-int Event_Backend_nonblock_set(int file_descriptor)
+void Event_Backend_wait_and_transfer(struct Event_Backend *backend, VALUE fiber)
 {
-	int flags = fcntl(file_descriptor, F_GETFL, 0);
+	struct Event_Backend_Queue waiting = {
+		.behind = NULL,
+		.infront = NULL,
+		.fiber = rb_fiber_current()
+	};
 	
-	if (!(flags & O_NONBLOCK)) {
-		fcntl(file_descriptor, F_SETFL, flags | O_NONBLOCK);
-	}
+	queue_push(backend, &waiting);
 	
-	return flags;
+	struct wait_and_transfer_arguments arguments = {
+		.backend = backend,
+		.waiting = &waiting,
+	};
+	
+	rb_ensure(wait_and_transfer, fiber, wait_and_transfer_ensure, (VALUE)&arguments);
 }
 
-void Event_Backend_nonblock_restore(int file_descriptor, int flags)
+void Event_Backend_ready_pop(struct Event_Backend *backend)
 {
-	if (!(flags & O_NONBLOCK)) {
-		fcntl(file_descriptor, F_SETFL, flags & ~flags);
+	// Get the current tail and head of the queue:
+	struct Event_Backend_Queue *waiting = backend->waiting;
+	
+	// Process from head to tail in order:
+	// During this, more items may be appended to tail.
+	while (backend->ready) {
+		struct Event_Backend_Queue *ready = backend->ready;
+		
+		Event_Backend_fiber_transfer(ready->fiber);
+		
+		if (ready == waiting) break;
 	}
-}
+}
+
+void Event_Backend_elapsed_time(struct timespec* start, struct timespec* stop, struct timespec *duration)
+{
+	if ((stop->tv_nsec - start->tv_nsec) < 0) {
+		duration->tv_sec = stop->tv_sec - start->tv_sec - 1;
+		duration->tv_nsec = stop->tv_nsec - start->tv_nsec + 1000000000;
+	} else {
+		duration->tv_sec = stop->tv_sec - start->tv_sec;
+		duration->tv_nsec = stop->tv_nsec - start->tv_nsec;
+	}
+}
+
+void Event_Backend_current_time(struct timespec *time) {
+	clock_gettime(CLOCK_MONOTONIC, time);
+}

data/ext/event/backend/backend.h

@@ -20,6 +20,13 @@
 
 #include <ruby.h>
 #include <ruby/thread.h>
+#include <ruby/io.h>
+
+#ifdef HAVE_RUBY_IO_BUFFER_H
+#include <ruby/io/buffer.h>
+#endif
+
+#include <time.h>
 
 enum Event {
 	READABLE = 1,
@@ -29,17 +36,77 @@ enum Event {
 	HANGUP = 16
 };
 
-void
-Init_Event_Backend();
+void Init_Event_Backend();
 
-VALUE Event_Backend_transfer(VALUE fiber);
-VALUE Event_Backend_transfer_result(VALUE fiber, VALUE argument);
+#ifdef HAVE__RB_FIBER_TRANSFER
+#define Event_Backend_fiber_transfer(fiber) rb_fiber_transfer(fiber, 0, NULL)
+#define Event_Backend_fiber_transfer_result(fiber, argument) rb_fiber_transfer(fiber, 1, &argument)
+#else
+VALUE Event_Backend_fiber_transfer(VALUE fiber);
+VALUE Event_Backend_fiber_transfer_result(VALUE fiber, VALUE argument);
+#endif
 
-VALUE Event_Backend_process_status_wait(rb_pid_t pid);
+#ifdef HAVE_RB_IO_DESCRIPTOR
+#define Event_Backend_io_descriptor(io) rb_io_descriptor(io)
+#else
+int Event_Backend_io_descriptor(VALUE io);
+#endif
 
-char* Event_Backend_verify_size(VALUE buffer, size_t offset, size_t length);
-char* Event_Backend_resize_to_capacity(VALUE string, size_t offset, size_t length);
-void Event_Backend_resize_to_fit(VALUE string, size_t offset, size_t length);
+#ifdef HAVE_RB_PROCESS_STATUS_WAIT
+#define Event_Backend_process_status_wait(pid) rb_process_status_wait(pid)
+#else
+VALUE Event_Backend_process_status_wait(rb_pid_t pid);
+#endif
 
 int Event_Backend_nonblock_set(int file_descriptor);
 void Event_Backend_nonblock_restore(int file_descriptor, int flags);
+
+struct Event_Backend_Queue {
+	struct Event_Backend_Queue *behind;
+	struct Event_Backend_Queue *infront;
+	
+	VALUE fiber;
+};
+
+struct Event_Backend {
+	VALUE loop;
+	
+	// Append to waiting.
+	struct Event_Backend_Queue *waiting;
+	// Process from ready.
+	struct Event_Backend_Queue *ready;
+};
+
+inline
+void Event_Backend_initialize(struct Event_Backend *backend, VALUE loop) {
+	backend->loop = loop;
+	backend->waiting = NULL;
+	backend->ready = NULL;
+}
+
+inline
+void Event_Backend_mark(struct Event_Backend *backend) {
+	rb_gc_mark(backend->loop);
+	
+	struct Event_Backend_Queue *ready = backend->ready;
+	while (ready) {
+		rb_gc_mark(ready->fiber);
+		ready = ready->behind;
+	}
+}
+
+void Event_Backend_wait_and_transfer(struct Event_Backend *backend, VALUE fiber);
+
+inline
+void Event_Backend_defer(struct Event_Backend *backend)
+{
+	Event_Backend_wait_and_transfer(backend, backend->loop);
+}
+
+void Event_Backend_ready_pop(struct Event_Backend *backend);
+
+void Event_Backend_elapsed_time(struct timespec* start, struct timespec* stop, struct timespec *duration);
+void Event_Backend_current_time(struct timespec *time);
+
+#define PRINTF_TIMESPEC "%lld.%.9ld"
+#define PRINTF_TIMESPEC_ARGS(ts) (long long)((ts).tv_sec), (ts).tv_nsec

data/ext/event/backend/epoll.c

@@ -28,19 +28,18 @@
 #include "pidfd.c"
 
 static VALUE Event_Backend_EPoll = Qnil;
-static ID id_fileno;
 
 enum {EPOLL_MAX_EVENTS = 64};
 
 struct Event_Backend_EPoll {
-	VALUE loop;
+	struct Event_Backend backend;
 	int descriptor;
 };
 
 void Event_Backend_EPoll_Type_mark(void *_data)
 {
 	struct Event_Backend_EPoll *data = _data;
-	rb_gc_mark(data->loop);
+	Event_Backend_mark(&data->backend);
 }
 
 static
@@ -80,7 +79,7 @@ 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);
 	
-	data->loop = Qnil;
+	Event_Backend_initialize(&data->backend, Qnil);
 	data->descriptor = -1;
 	
 	return instance;
@@ -90,7 +89,7 @@ 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);
 	
-	data->loop = loop;
+	Event_Backend_initialize(&data->backend, loop);
 	int result = epoll_create1(EPOLL_CLOEXEC);
 	
 	if (result == -1) {
@@ -113,6 +112,33 @@ VALUE Event_Backend_EPoll_close(VALUE self) {
 	return Qnil;
 }
 
+VALUE Event_Backend_EPoll_transfer(VALUE self, VALUE fiber)
+{
+	struct Event_Backend_EPoll *data = NULL;
+	TypedData_Get_Struct(self, struct Event_Backend_EPoll, &Event_Backend_EPoll_Type, data);
+	
+	Event_Backend_wait_and_transfer(&data->backend, fiber);
+	
+	return Qnil;
+}
+
+VALUE Event_Backend_EPoll_defer(VALUE self)
+{
+	struct Event_Backend_EPoll *data = NULL;
+	TypedData_Get_Struct(self, struct Event_Backend_EPoll, &Event_Backend_EPoll_Type, data);
+	
+	Event_Backend_defer(&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);
+	
+	return data->backend.ready ? Qtrue : Qfalse;
+}
+
 struct process_wait_arguments {
 	struct Event_Backend_EPoll *data;
 	pid_t pid;
@@ -124,7 +150,7 @@ static
 VALUE process_wait_transfer(VALUE _arguments) {
 	struct process_wait_arguments *arguments = (struct process_wait_arguments *)_arguments;
 	
-	Event_Backend_transfer(arguments->data->loop);
+	Event_Backend_fiber_transfer(arguments->data->backend.loop);
 	
 	return Event_Backend_process_status_wait(arguments->pid);
 }
@@ -143,7 +169,7 @@ VALUE process_wait_ensure(VALUE _arguments) {
 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);
-
+	
 	struct process_wait_arguments process_wait_arguments = {
 		.data = data,
 		.pid = NUM2PIDT(pid),
@@ -217,7 +243,7 @@ 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_Backend_fiber_transfer(arguments->data->backend.loop);
 	
 	return INT2NUM(events_from_epoll_flags(NUM2INT(result)));
 };
@@ -228,7 +254,7 @@ VALUE Event_Backend_EPoll_io_wait(VALUE self, VALUE fiber, VALUE io, VALUE event
 	
 	struct epoll_event event = {0};
 	
-	int descriptor = NUM2INT(rb_funcall(io, id_fileno, 0));
+	int descriptor = Event_Backend_io_descriptor(io);
 	int duplicate = -1;
 	
 	event.events = epoll_flags_from_events(NUM2INT(events));
@@ -264,6 +290,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 +302,6 @@ struct io_read_arguments {
 	int descriptor;
 	
 	VALUE buffer;
-	size_t offset;
 	size_t length;
 };
 
@@ -282,18 +309,22 @@ 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));
 		} else {
@@ -301,9 +332,7 @@ VALUE io_read_loop(VALUE _arguments) {
 		}
 	}
 	
-	Event_Backend_resize_to_fit(arguments->buffer, arguments->offset, arguments->length);
-	
-	return SIZET2NUM(total);
+	return SIZET2NUM(offset);
 }
 
 static
@@ -315,16 +344,11 @@ VALUE io_read_ensure(VALUE _arguments) {
 	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_Backend_EPoll_io_read(VALUE self, VALUE fiber, VALUE io, VALUE buffer, VALUE _length) {
+	int descriptor = Event_Backend_io_descriptor(io);
 	
-	size_t offset = NUM2SIZET(_offset);
 	size_t length = NUM2SIZET(_length);
 	
-	
 	struct io_read_arguments io_read_arguments = {
 		.self = self,
 		.fiber = fiber,
@@ -333,7 +357,6 @@ VALUE Event_Backend_EPoll_io_read(VALUE self, VALUE fiber, VALUE io, VALUE buffe
 		.flags = Event_Backend_nonblock_set(descriptor),
 		.descriptor = descriptor,
 		.buffer = buffer,
-		.offset = offset,
 		.length = length,
 	};
 	
@@ -350,7 +373,6 @@ struct io_write_arguments {
 	int descriptor;
 	
 	VALUE buffer;
-	size_t offset;
 	size_t length;
 };
 
@@ -358,18 +380,23 @@ 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));
 		} else {
@@ -377,7 +404,7 @@ VALUE io_write_loop(VALUE _arguments) {
 		}
 	}
 	
-	return SIZET2NUM(total);
+	return SIZET2NUM(offset);
 };
 
 static
@@ -389,13 +416,9 @@ VALUE io_write_ensure(VALUE _arguments) {
 	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_Backend_EPoll_io_write(VALUE self, VALUE fiber, VALUE io, VALUE buffer, VALUE _length) {
+	int descriptor = Event_Backend_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 = {
@@ -406,13 +429,14 @@ VALUE Event_Backend_EPoll_io_write(VALUE self, VALUE fiber, VALUE io, VALUE buff
 		.flags = Event_Backend_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) {
@@ -472,6 +496,8 @@ 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);
 	
+	Event_Backend_ready_pop(&data->backend);
+	
 	struct select_arguments arguments = {
 		.data = data,
 		.timeout = 0
@@ -482,7 +508,7 @@ VALUE Event_Backend_EPoll_select(VALUE self, VALUE duration) {
 	if (arguments.count == 0) {
 		arguments.timeout = make_timeout(duration);
 		
-		if (arguments.timeout != 0) {
+		if (!data->backend.ready && arguments.timeout != 0) {
 			select_internal_without_gvl(&arguments);
 		}
 	}
@@ -493,25 +519,29 @@ 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_Backend_fiber_transfer_result(fiber, result);
 	}
 	
 	return INT2NUM(arguments.count);
 }
 
 void Init_Event_Backend_EPoll(VALUE Event_Backend) {
-	id_fileno = rb_intern("fileno");
-	
 	Event_Backend_EPoll = rb_define_class_under(Event_Backend, "EPoll", rb_cObject);
 	
 	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_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_Backend_EPoll, "io_read", Event_Backend_EPoll_io_read, 4);
+	rb_define_method(Event_Backend_EPoll, "io_write", Event_Backend_EPoll_io_write, 4);
+#endif
 	
 	rb_define_method(Event_Backend_EPoll, "process_wait", Event_Backend_EPoll_process_wait, 3);
 }