event 0.4.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94dad12ffcb84e598eae15a76f783046e324ca041f71b55b1d8925ad742fe51d
-  data.tar.gz: 8776e1608c0b321557ea48857157f1496d0ab0babbff3fc186f9308e0a73c8eb
+  metadata.gz: '0380b6d95d8bd8f8d378820eefa77e6c6f0f1aaceb2afec54cb4d38f57747cbc'
+  data.tar.gz: 2a0bfede977154f30a402fda4ec445eedc4daf3893bae8760eceaa1e58c999be
 SHA512:
-  metadata.gz: e2714eea3be4dd9119b41a3aa98f9575c9bf0e9a3268a1c4af185bd92b5d56d78db152849cff9453f9337374d2ee6ba2ce2981b468252f9f09db15881c39963a
-  data.tar.gz: 2cc11adfcee9ae1188305691010049775abcdec1ec58b1666cfe5ccfd4276692597bb524e41f106478c0ceb80539e52c6fc3db84d9488f9b70d2c4556f4aece2
+  metadata.gz: d12fab2ce89b8c22d583a7472670f8bdb5b5b3428832938f9c51ce3635f08bfaf7d107b6568f762849a4fa8b32fdb0d79823bbd4ebd795b690e885b0eff52798
+  data.tar.gz: 793cf18caeb1457cd5499ee3d0fd2108dbf46e953cbc11b80e7c800efeb6beac279395a24da420b4c751a89ee5ecd54ad53a3b3a58d4b07d75e9a89d84a8be4d

data/ext/event/Makefile

@@ -12,12 +12,12 @@ NULLCMD = :
 #### Start of system configuration section. ####
 
 srcdir = .
-topdir = /home/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0
+topdir = /Users/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0
 hdrdir = $(topdir)
-arch_hdrdir = /home/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0/x86_64-linux
+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
-prefix = $(DESTDIR)/home/samuel/.rubies/ruby-3.0.1
+prefix = $(DESTDIR)/Users/samuel/.rubies/ruby-3.0.1
 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) -Wall $(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 backend.c kqueue.c
+OBJS = event.o backend.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.c

@@ -0,0 +1,108 @@
+// Copyright, 2021, by Samuel G. D. Williams. <http://www.codeotaku.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#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"));
+}
+
+VALUE
+Event_Backend_transfer(VALUE fiber) {
+#ifdef HAVE__RB_FIBER_TRANSFER
+	return rb_fiber_transfer(fiber, 0, NULL);
+#else
+	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
+	return rb_funcall(fiber, id_transfer, 1, result);
+#endif
+}
+
+VALUE Event_Backend_process_status_wait(rb_pid_t pid)
+{
+	return rb_funcall(rb_Process_Status, id_wait, 2, PIDT2NUM(pid), INT2NUM(WNOHANG));
+}
+
+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");
+	}
+	
+	return RSTRING_PTR(buffer);
+}
+
+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;
+	
+	difference += 1;
+	
+	if (difference > 0) {
+		rb_str_modify_expand(string, difference);
+	} else {
+		rb_str_modify(string);
+	}
+	
+	return RSTRING_PTR(string);
+}
+
+void Event_Backend_resize_to_fit(VALUE string, size_t offset, size_t length) {
+	size_t current_length = RSTRING_LEN(string);
+	
+	if (current_length < (offset + length)) {
+		rb_str_set_len(string, offset + length);
+	}
+}
+
+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 flags;
+}
+
+void Event_Backend_nonblock_restore(int file_descriptor, int flags)
+{
+	if (!(flags & O_NONBLOCK)) {
+		fcntl(file_descriptor, F_SETFL, flags & ~flags);
+	}
+}

data/ext/event/backend/backend.h

@@ -18,6 +18,9 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#include <ruby.h>
+#include <ruby/thread.h>
+
 enum Event {
 	READABLE = 1,
 	PRIORITY = 2,
@@ -26,4 +29,17 @@ enum Event {
 	HANGUP = 16
 };
 
-#include <ruby/thread.h>
+void
+Init_Event_Backend();
+
+VALUE Event_Backend_transfer(VALUE fiber);
+VALUE Event_Backend_transfer_result(VALUE fiber, VALUE argument);
+
+VALUE Event_Backend_process_status_wait(rb_pid_t pid);
+
+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);
+
+int Event_Backend_nonblock_set(int file_descriptor);
+void Event_Backend_nonblock_restore(int file_descriptor, int flags);

data/ext/event/backend/epoll.c

@@ -25,8 +25,10 @@
 #include <time.h>
 #include <errno.h>
 
+#include "pidfd.c"
+
 static VALUE Event_Backend_EPoll = Qnil;
-static ID id_fileno, id_transfer;
+static ID id_fileno;
 
 enum {EPOLL_MAX_EVENTS = 64};
 
@@ -111,6 +113,60 @@ VALUE Event_Backend_EPoll_close(VALUE self) {
 	return Qnil;
 }
 
+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_transfer(arguments->data->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 +217,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_transfer(arguments->data->loop);
 	
 	return INT2NUM(events_from_epoll_flags(NUM2INT(result)));
 };
@@ -208,6 +264,155 @@ 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);
 }
 
+struct io_read_arguments {
+	VALUE self;
+	VALUE fiber;
+	VALUE io;
+	
+	int flags;
+	
+	int descriptor;
+	
+	VALUE buffer;
+	size_t offset;
+	size_t length;
+};
+
+static
+VALUE io_read_loop(VALUE _arguments) {
+	struct io_read_arguments *arguments = (struct io_read_arguments *)_arguments;
+	
+	size_t offset = arguments->offset;
+	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);
+		
+		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 {
+			rb_sys_fail("Event_Backend_EPoll_io_read");
+		}
+	}
+	
+	Event_Backend_resize_to_fit(arguments->buffer, arguments->offset, arguments->length);
+	
+	return SIZET2NUM(total);
+}
+
+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 _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));
+	
+	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),
+		.descriptor = descriptor,
+		.buffer = buffer,
+		.offset = offset,
+		.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 offset;
+	size_t length;
+};
+
+static
+VALUE io_write_loop(VALUE _arguments) {
+	struct io_write_arguments *arguments = (struct io_write_arguments *)_arguments;
+	
+	size_t offset = arguments->offset;
+	size_t length = arguments->length;
+	size_t total = 0;
+	
+	while (length > 0) {
+		char *buffer = Event_Backend_verify_size(arguments->buffer, offset, length);
+		ssize_t result = write(arguments->descriptor, buffer+offset, length);
+		
+		if (result >= 0) {
+			length -= result;
+			offset += result;
+			total += 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(total);
+};
+
+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 _offset, VALUE _length) {
+	struct Event_Backend_EPoll *data = NULL;
+	TypedData_Get_Struct(self, struct Event_Backend_EPoll, &Event_Backend_EPoll_Type, data);
+	
+	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 = {
+		.self = self,
+		.fiber = fiber,
+		.io = io,
+		
+		.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);
+}
+
 static
 int make_timeout(VALUE duration) {
 	if (duration == Qnil) {
@@ -272,13 +477,13 @@ VALUE Event_Backend_EPoll_select(VALUE self, VALUE duration) {
 		.timeout = 0
 	};
 	
-	select_internal_without_gvl(&arguments);
+	select_internal_with_gvl(&arguments);
 	
 	if (arguments.count == 0) {
 		arguments.timeout = make_timeout(duration);
 		
 		if (arguments.timeout != 0) {
-			select_internal_with_gvl(&arguments);
+			select_internal_without_gvl(&arguments);
 		}
 	}
 	
@@ -288,7 +493,7 @@ 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_transfer_result(fiber, result);
 	}
 	
 	return INT2NUM(arguments.count);
@@ -296,14 +501,17 @@ VALUE Event_Backend_EPoll_select(VALUE self, VALUE duration) {
 
 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, "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);
+	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);
+	
+	rb_define_method(Event_Backend_EPoll, "process_wait", Event_Backend_EPoll_process_wait, 3);
 }