event 0.4.2 → 0.7.0

data/ext/event/backend/pidfd.c

@@ -0,0 +1,36 @@
+// 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 <sys/types.h>
+#include <sys/syscall.h>
+#include <unistd.h>
+#include <poll.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#ifndef __NR_pidfd_open
+#define __NR_pidfd_open 434   /* System call # on most architectures */
+#endif
+
+static int
+pidfd_open(pid_t pid, unsigned int flags)
+{
+	return syscall(__NR_pidfd_open, pid, flags);
+}

data/ext/event/backend/uring.c

@@ -25,21 +25,27 @@
 #include <poll.h>
 #include <time.h>
 
+#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, id_transfer;
 
-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
@@ -79,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;
 }
 
@@ -89,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) {
@@ -111,6 +118,142 @@ 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) {
+		// The submit queue is full, we need to drain it:	
+		io_uring_submit_now(data);
+
+		sqe = io_uring_get_sqe(&data->ring);
+	}
+	
+	return sqe;
+}
+
+struct process_wait_arguments {
+	struct Event_Backend_URing *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;
+	
+	close(arguments->descriptor);
+	
+	return Qnil;
+}
+
+VALUE Event_Backend_URing_process_wait(VALUE self, VALUE fiber, VALUE pid, VALUE flags) {
+	struct Event_Backend_URing *data = NULL;
+	TypedData_Get_Struct(self, struct Event_Backend_URing, &Event_Backend_URing_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 io_uring_sqe *sqe = io_get_sqe(data);
+
+	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);
+}
+
 static inline
 short poll_flags_from_events(int events) {
 	short flags = 0;
@@ -142,16 +285,6 @@ struct io_wait_arguments {
 	short flags;
 };
 
-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) {
-		sqe = io_uring_get_sqe(&data->ring);
-	}
-	
-	return sqe;
-}
-
 static
 VALUE io_wait_rescue(VALUE _arguments, VALUE exception) {
 	struct io_wait_arguments *arguments = (struct io_wait_arguments *)_arguments;
@@ -159,10 +292,9 @@ VALUE io_wait_rescue(VALUE _arguments, VALUE exception) {
 	
 	struct io_uring_sqe *sqe = io_get_sqe(data);
 	
-	// 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);
 };
@@ -171,9 +303,10 @@ static
 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 = rb_funcall(data->loop, id_transfer, 0);
-	
+
+	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);
@@ -185,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);
 	
-	if (!sqe) return INT2NUM(0);
-	
 	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);
-	io_uring_submit(&data->ring);
+	io_uring_submit_pending(data);
 	
 	struct io_wait_arguments io_wait_arguments = {
 		.data = data,
@@ -207,87 +338,131 @@ 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);
-	}
-}
+#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);
+
+	if (DEBUG) fprintf(stderr, "io_read:io_uring_prep_read(fiber=%p)\n", (void*)fiber);
 
-inline static
-void resize_to_fit(VALUE string, size_t offset, size_t length) {
-	size_t current_length = RSTRING_LEN(string);
+	io_uring_prep_read(sqe, descriptor, buffer, length, 0);
+	io_uring_sqe_set_data(sqe, (void*)fiber);
+	io_uring_submit_pending(data);
 	
-	if (current_length < (offset + length)) {
-		rb_str_set_len(string, offset + length);
-	}
+	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);
 	
-	resize_to_capacity(buffer, NUM2SIZET(offset), NUM2SIZET(length));
-	
-	int descriptor = NUM2INT(rb_funcall(io, id_fileno, 0));
-	struct io_uring_sqe *sqe = io_get_sqe(data);
-	
-	struct iovec iovecs[1];
-	iovecs[0].iov_base = RSTRING_PTR(buffer) + NUM2SIZET(offset);
-	iovecs[0].iov_len = NUM2SIZET(length);
-	
-	io_uring_prep_readv(sqe, descriptor, iovecs, 1, 0);
-	io_uring_sqe_set_data(sqe, (void*)fiber);
-	io_uring_submit(&data->ring);
+	int descriptor = Event_Backend_io_descriptor(io);
 	
-	// fprintf(stderr, "prep_readv(%p, %d, %ld)\n", sqe, descriptor, iovecs[0].iov_len);
+	void *base;
+	size_t size;
+	rb_io_buffer_get_mutable(buffer, &base, &size);
 	
-	int result = NUM2INT(rb_funcall(data->loop, id_transfer, 0));
+	size_t offset = 0;
+	size_t length = NUM2SIZET(_length);
 	
-	if (result < 0) {
-		rb_syserr_fail(-result, strerror(-result));
+	while (length > 0) {
+		size_t maximum_size = size - offset;
+		int result = io_read(data, fiber, descriptor, (char*)base+offset, maximum_size);
+		
+		if (result == 0) {
+			break;
+		} else if (result > 0) {
+			offset += 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(READABLE));
+		} else {
+			rb_syserr_fail(-result, strerror(-result));
+		}
 	}
 	
-	resize_to_fit(buffer, NUM2SIZET(offset), (size_t)result);
+	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);
+	
+	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_pending(data);
 	
-	return INT2NUM(result);
+	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);
 	
-	if ((size_t)RSTRING_LEN(buffer) < NUM2SIZET(offset) + NUM2SIZET(length)) {
-		rb_raise(rb_eRuntimeError, "invalid offset/length exceeds bounds of buffer");
-	}
+	int descriptor = Event_Backend_io_descriptor(io);
 	
-	int descriptor = NUM2INT(rb_funcall(io, id_fileno, 0));
-	struct io_uring_sqe *sqe = io_get_sqe(data);
+	const void *base;
+	size_t size;
+	rb_io_buffer_get_immutable(buffer, &base, &size);
 	
-	struct iovec iovecs[1];
-	iovecs[0].iov_base = RSTRING_PTR(buffer) + NUM2SIZET(offset);
-	iovecs[0].iov_len = NUM2SIZET(length);
+	size_t offset = 0;
+	size_t length = NUM2SIZET(_length);
 	
-	io_uring_prep_writev(sqe, descriptor, iovecs, 1, 0);
-	io_uring_sqe_set_data(sqe, (void*)fiber);
-	io_uring_submit(&data->ring);
+	if (length > size) {
+		rb_raise(rb_eRuntimeError, "Length exceeds size of buffer!");
+	}
 	
-	// fprintf(stderr, "prep_writev(%p, %d, %ld)\n", sqe, descriptor, iovecs[0].iov_len);
+	while (length > 0) {
+		int result = io_write(data, fiber, descriptor, (char*)base+offset, length);
+		
+		if (result >= 0) {
+			offset += 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 {
+			rb_syserr_fail(-result, strerror(-result));
+		}
+	}
 	
-	int result = NUM2INT(rb_funcall(data->loop, id_transfer, 0));
+	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);
 	
-	if (result < 0) {
-		rb_syserr_fail(-result, strerror(-result));
+	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);
 	}
-	
-	return INT2NUM(result);
+
+	// We don't wait for the result of close since it has no use in pratice:
+	return Qtrue;
 }
 
 static
@@ -324,8 +499,7 @@ int timeout_nonblocking(struct __kernel_timespec *timespec) {
 struct select_arguments {
 	struct Event_Backend_URing *data;
 	
-	int count;
-	struct io_uring_cqe **cqes;
+	int result;
 	
 	struct __kernel_timespec storage;
 	struct __kernel_timespec *timeout;
@@ -334,13 +508,11 @@ struct select_arguments {
 static
 void * select_internal(void *_arguments) {
 	struct select_arguments * arguments = (struct select_arguments *)_arguments;
-	
-	arguments->count = io_uring_wait_cqes(&arguments->data->ring, arguments->cqes, 1, arguments->timeout, NULL);
-	
-	// If waiting resulted in a timeout, there are 0 events.
-	if (arguments->count == -ETIME) {
-		arguments->count = 0;
-	}
+
+	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);
 	
 	return NULL;
 }
@@ -349,73 +521,107 @@ static
 int select_internal_without_gvl(struct select_arguments *arguments) {
 	rb_thread_call_without_gvl(select_internal, (void *)arguments, RUBY_UBF_IO, 0);
 	
-	if (arguments->count < 0) {
-		rb_syserr_fail(-arguments->count, "select_internal_without_gvl:io_uring_wait_cqes");
+	if (arguments->result == -ETIME) {
+		arguments->result = 0;
+	} else if (arguments->result < 0) {
+		rb_syserr_fail(-arguments->result, "select_internal_without_gvl:io_uring_wait_cqes");
+	} else {
+		// At least 1 event is waiting:
+		arguments->result = 1;
 	}
 	
-	return arguments->count;
+	return arguments->result;
+}
+
+static inline
+unsigned select_process_completions(struct io_uring *ring) {
+	unsigned completed = 0;
+	unsigned head;
+	struct io_uring_cqe *cqe;
+	
+	io_uring_for_each_cqe(ring, head, cqe) {
+		++completed;
+		
+		// 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 = RB_INT2NUM(cqe->res);
+		
+		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;
 }
 
 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);
 	
-	struct io_uring_cqe *cqes[URING_MAX_EVENTS];
-	
-	// This is a non-blocking operation:
-	int result = io_uring_peek_batch_cqe(&data->ring, cqes, URING_MAX_EVENTS);
+	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,
-			.cqes = cqes,
 			.timeout = NULL,
 		};
 		
 		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 {
+			// 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);
 	}
 	
-	// fprintf(stderr, "cqes count=%d\n", result);
-	
-	for (int i = 0; i < result; i += 1) {
-		// If the operation was cancelled, or the operation has no user data (fiber):
-		if (cqes[i]->res == -ECANCELED || cqes[i]->user_data == 0) {
-			continue;
-		}
-		
-		VALUE fiber = (VALUE)io_uring_cqe_get_data(cqes[i]);
-		VALUE result = INT2NUM(cqes[i]->res);
-		
-		// fprintf(stderr, "cqes[i] res=%d user_data=%p\n", cqes[i]->res, (void*)cqes[i]->user_data);
-		
-		io_uring_cqe_seen(&data->ring, cqes[i]);
-		
-		rb_funcall(fiber, id_transfer, 1, result);
-	}
-	
-	return INT2NUM(result);
+	return RB_INT2NUM(result);
 }
 
 void Init_Event_Backend_URing(VALUE Event_Backend) {
-	id_fileno = rb_intern("fileno");
-	id_transfer = rb_intern("transfer");
-	
 	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, "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);
+#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);
 }