event 0.6.0 → 0.7.0

data/ext/event/backend/kqueue.c

@@ -27,19 +27,18 @@
 #include <errno.h>
 
 static VALUE Event_Backend_KQueue = Qnil;
-static ID id_fileno;
 
 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
@@ -79,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;
@@ -89,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) {
@@ -113,6 +112,33 @@ 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;
@@ -160,7 +186,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);
 }
@@ -281,7 +307,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_kqueue_filter(RB_NUM2INT(result)));
 }
@@ -290,7 +316,7 @@ VALUE Event_Backend_KQueue_io_wait(VALUE self, VALUE fiber, VALUE io, VALUE even
 	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));
+	int descriptor = Event_Backend_io_descriptor(io);
 	
 	struct io_wait_arguments io_wait_arguments = {
 		.events = io_add_filters(data->descriptor, descriptor, RB_NUM2INT(events), fiber),
@@ -301,6 +327,8 @@ 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;
@@ -311,7 +339,6 @@ struct io_read_arguments {
 	int descriptor;
 	
 	VALUE buffer;
-	size_t offset;
 	size_t length;
 };
 
@@ -319,18 +346,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_KQueue_io_wait(arguments->self, arguments->fiber, arguments->io, RB_INT2NUM(READABLE));
 		} else {
@@ -338,9 +369,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
@@ -352,13 +381,12 @@ VALUE io_read_ensure(VALUE _arguments) {
 	return Qnil;
 }
 
-VALUE Event_Backend_KQueue_io_read(VALUE self, VALUE fiber, VALUE io, VALUE buffer, VALUE _offset, VALUE _length) {
+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 = RB_NUM2INT(rb_funcall(io, id_fileno, 0));
+	int descriptor = Event_Backend_io_descriptor(io);
 	
-	size_t offset = NUM2SIZET(_offset);
 	size_t length = NUM2SIZET(_length);
 	
 	struct io_read_arguments io_read_arguments = {
@@ -369,7 +397,6 @@ VALUE Event_Backend_KQueue_io_read(VALUE self, VALUE fiber, VALUE io, VALUE buff
 		.flags = Event_Backend_nonblock_set(descriptor),
 		.descriptor = descriptor,
 		.buffer = buffer,
-		.offset = offset,
 		.length = length,
 	};
 	
@@ -386,7 +413,6 @@ struct io_write_arguments {
 	int descriptor;
 	
 	VALUE buffer;
-	size_t offset;
 	size_t length;
 };
 
@@ -394,18 +420,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_KQueue_io_wait(arguments->self, arguments->fiber, arguments->io, RB_INT2NUM(WRITABLE));
 		} else {
@@ -413,7 +444,7 @@ VALUE io_write_loop(VALUE _arguments) {
 		}
 	}
 	
-	return SIZET2NUM(total);
+	return SIZET2NUM(offset);
 };
 
 static
@@ -425,13 +456,12 @@ VALUE io_write_ensure(VALUE _arguments) {
 	return Qnil;
 };
 
-VALUE Event_Backend_KQueue_io_write(VALUE self, VALUE fiber, VALUE io, VALUE buffer, VALUE _offset, VALUE _length) {
+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 = NUM2INT(rb_funcall(io, id_fileno, 0));
+	int descriptor = Event_Backend_io_descriptor(io);
 	
-	size_t offset = NUM2SIZET(_offset);
 	size_t length = NUM2SIZET(_length);
 	
 	struct io_write_arguments io_write_arguments = {
@@ -442,13 +472,14 @@ VALUE Event_Backend_KQueue_io_write(VALUE self, VALUE fiber, VALUE io, VALUE buf
 		.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
 struct timespec * make_timeout(VALUE duration, struct timespec * storage) {
 	if (duration == Qnil) {
@@ -521,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,
@@ -544,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);
@@ -555,25 +588,29 @@ VALUE Event_Backend_KQueue_select(VALUE self, VALUE duration) {
 		VALUE fiber = (VALUE)arguments.events[i].udata;
 		VALUE result = INT2NUM(arguments.events[i].filter);
 		
-		Event_Backend_transfer_result(fiber, 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");
-	
 	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, "io_read", Event_Backend_KQueue_io_read, 5);
-	rb_define_method(Event_Backend_KQueue, "io_write", Event_Backend_KQueue_io_write, 5);
+	
+#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);
 }

data/ext/event/backend/uring.c

@@ -27,21 +27,25 @@
 
 #include "pidfd.c"
 
+static const int DEBUG = 0;
+
+// This option controls whether to all `io_uring_submit()` after every operation:
+static const int EARLY_SUBMIT = 1;
+
 static VALUE Event_Backend_URing = Qnil;
-static ID id_fileno;
 
-enum {URING_ENTRIES = 128};
-enum {URING_MAX_EVENTS = 128};
+enum {URING_ENTRIES = 64};
 
 struct Event_Backend_URing {
-	VALUE loop;
+	struct Event_Backend backend;
 	struct io_uring ring;
+	size_t pending;
 };
 
 void Event_Backend_URing_Type_mark(void *_data)
 {
 	struct Event_Backend_URing *data = _data;
-	rb_gc_mark(data->loop);
+	Event_Backend_mark(&data->backend);
 }
 
 static
@@ -81,9 +85,11 @@ VALUE Event_Backend_URing_allocate(VALUE self) {
 	struct Event_Backend_URing *data = NULL;
 	VALUE instance = TypedData_Make_Struct(self, struct Event_Backend_URing, &Event_Backend_URing_Type, data);
 	
-	data->loop = Qnil;
+	Event_Backend_initialize(&data->backend, Qnil);
 	data->ring.ring_fd = -1;
 	
+	data->pending = 0;
+
 	return instance;
 }
 
@@ -91,8 +97,7 @@ VALUE Event_Backend_URing_initialize(VALUE self, VALUE loop) {
 	struct Event_Backend_URing *data = NULL;
 	TypedData_Get_Struct(self, struct Event_Backend_URing, &Event_Backend_URing_Type, data);
 	
-	data->loop = loop;
-	
+	Event_Backend_initialize(&data->backend, loop);
 	int result = io_uring_queue_init(URING_ENTRIES, &data->ring, 0);
 	
 	if (result < 0) {
@@ -113,16 +118,91 @@ VALUE Event_Backend_URing_close(VALUE self) {
 	return Qnil;
 }
 
+VALUE Event_Backend_URing_transfer(VALUE self, VALUE fiber)
+{
+	struct Event_Backend_URing *data = NULL;
+	TypedData_Get_Struct(self, struct Event_Backend_URing, &Event_Backend_URing_Type, data);
+	
+	Event_Backend_wait_and_transfer(&data->backend, fiber);
+	
+	return Qnil;
+}
+
+VALUE Event_Backend_URing_defer(VALUE self)
+{
+	struct Event_Backend_URing *data = NULL;
+	TypedData_Get_Struct(self, struct Event_Backend_URing, &Event_Backend_URing_Type, data);
+	
+	Event_Backend_defer(&data->backend);
+	
+	return Qnil;
+}
+
+VALUE Event_Backend_URing_ready_p(VALUE self) {
+	struct Event_Backend_URing *data = NULL;
+	TypedData_Get_Struct(self, struct Event_Backend_URing, &Event_Backend_URing_Type, data);
+	
+	return data->backend.ready ? Qtrue : Qfalse;
+}
+
+static
+int io_uring_submit_flush(struct Event_Backend_URing *data) {
+	if (data->pending) {
+		if (DEBUG) fprintf(stderr, "io_uring_submit_flush(pending=%ld)\n", data->pending);
+		
+		// Try to submit:
+		int result = io_uring_submit(&data->ring);
+
+		if (result >= 0) {
+			// If it was submitted, reset pending count:
+			data->pending = 0;
+		} else if (result != -EBUSY && result != -EAGAIN) {
+			rb_syserr_fail(-result, "io_uring_submit_flush");
+		}
+
+		return result;
+	}
+	
+	return 0;
+}
+
+static
+int io_uring_submit_now(struct Event_Backend_URing *data) {
+	while (true) {
+		int result = io_uring_submit(&data->ring);
+		
+		if (result >= 0) {
+			data->pending = 0;
+			return result;
+		}
+
+		if (result == -EBUSY || result == -EAGAIN) {
+			Event_Backend_defer(&data->backend);
+		} else {
+			rb_syserr_fail(-result, "io_uring_submit_now");
+		}
+	}
+}
+
+static
+void io_uring_submit_pending(struct Event_Backend_URing *data) {
+	if (EARLY_SUBMIT) {
+		io_uring_submit_now(data);
+	} else {
+		data->pending += 1;
+	}
+}
+
 struct io_uring_sqe * io_get_sqe(struct Event_Backend_URing *data) {
 	struct io_uring_sqe *sqe = io_uring_get_sqe(&data->ring);
 	
 	while (sqe == NULL) {
-		io_uring_submit(&data->ring);
+		// The submit queue is full, we need to drain it:	
+		io_uring_submit_now(data);
+
 		sqe = io_uring_get_sqe(&data->ring);
 	}
 	
-	// fprintf(stderr, "io_get_sqe -> %p\n", sqe);
-	
 	return sqe;
 }
 
@@ -137,7 +217,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);
 }
@@ -165,11 +245,12 @@ VALUE Event_Backend_URing_process_wait(VALUE self, VALUE fiber, VALUE pid, VALUE
 	rb_update_max_fd(process_wait_arguments.descriptor);
 	
 	struct io_uring_sqe *sqe = io_get_sqe(data);
-	assert(sqe);
-	
+
+	if (DEBUG) fprintf(stderr, "Event_Backend_URing_process_wait:io_uring_prep_poll_add(%p)\n", (void*)fiber);
 	io_uring_prep_poll_add(sqe, process_wait_arguments.descriptor, POLLIN|POLLHUP|POLLERR);
 	io_uring_sqe_set_data(sqe, (void*)fiber);
-	
+	io_uring_submit_pending(data);
+
 	return rb_ensure(process_wait_transfer, (VALUE)&process_wait_arguments, process_wait_ensure, (VALUE)&process_wait_arguments);
 }
 
@@ -210,12 +291,10 @@ VALUE io_wait_rescue(VALUE _arguments, VALUE exception) {
 	struct Event_Backend_URing *data = arguments->data;
 	
 	struct io_uring_sqe *sqe = io_get_sqe(data);
-	assert(sqe);
 	
-	// fprintf(stderr, "poll_remove(%p, %p)\n", sqe, (void*)arguments->fiber);
+	if (DEBUG) fprintf(stderr, "io_wait_rescue:io_uring_prep_poll_remove(%p)\n", (void*)arguments->fiber);
 	
 	io_uring_prep_poll_remove(sqe, (void*)arguments->fiber);
-	io_uring_submit(&data->ring);
 	
 	rb_exc_raise(exception);
 };
@@ -225,8 +304,9 @@ VALUE io_wait_transfer(VALUE _arguments) {
 	struct io_wait_arguments *arguments = (struct io_wait_arguments *)_arguments;
 	struct Event_Backend_URing *data = arguments->data;
 
-	VALUE result = Event_Backend_transfer(data->loop);
-	
+	VALUE result = Event_Backend_fiber_transfer(data->backend.loop);
+	if (DEBUG) fprintf(stderr, "io_wait:Event_Backend_fiber_transfer -> %d\n", RB_NUM2INT(result));
+
 	// We explicitly filter the resulting events based on the requested events.
 	// In some cases, poll will report events we didn't ask for.
 	short flags = arguments->flags & NUM2INT(result);
@@ -238,18 +318,16 @@ VALUE Event_Backend_URing_io_wait(VALUE self, VALUE fiber, VALUE io, VALUE event
 	struct Event_Backend_URing *data = NULL;
 	TypedData_Get_Struct(self, struct Event_Backend_URing, &Event_Backend_URing_Type, data);
 	
-	int descriptor = NUM2INT(rb_funcall(io, id_fileno, 0));
+	int descriptor = Event_Backend_io_descriptor(io);
 	struct io_uring_sqe *sqe = io_get_sqe(data);
-	assert(sqe);
 	
 	short flags = poll_flags_from_events(NUM2INT(events));
 	
-	// fprintf(stderr, "poll_add(%p, %d, %d, %p)\n", sqe, descriptor, flags, (void*)fiber);
+	if (DEBUG) fprintf(stderr, "Event_Backend_URing_io_wait:io_uring_prep_poll_add(descriptor=%d, flags=%d, fiber=%p)\n", descriptor, flags, (void*)fiber);
 	
 	io_uring_prep_poll_add(sqe, descriptor, flags);
 	io_uring_sqe_set_data(sqe, (void*)fiber);
-	// fprintf(stderr, "io_uring_submit\n");
-	// io_uring_submit(&data->ring);
+	io_uring_submit_pending(data);
 	
 	struct io_wait_arguments io_wait_arguments = {
 		.data = data,
@@ -260,42 +338,46 @@ 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);
 }
 
-static
-int io_read(struct Event_Backend_URing *data, VALUE fiber, int descriptor, char *buffer, size_t length) {
+#ifdef HAVE_RUBY_IO_BUFFER_H
+
+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 = buffer;
-	iovecs[0].iov_len = length;
-	
-	io_uring_prep_readv(sqe, descriptor, iovecs, 1, 0);
+
+	if (DEBUG) fprintf(stderr, "io_read:io_uring_prep_read(fiber=%p)\n", (void*)fiber);
+
+	io_uring_prep_read(sqe, descriptor, buffer, length, 0);
 	io_uring_sqe_set_data(sqe, (void*)fiber);
-	io_uring_submit(&data->ring);
+	io_uring_submit_pending(data);
 	
-	return NUM2INT(Event_Backend_transfer(data->loop));
+	VALUE result = Event_Backend_fiber_transfer(data->backend.loop);
+	if (DEBUG) fprintf(stderr, "io_read:Event_Backend_fiber_transfer -> %d\n", RB_NUM2INT(result));
+
+	return RB_NUM2INT(result);
 }
 
-VALUE Event_Backend_URing_io_read(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 _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 descriptor = Event_Backend_io_descriptor(io);
 	
-	size_t offset = NUM2SIZET(_offset);
-	size_t length = NUM2SIZET(_length);
+	void *base;
+	size_t size;
+	rb_io_buffer_get_mutable(buffer, &base, &size);
 	
-	size_t start = offset;
-	size_t total = 0;
+	size_t offset = 0;
+	size_t length = NUM2SIZET(_length);
 	
 	while (length > 0) {
-		char *buffer = Event_Backend_resize_to_capacity(_buffer, offset, length);
-		int result = io_read(data, fiber, descriptor, buffer+offset, length);
+		size_t maximum_size = size - offset;
+		int result = io_read(data, fiber, descriptor, (char*)base+offset, maximum_size);
 		
-		if (result >= 0) {
+		if (result == 0) {
+			break;
+		} else if (result > 0) {
 			offset += result;
+			if ((size_t)result >= length) break;
 			length -= result;
-			total += result;
 		} else if (-result == EAGAIN || -result == EWOULDBLOCK) {
 			Event_Backend_URing_io_wait(self, fiber, io, RB_INT2NUM(READABLE));
 		} else {
@@ -303,47 +385,49 @@ VALUE Event_Backend_URing_io_read(VALUE self, VALUE fiber, VALUE io, VALUE _buff
 		}
 	}
 	
-	Event_Backend_resize_to_fit(_buffer, start, total);
-	
-	return SIZET2NUM(total);
+	return SIZET2NUM(offset);
 }
 
 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 = buffer;
-	iovecs[0].iov_len = length;
-	
-	io_uring_prep_writev(sqe, descriptor, iovecs, 1, 0);
+	if (DEBUG) fprintf(stderr, "io_write:io_uring_prep_write(fiber=%p)\n", (void*)fiber);
+
+	io_uring_prep_write(sqe, descriptor, buffer, length, 0);
 	io_uring_sqe_set_data(sqe, (void*)fiber);
-	io_uring_submit(&data->ring);
+	io_uring_submit_pending(data);
 	
-	return NUM2INT(Event_Backend_transfer(data->loop));
+	int result = RB_NUM2INT(Event_Backend_fiber_transfer(data->backend.loop));
+	if (DEBUG) fprintf(stderr, "io_write:Event_Backend_fiber_transfer -> %d\n", result);
+
+	return result;
 }
 
-VALUE Event_Backend_URing_io_write(VALUE self, VALUE fiber, VALUE io, VALUE _buffer, VALUE _offset, VALUE _length) {
+VALUE Event_Backend_URing_io_write(VALUE self, VALUE fiber, VALUE io, VALUE buffer, 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 descriptor = Event_Backend_io_descriptor(io);
 	
-	size_t offset = NUM2SIZET(_offset);
-	size_t length = NUM2SIZET(_length);
+	const void *base;
+	size_t size;
+	rb_io_buffer_get_immutable(buffer, &base, &size);
 	
-	char *buffer = Event_Backend_verify_size(_buffer, offset, length);
+	size_t offset = 0;
+	size_t length = NUM2SIZET(_length);
 	
-	size_t total = 0;
+	if (length > size) {
+		rb_raise(rb_eRuntimeError, "Length exceeds size of buffer!");
+	}
 	
 	while (length > 0) {
-		int result = io_write(data, fiber, descriptor, buffer+offset, length);
+		int result = io_write(data, fiber, descriptor, (char*)base+offset, length);
 		
 		if (result >= 0) {
-			length -= result;
 			offset += result;
-			total += result;
+			if ((size_t)result >= length) break;
+			length -= result;
 		} else if (-result == EAGAIN || -result == EWOULDBLOCK) {
 			Event_Backend_URing_io_wait(self, fiber, io, RB_INT2NUM(WRITABLE));
 		} else {
@@ -351,7 +435,34 @@ VALUE Event_Backend_URing_io_write(VALUE self, VALUE fiber, VALUE io, VALUE _buf
 		}
 	}
 	
-	return SIZET2NUM(total);
+	return SIZET2NUM(offset);
+}
+
+#endif
+
+static const int ASYNC_CLOSE = 2;
+
+VALUE Event_Backend_URing_io_close(VALUE self, VALUE io) {
+	struct Event_Backend_URing *data = NULL;
+	TypedData_Get_Struct(self, struct Event_Backend_URing, &Event_Backend_URing_Type, data);
+	
+	int descriptor = Event_Backend_io_descriptor(io);
+
+	if (ASYNC_CLOSE) {
+		struct io_uring_sqe *sqe = io_get_sqe(data);
+		
+		io_uring_prep_close(sqe, descriptor);
+		io_uring_sqe_set_data(sqe, NULL);
+		if (ASYNC_CLOSE == 1)
+			io_uring_submit_now(data);
+		else if (ASYNC_CLOSE == 2)
+			io_uring_submit_pending(data);
+	} else {
+		close(descriptor);
+	}
+
+	// We don't wait for the result of close since it has no use in pratice:
+	return Qtrue;
 }
 
 static
@@ -397,9 +508,9 @@ struct select_arguments {
 static
 void * select_internal(void *_arguments) {
 	struct select_arguments * arguments = (struct select_arguments *)_arguments;
-	
-	io_uring_submit(&arguments->data->ring);
-	
+
+	io_uring_submit_flush(arguments->data);
+
 	struct io_uring_cqe *cqe = NULL;
 	arguments->result = io_uring_wait_cqe_timeout(&arguments->data->ring, &cqe, arguments->timeout);
 	
@@ -433,21 +544,24 @@ unsigned select_process_completions(struct io_uring *ring) {
 		
 		// If the operation was cancelled, or the operation has no user data (fiber):
 		if (cqe->res == -ECANCELED || cqe->user_data == 0 || cqe->user_data == LIBURING_UDATA_TIMEOUT) {
+			io_uring_cq_advance(ring, 1);
 			continue;
 		}
 		
 		VALUE fiber = (VALUE)cqe->user_data;
-		VALUE result = INT2NUM(cqe->res);
+		VALUE result = RB_INT2NUM(cqe->res);
 		
-		// fprintf(stderr, "cqe res=%d user_data=%p\n", cqe->res, (void*)cqe->user_data);
-		
-		Event_Backend_transfer_result(fiber, result);
-	}
-	
-	if (completed) {
-		io_uring_cq_advance(ring, completed);
+		if (DEBUG) fprintf(stderr, "cqe res=%d user_data=%p\n", cqe->res, (void*)cqe->user_data);
+
+		io_uring_cq_advance(ring, 1);
+
+		Event_Backend_fiber_transfer_result(fiber, result);
 	}
 	
+	// io_uring_cq_advance(ring, completed);
+
+	if (DEBUG) fprintf(stderr, "select_process_completions(completed=%d)\n", completed);
+
 	return completed;
 }
 
@@ -455,11 +569,17 @@ VALUE Event_Backend_URing_select(VALUE self, VALUE duration) {
 	struct Event_Backend_URing *data = NULL;
 	TypedData_Get_Struct(self, struct Event_Backend_URing, &Event_Backend_URing_Type, data);
 	
-	int result = select_process_completions(&data->ring);
+	Event_Backend_ready_pop(&data->backend);
 	
-	if (result < 0) {
-		rb_syserr_fail(-result, strerror(-result));
-	} else if (result == 0) {
+	int result = 0;
+
+	// There can only be events waiting if we have been submitting them early:
+	if (EARLY_SUBMIT) {
+		result = select_process_completions(&data->ring);
+	}
+
+	// If we aren't submitting events early, we need to submit them and/or wait for them:
+	if (result == 0) {
 		// We might need to wait for events:
 		struct select_arguments arguments = {
 			.data = data,
@@ -468,31 +588,40 @@ VALUE Event_Backend_URing_select(VALUE self, VALUE duration) {
 		
 		arguments.timeout = make_timeout(duration, &arguments.storage);
 		
-		if (!timeout_nonblocking(arguments.timeout)) {
+		if (!data->backend.ready && !timeout_nonblocking(arguments.timeout)) {
+			// This is a blocking operation, we wait for events:
 			result = select_internal_without_gvl(&arguments);
 		} else {
-			io_uring_submit(&data->ring);
+			// The timeout specified required "nonblocking" behaviour so we just flush the SQ if required:
+			io_uring_submit_flush(data);
 		}
+
+		// After waiting/flushing the SQ, check if there are any completions:
+		result = select_process_completions(&data->ring);
 	}
 	
-	result = select_process_completions(&data->ring);
-	
-	return INT2NUM(result);
+	return RB_INT2NUM(result);
 }
 
 void Init_Event_Backend_URing(VALUE Event_Backend) {
-	id_fileno = rb_intern("fileno");
-	
 	Event_Backend_URing = rb_define_class_under(Event_Backend, "URing", rb_cObject);
 	
 	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, "transfer", Event_Backend_URing_transfer, 1);
+	rb_define_method(Event_Backend_URing, "defer", Event_Backend_URing_defer, 0);
+	rb_define_method(Event_Backend_URing, "ready?", Event_Backend_URing_ready_p, 0);
 	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, "io_read", Event_Backend_URing_io_read, 5);
-	rb_define_method(Event_Backend_URing, "io_write", Event_Backend_URing_io_write, 5);
+	
+#ifdef HAVE_RUBY_IO_BUFFER_H
+	rb_define_method(Event_Backend_URing, "io_read", Event_Backend_URing_io_read, 4);
+	rb_define_method(Event_Backend_URing, "io_write", Event_Backend_URing_io_write, 4);
+#endif
+	
+	rb_define_method(Event_Backend_URing, "io_close", Event_Backend_URing_io_close, 1);
 	
 	rb_define_method(Event_Backend_URing, "process_wait", Event_Backend_URing_process_wait, 3);
 }