event 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 932f834070b1bb738a09a9cb306599f80386755e4bfa2c78b502715acecf56b7
-  data.tar.gz: a04db89605437563a594e9012adb50a60af4a6c6dfacdd048ec0b03048f68010
+  metadata.gz: '0380b6d95d8bd8f8d378820eefa77e6c6f0f1aaceb2afec54cb4d38f57747cbc'
+  data.tar.gz: 2a0bfede977154f30a402fda4ec445eedc4daf3893bae8760eceaa1e58c999be
 SHA512:
-  metadata.gz: 074e688c34260fe28c3f15857c731052a745605deafd7d75bd07f9e0dc59aeed34d6633a05f5259d03a357c7f5c45762ef7de53a2f5dfc5c32213471f66eb847
-  data.tar.gz: 2214b5749ca680a7892e01539ec962b976f4fad480aa4a5d6d0d589981af8944a2ac94b03484e3e7e7936fd4bbf344418b72cb457fa229ffda11ff91bae9e5e8
+  metadata.gz: d12fab2ce89b8c22d583a7472670f8bdb5b5b3428832938f9c51ce3635f08bfaf7d107b6568f762849a4fa8b32fdb0d79823bbd4ebd795b690e885b0eff52798
+  data.tar.gz: 793cf18caeb1457cd5499ee3d0fd2108dbf46e953cbc11b80e7c800efeb6beac279395a24da420b4c751a89ee5ecd54ad53a3b3a58d4b07d75e9a89d84a8be4d

data/ext/event/backend/backend.c

@@ -19,12 +19,7 @@
 // THE SOFTWARE.
 
 #include "backend.h"
-
-#if HAVE_RB_FIBER_TRANSFER_KW
-#define HAVE_RB_FIBER_TRANSFER 1
-#else
-#define HAVE_RB_FIBER_TRANSFER 0
-#endif
+#include <fcntl.h>
 
 static ID id_transfer, id_wait;
 static VALUE rb_Process_Status = Qnil;
@@ -38,7 +33,7 @@ void Init_Event_Backend(VALUE Event_Backend) {
 
 VALUE
 Event_Backend_transfer(VALUE fiber) {
-#if HAVE_RB_FIBER_TRANSFER
+#ifdef HAVE__RB_FIBER_TRANSFER
 	return rb_fiber_transfer(fiber, 0, NULL);
 #else
 	return rb_funcall(fiber, id_transfer, 0);
@@ -51,7 +46,7 @@ Event_Backend_transfer_result(VALUE fiber, VALUE result) {
 	// 	return Qnil;
 	// }
 	
-#if HAVE_RB_FIBER_TRANSFER
+#ifdef HAVE__RB_FIBER_TRANSFER
 	return rb_fiber_transfer(fiber, 1, &result);
 #else
 	return rb_funcall(fiber, id_transfer, 1, result);
@@ -62,3 +57,52 @@ 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

@@ -36,3 +36,10 @@ 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

@@ -264,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) {
@@ -357,9 +506,12 @@ void Init_Event_Backend_EPoll(VALUE Event_Backend) {
 	
 	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);
 }

data/ext/event/backend/kqueue.c

@@ -181,7 +181,7 @@ VALUE Event_Backend_KQueue_process_wait(VALUE self, VALUE fiber, VALUE pid, VALU
 	struct process_wait_arguments process_wait_arguments = {
 		.data = data,
 		.pid = NUM2PIDT(pid),
-		.flags = NUM2INT(flags),
+		.flags = RB_NUM2INT(flags),
 	};
 	
 	int waiting = process_add_filters(data->descriptor, process_wait_arguments.pid, fiber);
@@ -267,7 +267,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) {
@@ -283,17 +283,17 @@ VALUE io_wait_transfer(VALUE _arguments) {
 	
 	VALUE result = Event_Backend_transfer(arguments->data->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 = RB_NUM2INT(rb_funcall(io, id_fileno, 0));
 	
 	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,
 	};
@@ -301,6 +301,154 @@ 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);
 }
 
+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_KQueue_io_wait(arguments->self, arguments->fiber, arguments->io, RB_INT2NUM(READABLE));
+		} else {
+			rb_sys_fail("Event_Backend_KQueue_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_KQueue_io_read(VALUE self, VALUE fiber, VALUE io, VALUE buffer, VALUE _offset, VALUE _length) {
+	struct Event_Backend_KQueue *data = NULL;
+	TypedData_Get_Struct(self, struct Event_Backend_KQueue, &Event_Backend_KQueue_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_KQueue_io_wait(arguments->self, arguments->fiber, arguments->io, RB_INT2NUM(WRITABLE));
+		} else {
+			rb_sys_fail("Event_Backend_KQueue_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_KQueue_io_write(VALUE self, VALUE fiber, VALUE io, VALUE buffer, VALUE _offset, VALUE _length) {
+	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));
+	
+	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
 struct timespec * make_timeout(VALUE duration, struct timespec * storage) {
 	if (duration == Qnil) {
@@ -420,9 +568,12 @@ void Init_Event_Backend_KQueue(VALUE Event_Backend) {
 	
 	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, "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);
+	rb_define_method(Event_Backend_KQueue, "io_read", Event_Backend_KQueue_io_read, 5);
+	rb_define_method(Event_Backend_KQueue, "io_write", Event_Backend_KQueue_io_write, 5);
+	
 	rb_define_method(Event_Backend_KQueue, "process_wait", Event_Backend_KQueue_process_wait, 3);
 }

data/ext/event/backend/uring.c

@@ -260,88 +260,98 @@ VALUE Event_Backend_URing_io_wait(VALUE self, VALUE fiber, VALUE io, VALUE event
 	return rb_rescue(io_wait_transfer, (VALUE)&io_wait_arguments, io_wait_rescue, (VALUE)&io_wait_arguments);
 }
 
-inline static
-void 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);
-	}
-}
-
-inline static
-void 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);
-	}
-}
-
-VALUE Event_Backend_URing_io_read(VALUE self, VALUE fiber, VALUE io, VALUE buffer, VALUE offset, VALUE length) {
-	struct Event_Backend_URing *data = NULL;
-	TypedData_Get_Struct(self, struct Event_Backend_URing, &Event_Backend_URing_Type, data);
-	
-	resize_to_capacity(buffer, NUM2SIZET(offset), NUM2SIZET(length));
-	
-	int descriptor = NUM2INT(rb_funcall(io, id_fileno, 0));
+static
+int io_read(struct Event_Backend_URing *data, VALUE fiber, int descriptor, char *buffer, size_t length) {
 	struct io_uring_sqe *sqe = io_get_sqe(data);
 	assert(sqe);
 	
 	struct iovec iovecs[1];
-	iovecs[0].iov_base = RSTRING_PTR(buffer) + NUM2SIZET(offset);
-	iovecs[0].iov_len = NUM2SIZET(length);
+	iovecs[0].iov_base = buffer;
+	iovecs[0].iov_len = length;
 	
 	io_uring_prep_readv(sqe, descriptor, iovecs, 1, 0);
 	io_uring_sqe_set_data(sqe, (void*)fiber);
 	io_uring_submit(&data->ring);
 	
-	// fprintf(stderr, "prep_readv(%p, %d, %ld)\n", sqe, descriptor, iovecs[0].iov_len);
-	
-	int result = NUM2INT(Event_Backend_transfer(data->loop));
-	
-	if (result < 0) {
-		rb_syserr_fail(-result, strerror(-result));
-	}
-	
-	resize_to_fit(buffer, NUM2SIZET(offset), (size_t)result);
-	
-	return INT2NUM(result);
+	return NUM2INT(Event_Backend_transfer(data->loop));
 }
 
-VALUE Event_Backend_URing_io_write(VALUE self, VALUE fiber, VALUE io, VALUE buffer, VALUE offset, VALUE length) {
+VALUE Event_Backend_URing_io_read(VALUE self, VALUE fiber, VALUE io, VALUE _buffer, VALUE _offset, VALUE _length) {
 	struct Event_Backend_URing *data = NULL;
 	TypedData_Get_Struct(self, struct Event_Backend_URing, &Event_Backend_URing_Type, data);
 	
-	if ((size_t)RSTRING_LEN(buffer) < NUM2SIZET(offset) + NUM2SIZET(length)) {
-		rb_raise(rb_eRuntimeError, "invalid offset/length exceeds bounds of buffer");
+	int descriptor = RB_NUM2INT(rb_funcall(io, id_fileno, 0));
+	
+	size_t offset = NUM2SIZET(_offset);
+	size_t length = NUM2SIZET(_length);
+	
+	size_t start = offset;
+	size_t total = 0;
+	
+	while (length > 0) {
+		char *buffer = Event_Backend_resize_to_capacity(_buffer, offset, length);
+		int result = io_read(data, fiber, descriptor, buffer+offset, length);
+		
+		if (result >= 0) {
+			offset += result;
+			length -= result;
+			total += result;
+		} else if (-result == EAGAIN || -result == EWOULDBLOCK) {
+			Event_Backend_URing_io_wait(self, fiber, io, RB_INT2NUM(READABLE));
+		} else {
+			rb_syserr_fail(-result, strerror(-result));
+		}
 	}
 	
-	int descriptor = NUM2INT(rb_funcall(io, id_fileno, 0));
+	Event_Backend_resize_to_fit(_buffer, start, total);
+	
+	return SIZET2NUM(total);
+}
+
+static
+int io_write(struct Event_Backend_URing *data, VALUE fiber, int descriptor, char *buffer, size_t length) {
 	struct io_uring_sqe *sqe = io_get_sqe(data);
+	assert(sqe);
 	
 	struct iovec iovecs[1];
-	iovecs[0].iov_base = RSTRING_PTR(buffer) + NUM2SIZET(offset);
-	iovecs[0].iov_len = NUM2SIZET(length);
+	iovecs[0].iov_base = buffer;
+	iovecs[0].iov_len = length;
 	
 	io_uring_prep_writev(sqe, descriptor, iovecs, 1, 0);
 	io_uring_sqe_set_data(sqe, (void*)fiber);
 	io_uring_submit(&data->ring);
 	
-	// fprintf(stderr, "prep_writev(%p, %d, %ld)\n", sqe, descriptor, iovecs[0].iov_len);
+	return NUM2INT(Event_Backend_transfer(data->loop));
+}
+
+VALUE Event_Backend_URing_io_write(VALUE self, VALUE fiber, VALUE io, VALUE _buffer, VALUE _offset, VALUE _length) {
+	struct Event_Backend_URing *data = NULL;
+	TypedData_Get_Struct(self, struct Event_Backend_URing, &Event_Backend_URing_Type, data);
+	
+	int descriptor = RB_NUM2INT(rb_funcall(io, id_fileno, 0));
 	
-	int result = NUM2INT(Event_Backend_transfer(data->loop));
+	size_t offset = NUM2SIZET(_offset);
+	size_t length = NUM2SIZET(_length);
 	
-	if (result < 0) {
-		rb_syserr_fail(-result, strerror(-result));
+	char *buffer = Event_Backend_verify_size(_buffer, offset, length);
+	
+	size_t total = 0;
+	
+	while (length > 0) {
+		int result = io_write(data, fiber, descriptor, buffer+offset, length);
+		
+		if (result >= 0) {
+			length -= result;
+			offset += result;
+			total += result;
+		} else if (-result == EAGAIN || -result == EWOULDBLOCK) {
+			Event_Backend_URing_io_wait(self, fiber, io, RB_INT2NUM(WRITABLE));
+		} else {
+			rb_syserr_fail(-result, strerror(-result));
+		}
 	}
 	
-	return INT2NUM(result);
+	return SIZET2NUM(total);
 }
 
 static
@@ -477,12 +487,12 @@ void Init_Event_Backend_URing(VALUE Event_Backend) {
 	
 	rb_define_alloc_func(Event_Backend_URing, Event_Backend_URing_allocate);
 	rb_define_method(Event_Backend_URing, "initialize", Event_Backend_URing_initialize, 1);
+	rb_define_method(Event_Backend_URing, "select", Event_Backend_URing_select, 1);
 	rb_define_method(Event_Backend_URing, "close", Event_Backend_URing_close, 0);
 	
 	rb_define_method(Event_Backend_URing, "io_wait", Event_Backend_URing_io_wait, 3);
-	rb_define_method(Event_Backend_URing, "select", Event_Backend_URing_select, 1);
-	
 	rb_define_method(Event_Backend_URing, "io_read", Event_Backend_URing_io_read, 5);
 	rb_define_method(Event_Backend_URing, "io_write", Event_Backend_URing_io_write, 5);
+	
 	rb_define_method(Event_Backend_URing, "process_wait", Event_Backend_URing_process_wait, 3);
 }

data/ext/event/extconf.rb

@@ -33,8 +33,7 @@ $CFLAGS << " -Wall"
 $srcs = ["event.c", "backend/backend.c"]
 $VPATH << "$(srcdir)/backend"
 
-# have_func('rb_fiber_transfer')
-have_func('rb_fiber_transfer_kw')
+have_func('&rb_fiber_transfer')
 
 if have_library('uring') and have_header('liburing.h')
 	$srcs << "backend/uring.c"

data/ext/event/mkmf.log

@@ -1,4 +1,4 @@
-have_func: checking for rb_fiber_transfer_kw()... -------------------- no
+have_func: checking for &rb_fiber_transfer()... -------------------- 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   "
 checked program was:
@@ -12,9 +12,9 @@ checked program was:
 /* end */
 
 "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:57: error: use of undeclared identifier 'rb_fiber_transfer_kw'
-int t(void) { void ((*volatile p)()); p = (void ((*)()))rb_fiber_transfer_kw; return !p; }
-                                                        ^
+conftest.c:14:76: error: use of undeclared identifier 'rb_fiber_transfer'
+int t(void) { const volatile void *volatile p; p = (const volatile void *)&rb_fiber_transfer; return !p; }
+                                                                           ^
 1 error generated.
 checked program was:
 /* begin */
@@ -31,32 +31,7 @@ checked program was:
 11: 
 12:   return !!argv[argc];
 13: }
-14: int t(void) { void ((*volatile p)()); p = (void ((*)()))rb_fiber_transfer_kw; return !p; }
-/* end */
-
-"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_fiber_transfer_kw", referenced from:
-      _t in conftest-3b7f21.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:
-/* 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: extern void rb_fiber_transfer_kw();
-15: int t(void) { rb_fiber_transfer_kw(); return 0; }
+14: int t(void) { const volatile void *volatile p; p = (const volatile void *)&rb_fiber_transfer; return !p; }
 /* end */
 
 --------------------

data/lib/event/backend/select.rb

@@ -52,7 +52,50 @@ module Event
 				@readable.delete(io) if remove_readable
 				@writable.delete(io) if remove_writable
 			end
-
+			
+			def io_read(fiber, io, buffer, offset, length)
+				buffer.force_encoding(Encoding::BINARY)
+				
+				while length > 0
+					case result = io.read_nonblock(length, exception: false)
+					when :wait_readable
+						self.io_wait(fiber, io, READABLE)
+					when :wait_writable
+						self.io_wait(fiber, io, WRITABLE)
+					else
+						result.force_encoding(Encoding::BINARY)
+						buffer[offset, result.bytesize] = result
+						
+						offset += result.bytesize
+						length -= result.bytesize
+					end
+				end
+			rescue EOFError
+				return nil
+			end
+			
+			def io_write(fiber, io, buffer, offset, length)
+				buffer.force_encoding(Encoding::BINARY)
+				
+				total = 0
+				
+				while length > 0
+					chunk = buffer[offset, length]
+					case result = io.write_nonblock(chunk, exception: false)
+					when :wait_readable
+						self.io_wait(fiber, io, READABLE)
+					when :wait_writable
+						self.io_wait(fiber, io, WRITABLE)
+					else
+						offset += result
+						length -= result
+						total += result
+					end
+				end
+				
+				return total
+			end
+			
 			def process_wait(fiber, pid, flags)
 				r, w = IO.pipe
 				

data/lib/event/version.rb

@@ -1,3 +1,3 @@
 module Event
-	VERSION = "0.5.0"
+	VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: event
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-12 00:00:00.000000000 Z
+date: 2021-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bake