event 0.4.2 → 0.7.0

data/ext/event/backend/backend.h

@@ -18,6 +18,16 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#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,
 	PRIORITY = 2,
@@ -26,4 +36,77 @@ enum Event {
 	HANGUP = 16
 };
 
-#include <ruby/thread.h>
+void Init_Event_Backend();
+
+#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
+
+#ifdef HAVE_RB_IO_DESCRIPTOR
+#define Event_Backend_io_descriptor(io) rb_io_descriptor(io)
+#else
+int Event_Backend_io_descriptor(VALUE io);
+#endif
+
+#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

@@ -25,20 +25,21 @@
 #include <time.h>
 #include <errno.h>
 
+#include "pidfd.c"
+
 static VALUE Event_Backend_EPoll = Qnil;
-static ID id_fileno, id_transfer;
 
 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
@@ -78,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;
@@ -88,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) {
@@ -111,6 +112,87 @@ 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;
+	int flags;
+	int descriptor;
+};
+
+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);
+	
+	return Event_Backend_process_status_wait(arguments->pid);
+}
+
+static
+VALUE process_wait_ensure(VALUE _arguments) {
+	struct process_wait_arguments *arguments = (struct process_wait_arguments *)_arguments;
+	
+	// epoll_ctl(arguments->data->descriptor, EPOLL_CTL_DEL, arguments->descriptor, NULL);
+	
+	close(arguments->descriptor);
+	
+	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);
+	
+	struct process_wait_arguments process_wait_arguments = {
+		.data = data,
+		.pid = NUM2PIDT(pid),
+		.flags = NUM2INT(flags),
+	};
+	
+	process_wait_arguments.descriptor = pidfd_open(process_wait_arguments.pid, 0);
+	rb_update_max_fd(process_wait_arguments.descriptor);
+	
+	struct epoll_event event = {
+		.events = EPOLLIN|EPOLLRDHUP|EPOLLONESHOT,
+		.data = {.ptr = (void*)fiber},
+	};
+	
+	int result = epoll_ctl(data->descriptor, EPOLL_CTL_ADD, process_wait_arguments.descriptor, &event);
+	
+	if (result == -1) {
+		rb_sys_fail("epoll_ctl(process_wait)");
+	}
+	
+	return rb_ensure(process_wait_transfer, (VALUE)&process_wait_arguments, process_wait_ensure, (VALUE)&process_wait_arguments);
+}
+
 static inline
 uint32_t epoll_flags_from_events(int events) {
 	uint32_t flags = 0;
@@ -161,7 +243,7 @@ static
 VALUE io_wait_transfer(VALUE _arguments) {
 	struct io_wait_arguments *arguments = (struct io_wait_arguments *)_arguments;
 	
-	VALUE result = rb_funcall(arguments->data->loop, id_transfer, 0);
+	VALUE result = Event_Backend_fiber_transfer(arguments->data->backend.loop);
 	
 	return INT2NUM(events_from_epoll_flags(NUM2INT(result)));
 };
@@ -172,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));
@@ -208,6 +290,153 @@ 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;
+	VALUE io;
+	
+	int flags;
+	
+	int descriptor;
+	
+	VALUE buffer;
+	size_t length;
+};
+
+static
+VALUE io_read_loop(VALUE _arguments) {
+	struct io_read_arguments *arguments = (struct io_read_arguments *)_arguments;
+	
+	void *base;
+	size_t size;
+	rb_io_buffer_get_mutable(arguments->buffer, &base, &size);
+	
+	size_t offset = 0;
+	size_t length = arguments->length;
+	
+	while (length > 0) {
+		size_t maximum_size = size - offset;
+		ssize_t result = read(arguments->descriptor, (char*)base+offset, maximum_size);
+		
+		if (result == 0) {
+			break;
+		} else if (result > 0) {
+			offset += result;
+			length -= result;
+		} else if (errno == EAGAIN || errno == EWOULDBLOCK) {
+			Event_Backend_EPoll_io_wait(arguments->self, arguments->fiber, arguments->io, RB_INT2NUM(READABLE));
+		} else {
+			rb_sys_fail("Event_Backend_EPoll_io_read");
+		}
+	}
+	
+	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);
+	
+	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);
+	
+	size_t length = NUM2SIZET(_length);
+	
+	struct io_read_arguments io_read_arguments = {
+		.self = self,
+		.fiber = fiber,
+		.io = io,
+		
+		.flags = Event_Backend_nonblock_set(descriptor),
+		.descriptor = descriptor,
+		.buffer = buffer,
+		.length = length,
+	};
+	
+	return rb_ensure(io_read_loop, (VALUE)&io_read_arguments, io_read_ensure, (VALUE)&io_read_arguments);
+}
+
+struct io_write_arguments {
+	VALUE self;
+	VALUE fiber;
+	VALUE io;
+	
+	int flags;
+	
+	int descriptor;
+	
+	VALUE buffer;
+	size_t length;
+};
+
+static
+VALUE io_write_loop(VALUE _arguments) {
+	struct io_write_arguments *arguments = (struct io_write_arguments *)_arguments;
+	
+	const void *base;
+	size_t size;
+	rb_io_buffer_get_immutable(arguments->buffer, &base, &size);
+	
+	size_t offset = 0;
+	size_t length = arguments->length;
+	
+	if (length > size) {
+		rb_raise(rb_eRuntimeError, "Length exceeds size of buffer!");
+	}
+	
+	while (length > 0) {
+		ssize_t result = write(arguments->descriptor, (char*)base+offset, length);
+		
+		if (result >= 0) {
+			offset += result;
+			length -= result;
+		} else if (errno == EAGAIN || errno == EWOULDBLOCK) {
+			Event_Backend_EPoll_io_wait(arguments->self, arguments->fiber, arguments->io, RB_INT2NUM(WRITABLE));
+		} else {
+			rb_sys_fail("Event_Backend_EPoll_io_write");
+		}
+	}
+	
+	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);
+	
+	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);
+	
+	size_t length = NUM2SIZET(_length);
+	
+	struct io_write_arguments io_write_arguments = {
+		.self = self,
+		.fiber = fiber,
+		.io = io,
+		
+		.flags = Event_Backend_nonblock_set(descriptor),
+		.descriptor = descriptor,
+		.buffer = buffer,
+		.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) {
@@ -267,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
@@ -277,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);
 		}
 	}
@@ -288,22 +519,29 @@ VALUE Event_Backend_EPoll_select(VALUE self, VALUE duration) {
 		
 		// fprintf(stderr, "-> fiber=%p descriptor=%d\n", (void*)fiber, events[i].data.fd);
 		
-		rb_funcall(fiber, id_transfer, 1, 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");
-	id_transfer = rb_intern("transfer");
-	
 	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, "select", Event_Backend_EPoll_select, 1);
+	
+#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);
 }

data/ext/event/backend/kqueue.c

@@ -24,21 +24,21 @@
 #include <sys/event.h>
 #include <sys/ioctl.h>
 #include <time.h>
+#include <errno.h>
 
 static VALUE Event_Backend_KQueue = Qnil;
-static ID id_fileno, id_transfer;
 
 enum {KQUEUE_MAX_EVENTS = 64};
 
 struct Event_Backend_KQueue {
-	VALUE loop;
+	struct Event_Backend backend;
 	int descriptor;
 };
 
 void Event_Backend_KQueue_Type_mark(void *_data)
 {
 	struct Event_Backend_KQueue *data = _data;
-	rb_gc_mark(data->loop);
+	Event_Backend_mark(&data->backend);
 }
 
 static
@@ -78,7 +78,7 @@ VALUE Event_Backend_KQueue_allocate(VALUE self) {
 	struct Event_Backend_KQueue *data = NULL;
 	VALUE instance = TypedData_Make_Struct(self, struct Event_Backend_KQueue, &Event_Backend_KQueue_Type, data);
 	
-	data->loop = Qnil;
+	Event_Backend_initialize(&data->backend, Qnil);
 	data->descriptor = -1;
 	
 	return instance;
@@ -88,7 +88,7 @@ VALUE Event_Backend_KQueue_initialize(VALUE self, VALUE loop) {
 	struct Event_Backend_KQueue *data = NULL;
 	TypedData_Get_Struct(self, struct Event_Backend_KQueue, &Event_Backend_KQueue_Type, data);
 	
-	data->loop = loop;
+	Event_Backend_initialize(&data->backend, loop);
 	int result = kqueue();
 	
 	if (result == -1) {
@@ -112,6 +112,113 @@ VALUE Event_Backend_KQueue_close(VALUE self) {
 	return Qnil;
 }
 
+VALUE Event_Backend_KQueue_transfer(VALUE self, VALUE fiber)
+{
+	struct Event_Backend_KQueue *data = NULL;
+	TypedData_Get_Struct(self, struct Event_Backend_KQueue, &Event_Backend_KQueue_Type, data);
+	
+	Event_Backend_wait_and_transfer(&data->backend, fiber);
+	
+	return Qnil;
+}
+
+VALUE Event_Backend_KQueue_defer(VALUE self)
+{
+	struct Event_Backend_KQueue *data = NULL;
+	TypedData_Get_Struct(self, struct Event_Backend_KQueue, &Event_Backend_KQueue_Type, data);
+	
+	Event_Backend_defer(&data->backend);
+	
+	return Qnil;
+}
+
+VALUE Event_Backend_KQueue_ready_p(VALUE self) {
+	struct Event_Backend_KQueue *data = NULL;
+	TypedData_Get_Struct(self, struct Event_Backend_KQueue, &Event_Backend_KQueue_Type, data);
+	
+	return data->backend.ready ? Qtrue : Qfalse;
+}
+
+struct process_wait_arguments {
+	struct Event_Backend_KQueue *data;
+	pid_t pid;
+	int flags;
+};
+
+static
+int process_add_filters(int descriptor, int ident, VALUE fiber) {
+	struct kevent event = {0};
+	
+	event.ident = ident;
+	event.filter = EVFILT_PROC;
+	event.flags = EV_ADD | EV_ENABLE | EV_ONESHOT;
+	event.fflags = NOTE_EXIT;
+	event.udata = (void*)fiber;
+	
+	int result = kevent(descriptor, &event, 1, NULL, 0, NULL);
+	
+	if (result == -1) {
+		// No such process - the process has probably already terminated:
+		if (errno == ESRCH) {
+			return 0;
+		}
+		
+		rb_sys_fail("kevent(process_add_filters)");
+	}
+	
+	return 1;
+}
+
+static
+void process_remove_filters(int descriptor, int ident) {
+	struct kevent event = {0};
+	
+	event.ident = ident;
+	event.filter = EVFILT_PROC;
+	event.flags = EV_DELETE;
+	event.fflags = NOTE_EXIT;
+	
+	// Ignore the result.
+	kevent(descriptor, &event, 1, NULL, 0, NULL);
+}
+
+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);
+	
+	return Event_Backend_process_status_wait(arguments->pid);
+}
+
+static
+VALUE process_wait_rescue(VALUE _arguments, VALUE exception) {
+	struct process_wait_arguments *arguments = (struct process_wait_arguments *)_arguments;
+	
+	process_remove_filters(arguments->data->descriptor, arguments->pid);
+	
+	rb_exc_raise(exception);
+}
+
+VALUE Event_Backend_KQueue_process_wait(VALUE self, VALUE fiber, VALUE pid, VALUE flags) {
+	struct Event_Backend_KQueue *data = NULL;
+	TypedData_Get_Struct(self, struct Event_Backend_KQueue, &Event_Backend_KQueue_Type, data);
+	
+	struct process_wait_arguments process_wait_arguments = {
+		.data = data,
+		.pid = NUM2PIDT(pid),
+		.flags = RB_NUM2INT(flags),
+	};
+	
+	int waiting = process_add_filters(data->descriptor, process_wait_arguments.pid, fiber);
+	
+	if (waiting) {
+		return rb_rescue(process_wait_transfer, (VALUE)&process_wait_arguments, process_wait_rescue, (VALUE)&process_wait_arguments);
+	} else {
+		return Event_Backend_process_status_wait(process_wait_arguments.pid);
+	}
+}
+
 static
 int io_add_filters(int descriptor, int ident, int events, VALUE fiber) {
 	int count = 0;
@@ -143,7 +250,7 @@ int io_add_filters(int descriptor, int ident, int events, VALUE fiber) {
 	int result = kevent(descriptor, kevents, count, NULL, 0, NULL);
 	
 	if (result == -1) {
-		rb_sys_fail("kevent(register)");
+		rb_sys_fail("kevent(io_add_filters)");
 	}
 	
 	return events;
@@ -186,7 +293,7 @@ VALUE io_wait_rescue(VALUE _arguments, VALUE exception) {
 	io_remove_filters(arguments->data->descriptor, arguments->descriptor, arguments->events);
 	
 	rb_exc_raise(exception);
-};
+}
 
 static inline
 int events_from_kqueue_filter(int filter) {
@@ -200,19 +307,19 @@ static
 VALUE io_wait_transfer(VALUE _arguments) {
 	struct io_wait_arguments *arguments = (struct io_wait_arguments *)_arguments;
 	
-	VALUE result = rb_funcall(arguments->data->loop, id_transfer, 0);
+	VALUE result = Event_Backend_fiber_transfer(arguments->data->backend.loop);
 	
-	return INT2NUM(events_from_kqueue_filter(NUM2INT(result)));
-};
+	return INT2NUM(events_from_kqueue_filter(RB_NUM2INT(result)));
+}
 
 VALUE Event_Backend_KQueue_io_wait(VALUE self, VALUE fiber, VALUE io, VALUE events) {
 	struct Event_Backend_KQueue *data = NULL;
 	TypedData_Get_Struct(self, struct Event_Backend_KQueue, &Event_Backend_KQueue_Type, data);
 	
-	int descriptor = NUM2INT(rb_funcall(io, id_fileno, 0));
+	int descriptor = Event_Backend_io_descriptor(io);
 	
 	struct io_wait_arguments io_wait_arguments = {
-		.events = io_add_filters(data->descriptor, descriptor, NUM2INT(events), fiber),
+		.events = io_add_filters(data->descriptor, descriptor, RB_NUM2INT(events), fiber),
 		.data = data,
 		.descriptor = descriptor,
 	};
@@ -220,6 +327,159 @@ VALUE Event_Backend_KQueue_io_wait(VALUE self, VALUE fiber, VALUE io, VALUE even
 	return rb_rescue(io_wait_transfer, (VALUE)&io_wait_arguments, io_wait_rescue, (VALUE)&io_wait_arguments);
 }
 
+#ifdef HAVE_RUBY_IO_BUFFER_H
+
+struct io_read_arguments {
+	VALUE self;
+	VALUE fiber;
+	VALUE io;
+	
+	int flags;
+	
+	int descriptor;
+	
+	VALUE buffer;
+	size_t length;
+};
+
+static
+VALUE io_read_loop(VALUE _arguments) {
+	struct io_read_arguments *arguments = (struct io_read_arguments *)_arguments;
+	
+	void *base;
+	size_t size;
+	rb_io_buffer_get_mutable(arguments->buffer, &base, &size);
+	
+	size_t offset = 0;
+	size_t length = arguments->length;
+	
+	while (length > 0) {
+		size_t maximum_size = size - offset;
+		ssize_t result = read(arguments->descriptor, (char*)base+offset, maximum_size);
+		
+		if (result == 0) {
+			break;
+		} else if (result > 0) {
+			offset += result;
+			length -= result;
+		} else if (errno == EAGAIN || errno == EWOULDBLOCK) {
+			Event_Backend_KQueue_io_wait(arguments->self, arguments->fiber, arguments->io, RB_INT2NUM(READABLE));
+		} else {
+			rb_sys_fail("Event_Backend_KQueue_io_read");
+		}
+	}
+	
+	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);
+	
+	return Qnil;
+}
+
+VALUE Event_Backend_KQueue_io_read(VALUE self, VALUE fiber, VALUE io, VALUE buffer, VALUE _length) {
+	struct Event_Backend_KQueue *data = NULL;
+	TypedData_Get_Struct(self, struct Event_Backend_KQueue, &Event_Backend_KQueue_Type, data);
+	
+	int descriptor = Event_Backend_io_descriptor(io);
+	
+	size_t length = NUM2SIZET(_length);
+	
+	struct io_read_arguments io_read_arguments = {
+		.self = self,
+		.fiber = fiber,
+		.io = io,
+		
+		.flags = Event_Backend_nonblock_set(descriptor),
+		.descriptor = descriptor,
+		.buffer = buffer,
+		.length = length,
+	};
+	
+	return rb_ensure(io_read_loop, (VALUE)&io_read_arguments, io_read_ensure, (VALUE)&io_read_arguments);
+}
+
+struct io_write_arguments {
+	VALUE self;
+	VALUE fiber;
+	VALUE io;
+	
+	int flags;
+	
+	int descriptor;
+	
+	VALUE buffer;
+	size_t length;
+};
+
+static
+VALUE io_write_loop(VALUE _arguments) {
+	struct io_write_arguments *arguments = (struct io_write_arguments *)_arguments;
+	
+	const void *base;
+	size_t size;
+	rb_io_buffer_get_immutable(arguments->buffer, &base, &size);
+	
+	size_t offset = 0;
+	size_t length = arguments->length;
+	
+	if (length > size) {
+		rb_raise(rb_eRuntimeError, "Length exceeds size of buffer!");
+	}
+	
+	while (length > 0) {
+		ssize_t result = write(arguments->descriptor, (char*)base+offset, length);
+		
+		if (result >= 0) {
+			offset += result;
+			length -= result;
+		} else if (errno == EAGAIN || errno == EWOULDBLOCK) {
+			Event_Backend_KQueue_io_wait(arguments->self, arguments->fiber, arguments->io, RB_INT2NUM(WRITABLE));
+		} else {
+			rb_sys_fail("Event_Backend_KQueue_io_write");
+		}
+	}
+	
+	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);
+	
+	return Qnil;
+};
+
+VALUE Event_Backend_KQueue_io_write(VALUE self, VALUE fiber, VALUE io, VALUE buffer, VALUE _length) {
+	struct Event_Backend_KQueue *data = NULL;
+	TypedData_Get_Struct(self, struct Event_Backend_KQueue, &Event_Backend_KQueue_Type, data);
+	
+	int descriptor = Event_Backend_io_descriptor(io);
+	
+	size_t length = NUM2SIZET(_length);
+	
+	struct io_write_arguments io_write_arguments = {
+		.self = self,
+		.fiber = fiber,
+		.io = io,
+		
+		.flags = Event_Backend_nonblock_set(descriptor),
+		.descriptor = descriptor,
+		.buffer = buffer,
+		.length = length,
+	};
+	
+	return rb_ensure(io_write_loop, (VALUE)&io_write_arguments, io_write_ensure, (VALUE)&io_write_arguments);
+}
+
+#endif
+
 static
 struct timespec * make_timeout(VALUE duration, struct timespec * storage) {
 	if (duration == Qnil) {
@@ -292,6 +552,8 @@ 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);
 	
+	Event_Backend_ready_pop(&data->backend);
+	
 	struct select_arguments arguments = {
 		.data = data,
 		.count = KQUEUE_MAX_EVENTS,
@@ -315,7 +577,7 @@ VALUE Event_Backend_KQueue_select(VALUE self, VALUE duration) {
 	if (arguments.count == 0) {
 		arguments.timeout = make_timeout(duration, &arguments.storage);
 		
-		if (!timeout_nonblocking(arguments.timeout)) {
+		if (!data->backend.ready && !timeout_nonblocking(arguments.timeout)) {
 			arguments.count = KQUEUE_MAX_EVENTS;
 			
 			select_internal_without_gvl(&arguments);
@@ -325,22 +587,30 @@ VALUE Event_Backend_KQueue_select(VALUE self, VALUE duration) {
 	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);
+		
+		Event_Backend_fiber_transfer_result(fiber, result);
 	}
 	
 	return INT2NUM(arguments.count);
 }
 
 void Init_Event_Backend_KQueue(VALUE Event_Backend) {
-	id_fileno = rb_intern("fileno");
-	id_transfer = rb_intern("transfer");
-	
 	Event_Backend_KQueue = rb_define_class_under(Event_Backend, "KQueue", rb_cObject);
 	
 	rb_define_alloc_func(Event_Backend_KQueue, Event_Backend_KQueue_allocate);
 	rb_define_method(Event_Backend_KQueue, "initialize", Event_Backend_KQueue_initialize, 1);
+	rb_define_method(Event_Backend_KQueue, "transfer", Event_Backend_KQueue_transfer, 1);
+	rb_define_method(Event_Backend_KQueue, "defer", Event_Backend_KQueue_defer, 0);
+	rb_define_method(Event_Backend_KQueue, "ready?", Event_Backend_KQueue_ready_p, 0);
+	rb_define_method(Event_Backend_KQueue, "select", Event_Backend_KQueue_select, 1);
 	rb_define_method(Event_Backend_KQueue, "close", Event_Backend_KQueue_close, 0);
 	
 	rb_define_method(Event_Backend_KQueue, "io_wait", Event_Backend_KQueue_io_wait, 3);
-	rb_define_method(Event_Backend_KQueue, "select", Event_Backend_KQueue_select, 1);
+	
+#ifdef HAVE_RUBY_IO_BUFFER_H
+	rb_define_method(Event_Backend_KQueue, "io_read", Event_Backend_KQueue_io_read, 4);
+	rb_define_method(Event_Backend_KQueue, "io_write", Event_Backend_KQueue_io_write, 4);
+#endif
+	
+	rb_define_method(Event_Backend_KQueue, "process_wait", Event_Backend_KQueue_process_wait, 3);
 }