event 0.1.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 287fe2e9885bd34fd2595c49589c2cfe751799e34f738a18e93f9ccdf13f3ffd
-  data.tar.gz: 88cec8cd2badba810501a9a3aef7309dcb76d87ef0c6029bca147ba2d3eea09e
+  metadata.gz: 820b9a8295d89939388b1fa56c818addaad4e46a3af90eb0318a6c4d4338b729
+  data.tar.gz: a925d6a51efeacb281c68cdb51840fe81a1c97aa22297c684f7a441d9ee2afc3
 SHA512:
-  metadata.gz: 956801d0c052c06efe6cf126e76472a02f2271d8476a0501f262ab1d71b0e97992fc5bf2ffce33b753f510179ec42f8f5529152d9bd48ed6029b4009ba754d3c
-  data.tar.gz: 3f35bf37920170794733e5b3671aa9e0e1a3a64620dde2209310d5c8143866ce92289c5efe6b9f2010f271b2452b3efdb9bbb3d2c3c72d80cefd847154746355
+  metadata.gz: a591c0f50e2f1fa19d895eea4a94141b6d6ed2f359325f61400f67c35a51e1f89ff4a8806ae764042f0e747612a0c291554bed423c83ae9ec58afbc24bf20c3b
+  data.tar.gz: e32064f234f542aee8bff87e19e1c3647c08e054c962d4943674e7a17167860f5898bc76b1c134494fea1a46a8f2a40da0b30d5516470950eecd02df470893c8

data/ext/event/backend/backend.h

@@ -0,0 +1,27 @@
+// 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.
+
+enum Event {
+	READABLE = 1,
+	PRIORITY = 2,
+	WRITABLE = 4,
+	ERROR = 8,
+	HANGUP = 16
+};

data/ext/event/backend/epoll.c

@@ -19,6 +19,7 @@
 // THE SOFTWARE.
 
 #include "kqueue.h"
+#include "backend.h"
 
 #include <sys/epoll.h>
 #include <time.h>
@@ -27,8 +28,6 @@
 static VALUE Event_Backend_EPoll = Qnil;
 static ID id_fileno, id_transfer;
 
-static const int READABLE = 1, PRIORITY = 2, WRITABLE = 4;
-
 static const unsigned EPOLL_MAX_EVENTS = 1024;
 
 struct Event_Backend_EPoll {
@@ -97,32 +96,66 @@ VALUE Event_Backend_EPoll_initialize(VALUE self, VALUE loop) {
 	return self;
 }
 
-VALUE Event_Backend_EPoll_io_wait(VALUE self, VALUE fiber, VALUE io, VALUE events) {
-	struct Event_Backend_EPoll *data = NULL;
-	TypedData_Get_Struct(self, struct Event_Backend_EPoll, &Event_Backend_EPoll_Type, data);
+static inline
+uint32_t epoll_flags_from_events(int events) {
+	uint32_t flags = 0;
 	
-	struct epoll_event event = {0};
+	if (events & READABLE) flags |= EPOLLIN;
+	if (events & PRIORITY) flags |= EPOLLPRI;
+	if (events & WRITABLE) flags |= EPOLLOUT;
 	
-	int descriptor = NUM2INT(rb_funcall(io, id_fileno, 0));
-	int duplicate = -1;
+	flags |= EPOLLRDHUP;
+	flags |= EPOLLONESHOT;
+	
+	return flags;
+}
+
+static inline
+int events_from_epoll_flags(uint32_t flags) {
+	int events = 0;
 	
-	int mask = NUM2INT(events);
+	if (flags & EPOLLIN) events |= READABLE;
+	if (flags & EPOLLPRI) events |= PRIORITY;
+	if (flags & EPOLLOUT) events |= WRITABLE;
 	
-	if (mask & READABLE) {
-		event.events |= EPOLLIN;
-	}
+	return events;
+}
+
+struct io_wait_arguments {
+	struct Event_Backend_EPoll *data;
+	int duplicate;
+};
+
+static
+VALUE io_wait_ensure(VALUE _arguments) {
+	struct io_wait_arguments *arguments = (struct io_wait_arguments *)_arguments;
 	
-	if (mask & PRIORITY) {
-		event.events |= EPOLLPRI;
+	if (arguments->duplicate >= 0) {
+		close(arguments->duplicate);
 	}
 	
-	if (mask & WRITABLE) {
-		event.events |= EPOLLOUT;
-	}
+	return Qnil;
+};
+
+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);
+	
+	return INT2NUM(events_from_epoll_flags(NUM2INT(result)));
+};
+
+VALUE Event_Backend_EPoll_io_wait(VALUE self, VALUE fiber, VALUE io, VALUE events) {
+	struct Event_Backend_EPoll *data = NULL;
+	TypedData_Get_Struct(self, struct Event_Backend_EPoll, &Event_Backend_EPoll_Type, data);
+	
+	struct epoll_event event = {0};
 	
-	event.events |= EPOLLRDHUP;
-	event.events |= EPOLLONESHOT;
+	int descriptor = NUM2INT(rb_funcall(io, id_fileno, 0));
+	int duplicate = -1;
 	
+	event.events = epoll_flags_from_events(NUM2INT(events));
 	event.data.ptr = (void*)fiber;
 	
 	// A better approach is to batch all changes:
@@ -144,13 +177,12 @@ VALUE Event_Backend_EPoll_io_wait(VALUE self, VALUE fiber, VALUE io, VALUE event
 		rb_sys_fail("epoll_ctl");
 	}
 	
-	rb_funcall(data->loop, id_transfer, 0);
+	struct io_wait_arguments io_wait_arguments = {
+		.data = data,
+		.duplicate = duplicate
+	};
 	
-	if (duplicate >= 0) {
-		close(duplicate);
-	}
-	
-	return Qnil;
+	return rb_ensure(io_wait_transfer, (VALUE)&io_wait_arguments, io_wait_ensure, (VALUE)&io_wait_arguments);
 }
 
 static
@@ -186,7 +218,9 @@ VALUE Event_Backend_EPoll_select(VALUE self, VALUE duration) {
 	
 	for (int i = 0; i < count; i += 1) {
 		VALUE fiber = (VALUE)events[i].data.ptr;
-		rb_funcall(fiber, id_transfer, 0);
+		VALUE result = INT2NUM(events[i].events);
+		
+		rb_funcall(fiber, id_transfer, 1, result);
 	}
 	
 	return INT2NUM(count);

data/ext/event/backend/kqueue.c

@@ -19,6 +19,7 @@
 // THE SOFTWARE.
 
 #include "kqueue.h"
+#include "backend.h"
 
 #include <sys/event.h>
 #include <sys/ioctl.h>
@@ -27,7 +28,12 @@
 static VALUE Event_Backend_KQueue = Qnil;
 static ID id_fileno, id_transfer;
 
-static const int READABLE = 1, PRIORITY = 2, WRITABLE = 4;
+static const int
+	READABLE = 1,
+	PRIORITY = 2,
+	WRITABLE = 4,
+	ERROR = 8,
+	HANGUP = 16;
 
 static const unsigned KQUEUE_MAX_EVENTS = 1024;
 
@@ -98,30 +104,40 @@ VALUE Event_Backend_KQueue_initialize(VALUE self, VALUE loop) {
 	return self;
 }
 
+static inline
+u_short kqueue_filter_from_events(int events) {
+	u_short filter = 0;
+	
+	if (events & READABLE) filter |= EVFILT_READ;
+	if (events & PRIORITY) filter |= EV_OOBAND;
+	if (events & WRITABLE) filter |= EVFILT_WRITE;
+	
+	return filter;
+}
+
+static inline
+int events_from_kqueue_filter(u_short filter) {
+	int events = 0;
+	
+	if (filter & EVFILT_READ) events |= READABLE;
+	if (filter & EV_OOBAND) events |= PRIORITY;
+	if (filter & EVFILT_WRITE) events |= WRITABLE;
+	
+	return INT2NUM(events);
+}
+
 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);
 	
-	struct kevent event;
-	u_short flags = 0;
+	struct kevent event = {0};
 	
 	int descriptor = NUM2INT(rb_funcall(io, id_fileno, 0));
 	
-	int mask = NUM2INT(events);
-	
-	if (mask & READABLE) {
-		flags |= EVFILT_READ;
-	}
-	
-	if (mask & PRIORITY) {
-		flags |= EV_OOBAND;
-	}
-	
-	if (mask & WRITABLE) {
-		flags |= EVFILT_WRITE;
-	}
-
-	EV_SET(&event, descriptor, flags, EV_ADD|EV_ENABLE|EV_ONESHOT, 0, 0, (void*)fiber);
+	event.ident = descriptor;
+	event.filter = kqueue_filters_from_events(events);
+	event.flags = EV_ADD | EV_ENABLE | EV_ONESHOT;
+	event.udata = (void*)fiber;
 	
 	// A better approach is to batch all changes:
 	int result = kevent(data->descriptor, &event, 1, NULL, 0, NULL);
@@ -130,9 +146,8 @@ VALUE Event_Backend_KQueue_io_wait(VALUE self, VALUE fiber, VALUE io, VALUE even
 		rb_sys_fail("kevent");
 	}
 	
-	rb_funcall(data->loop, id_transfer, 0);
-	
-	return Qnil;
+	VALUE result = rb_funcall(data->loop, id_transfer, 0);
+	return INT2NUM(events_from_kqueue_filter(NUM2INT(result)));
 }
 
 static
@@ -176,7 +191,8 @@ VALUE Event_Backend_KQueue_select(VALUE self, VALUE duration) {
 	
 	for (int i = 0; i < count; i += 1) {
 		VALUE fiber = (VALUE)events[i].udata;
-		rb_funcall(fiber, id_transfer, 0);
+		VALUE result = INT2NUM(events[i].filter);
+		rb_funcall(fiber, id_transfer, 1, result);
 	}
 	
 	return INT2NUM(count);

data/ext/event/backend/uring.c

@@ -19,15 +19,15 @@
 // THE SOFTWARE.
 
 #include "uring.h"
+#include "backend.h"
 
 #include <liburing.h>
+#include <poll.h>
 #include <time.h>
 
 static VALUE Event_Backend_URing = Qnil;
 static ID id_fileno, id_transfer;
 
-static const int READABLE = 1, PRIORITY = 2, WRITABLE = 4;
-
 static const int URING_ENTRIES = 1024;
 static const int URING_MAX_EVENTS = 1024;
 
@@ -96,6 +96,31 @@ VALUE Event_Backend_URing_initialize(VALUE self, VALUE loop) {
 	return self;
 }
 
+static inline
+short poll_flags_from_events(int events) {
+	short flags = 0;
+	
+	if (events & READABLE) flags |= POLLIN;
+	if (events & PRIORITY) flags |= POLLPRI;
+	if (events & WRITABLE) flags |= POLLOUT;
+	
+	flags |= POLLERR;
+	flags |= POLLHUP;
+	
+	return flags;
+}
+
+static inline
+int events_from_poll_flags(short flags) {
+	int events = 0;
+	
+	if (flags & POLLIN) events |= READABLE;
+	if (flags & POLLPRI) events |= PRIORITY;
+	if (flags & POLLOUT) events |= WRITABLE;
+	
+	return events;
+}
+
 VALUE Event_Backend_URing_io_wait(VALUE self, VALUE fiber, VALUE io, VALUE events) {
 	struct Event_Backend_URing *data = NULL;
 	TypedData_Get_Struct(self, struct Event_Backend_URing, &Event_Backend_URing_Type, data);
@@ -103,32 +128,21 @@ VALUE Event_Backend_URing_io_wait(VALUE self, VALUE fiber, VALUE io, VALUE event
 	int descriptor = NUM2INT(rb_funcall(io, id_fileno, 0));
 	struct io_uring_sqe *sqe = io_uring_get_sqe(data->ring);
 	
-	int mask = NUM2INT(events);
-	short flags = 0;
-	
-	if (mask & READABLE) {
-		flags |= POLL_IN;
-	}
-	
-	if (mask & PRIORITY) {
-		flags |= POLL_PRI;
-	}
+	short flags = poll_flags_from_events(NUM2INT(events));
 	
-	if (mask & WRITABLE) {
-		flags |= POLL_OUT;
-	}
-
 	// fprintf(stderr, "poll_add(%p, %d, %d)\n", sqe, descriptor, flags);
-
+	
 	io_uring_prep_poll_add(sqe, descriptor, flags);
 	io_uring_sqe_set_data(sqe, (void*)fiber);
 	io_uring_submit(data->ring);
 	
-	// fprintf(stderr, "count = %d, errno = %d\n", count, errno);
-
-	rb_funcall(data->loop, id_transfer, 0);
+	VALUE result = rb_funcall(data->loop, id_transfer, 0);
+	
+	// We explicitly filter the resulting events based on the requested events.
+	// In some cases, poll will report events we didn't ask for.
+	flags &= NUM2INT(result);
 	
-	return Qnil;
+	return INT2NUM(events_from_poll_flags(flags));
 }
 
 static
@@ -196,7 +210,9 @@ VALUE Event_Backend_URing_io_read(VALUE self, VALUE fiber, VALUE io, VALUE buffe
 	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(rb_funcall(data->loop, id_transfer, 0));
 
 	if (result < 0) {
@@ -227,6 +243,8 @@ VALUE Event_Backend_URing_io_write(VALUE self, VALUE fiber, VALUE io, VALUE buff
 	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);
+	
 	int result = NUM2INT(rb_funcall(data->loop, id_transfer, 0));
 
 	if (result < 0) {
@@ -242,33 +260,37 @@ VALUE Event_Backend_URing_select(VALUE self, VALUE duration) {
 	
 	struct io_uring_cqe *cqes[URING_MAX_EVENTS];
 	struct __kernel_timespec storage;
-
-	if (duration != Qnil) {
-		int result = io_uring_wait_cqe_timeout(data->ring, cqes, make_timeout(duration, &storage));
+	
+	int result = io_uring_peek_batch_cqe(data->ring, cqes, URING_MAX_EVENTS);
+	
+	// fprintf(stderr, "result = %d\n", result);
+	
+	if (result < 0) {
+		rb_syserr_fail(-result, strerror(-result));
+	} else if (result == 0) {
+		result = io_uring_wait_cqes(data->ring, cqes, 1, make_timeout(duration, &storage), NULL);
+		
+		// fprintf(stderr, "result (timeout) = %d\n", result);
 		
 		if (result == -ETIME) {
-			// Timeout.
+			result = 0;
 		} else if (result < 0) {
 			rb_syserr_fail(-result, strerror(-result));
 		}
 	}
 	
-	int count = io_uring_peek_batch_cqe(data->ring, cqes, URING_MAX_EVENTS);
-	
-	if (count == -1) {
-		rb_sys_fail("io_uring_peek_batch_cqe");
-	}
-	
-	for (int i = 0; i < count; i += 1) {
+	for (int i = 0; i < result; i += 1) {
 		VALUE fiber = (VALUE)io_uring_cqe_get_data(cqes[i]);
 		VALUE result = INT2NUM(cqes[i]->res);
-
+		
+		// fprintf(stderr, "cqes[i]->res = %d\n", cqes[i]->res);
+		
 		io_uring_cqe_seen(data->ring, cqes[i]);
 		
 		rb_funcall(fiber, id_transfer, 1, result);
 	}
 	
-	return INT2NUM(count);
+	return INT2NUM(result);
 }
 
 void Init_Event_Backend_URing(VALUE Event_Backend) {

data/lib/event/backend/select.rb

@@ -43,20 +43,20 @@ module Event
 			def select(duration = nil)
 				readable, writable, _ = IO.select(@readable.keys, @writable.keys, nil, duration)
 				
-				ready = {}
+				ready = Hash.new(0)
 				
 				readable&.each do |io|
 					fiber = @readable.delete(io)
-					ready[fiber] = true
+					ready[fiber] |= READABLE
 				end
 				
 				writable&.each do |io|
 					fiber = @writable.delete(io)
-					ready[fiber] = true
+					ready[fiber] |= WRITABLE
 				end
 				
-				ready.each_key do |fiber|
-					fiber.transfer
+				ready.each do |fiber, events|
+					fiber.transfer(events)
 				end
 			end
 		end

data/lib/event/version.rb

@@ -1,3 +1,3 @@
 module Event
-	VERSION = "0.1.2"
+	VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: event
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-26 00:00:00.000000000 Z
+date: 2021-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bake
@@ -73,6 +73,7 @@ extensions:
 - ext/event/extconf.rb
 extra_rdoc_files: []
 files:
+- ext/event/backend/backend.h
 - ext/event/backend/epoll.c
 - ext/event/backend/epoll.h
 - ext/event/backend/kqueue.c