io-event 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e419e583855ca1efed750b1ae61bc6fb7b4524cf30cec819a7461eecdb78d45
-  data.tar.gz: 7c64477599375b9612004acb9e725e7af260a51d404b071e209e866d734a083a
+  metadata.gz: 3362ef0fb1bd825601c2476c06e99d32aa911a4e66b189b1518f40b6246b1ab6
+  data.tar.gz: a41015ab836dd0e28656427001882a87ba26a424395babb81aecd0e6d07d5fdd
 SHA512:
-  metadata.gz: c9b63cafbb56b9eac0f01edd180a70a38de6465ff4624b07360df135d0eeeab984c5348b0981d9c41ce943248af2a554528914e0cb9ae4606737d4ece2b96a8b
-  data.tar.gz: 1fecec388e9a5c517c83dc233a107cd86121a7e88f3cf5275e0ac00dd7a43aa826ae616b815b556c73ec13e5fc108f9c7cbe1bca1215fb0eb8bfed9daadb048b
+  metadata.gz: e1563b616697985daed4bb585bfdeaec00f6dfbaa9f377e99b278a9070f5ee32b475136e0f8f7626e4238a0d623a0bdb745ef03a612ec0de4b7f2eb9ef2f4510
+  data.tar.gz: d061bea14bd722ae77eddc68e81d0c4138a5de1b1b12e6fce22a45bc62391c7bf3d9dd25cf0f876361309b04d9e480a06c9752128103c999a504d01e6ffb78d3

data/ext/io/event/selector/epoll.c

@@ -446,6 +446,7 @@ struct process_wait_arguments {
 	struct IO_Event_Selector_EPoll *selector;
 	struct IO_Event_Selector_EPoll_Waiting *waiting;
 	int pid;
+	int flags;
 	int descriptor;
 };
 
@@ -456,7 +457,7 @@ VALUE process_wait_transfer(VALUE _arguments) {
 	IO_Event_Selector_fiber_transfer(arguments->selector->backend.loop, 0, NULL);
 	
 	if (arguments->waiting->ready) {
-		return IO_Event_Selector_process_status_wait(arguments->pid);
+		return IO_Event_Selector_process_status_wait(arguments->pid, arguments->flags);
 	} else {
 		return Qfalse;
 	}
@@ -480,7 +481,7 @@ VALUE IO_Event_Selector_EPoll_process_wait(VALUE self, VALUE fiber, VALUE _pid,
 	TypedData_Get_Struct(self, struct IO_Event_Selector_EPoll, &IO_Event_Selector_EPoll_Type, selector);
 	
 	pid_t pid = NUM2PIDT(_pid);
-	// int flags = NUM2INT(_flags);
+	int flags = NUM2INT(_flags);
 	
 	int descriptor = pidfd_open(pid, 0);
 	
@@ -506,6 +507,7 @@ VALUE IO_Event_Selector_EPoll_process_wait(VALUE self, VALUE fiber, VALUE _pid,
 	struct process_wait_arguments process_wait_arguments = {
 		.selector = selector,
 		.pid = pid,
+		.flags = flags,
 		.descriptor = descriptor,
 		.waiting = &waiting,
 	};
@@ -802,9 +804,11 @@ struct select_arguments {
 	
 	int count;
 	struct epoll_event events[EPOLL_MAX_EVENTS];
-
+	
 	struct timespec * timeout;
 	struct timespec storage;
+	
+	struct IO_Event_List saved;
 };
 
 static int make_timeout_ms(struct timespec * timeout) {
@@ -881,7 +885,7 @@ void select_internal_with_gvl(struct select_arguments *arguments) {
 }
 
 static
-int IO_Event_Selector_EPoll_handle(struct IO_Event_Selector_EPoll *selector, const struct epoll_event *event)
+int IO_Event_Selector_EPoll_handle(struct IO_Event_Selector_EPoll *selector, const struct epoll_event *event, struct IO_Event_List *saved)
 {
 	int descriptor = event->data.fd;
 	
@@ -891,29 +895,32 @@ int IO_Event_Selector_EPoll_handle(struct IO_Event_Selector_EPoll *selector, con
 	struct IO_Event_Selector_EPoll_Descriptor *epoll_descriptor = IO_Event_Selector_EPoll_Descriptor_lookup(selector, descriptor);
 	struct IO_Event_List *list = &epoll_descriptor->list;
 	struct IO_Event_List *node = list->tail;
-	struct IO_Event_List saved = {NULL, NULL};
 	
 	// Reset the events back to 0 so that we can re-arm if necessary:
 	epoll_descriptor->waiting_events = 0;
 	
+	if (DEBUG) fprintf(stderr, "IO_Event_Selector_EPoll_handle: descriptor=%d, ready_events=%d epoll_descriptor=%p\n", descriptor, ready_events, epoll_descriptor);
+	
 	// It's possible (but unlikely) that the address of list will changing during iteration.
 	while (node != list) {
+		if (DEBUG) fprintf(stderr, "IO_Event_Selector_EPoll_handle: node=%p list=%p type=%p\n", node, list, node->type);
+		
 		struct IO_Event_Selector_EPoll_Waiting *waiting = (struct IO_Event_Selector_EPoll_Waiting *)node;
 		
 		// Compute the intersection of the events we are waiting for and the events that occured:
 		enum IO_Event matching_events = waiting->events & ready_events;
 		
-		if (DEBUG) fprintf(stderr, "IO_Event_Selector_EPoll_handle: descriptor=%d, ready_events=%d, matching_events=%d\n", descriptor, ready_events, matching_events);
+		if (DEBUG) fprintf(stderr, "IO_Event_Selector_EPoll_handle: descriptor=%d, ready_events=%d, waiting_events=%d, matching_events=%d\n", descriptor, ready_events, waiting->events, matching_events);
 		
 		if (matching_events) {
-			IO_Event_List_append(node, &saved);
+			IO_Event_List_append(node, saved);
 			
 			// Resume the fiber:
 			waiting->ready = matching_events;
 			IO_Event_Selector_fiber_transfer(waiting->fiber, 0, NULL);
 			
-			node = saved.tail;
-			IO_Event_List_pop(&saved);
+			node = saved->tail;
+			IO_Event_List_pop(saved);
 		} else {
 			// We are still waiting for the events:
 			epoll_descriptor->waiting_events |= waiting->events;
@@ -924,6 +931,36 @@ int IO_Event_Selector_EPoll_handle(struct IO_Event_Selector_EPoll *selector, con
 	return IO_Event_Selector_EPoll_Descriptor_update(selector, epoll_descriptor->io, descriptor, epoll_descriptor);
 }
 
+static
+VALUE select_handle_events(VALUE _arguments)
+{
+	struct select_arguments *arguments = (struct select_arguments *)_arguments;
+	struct IO_Event_Selector_EPoll *selector = arguments->selector;
+	
+	for (int i = 0; i < arguments->count; i += 1) {
+		const struct epoll_event *event = &arguments->events[i];
+		if (DEBUG) fprintf(stderr, "-> fd=%d events=%d\n", event->data.fd, event->events);
+		
+		if (event->data.fd >= 0) {
+			IO_Event_Selector_EPoll_handle(selector, event, &arguments->saved);
+		} else {
+			IO_Event_Interrupt_clear(&selector->interrupt);
+		}
+	}
+	
+	return INT2NUM(arguments->count);
+}
+
+static
+VALUE select_handle_events_ensure(VALUE _arguments)
+{
+	struct select_arguments *arguments = (struct select_arguments *)_arguments;
+	
+	IO_Event_List_free(&arguments->saved);
+	
+	return Qnil;
+}
+
 // TODO This function is not re-entrant and we should document and assert as such.
 VALUE IO_Event_Selector_EPoll_select(VALUE self, VALUE duration) {
 	struct IO_Event_Selector_EPoll *selector = NULL;
@@ -937,6 +974,7 @@ VALUE IO_Event_Selector_EPoll_select(VALUE self, VALUE duration) {
 			.tv_sec = 0,
 			.tv_nsec = 0
 		},
+		.saved = {},
 	};
 
 	arguments.timeout = &arguments.storage;
@@ -958,18 +996,11 @@ VALUE IO_Event_Selector_EPoll_select(VALUE self, VALUE duration) {
 		}
 	}
 	
-	for (int i = 0; i < arguments.count; i += 1) {
-		const struct epoll_event *event = &arguments.events[i];
-		if (DEBUG) fprintf(stderr, "-> ptr=%p events=%d\n", event->data.ptr, event->events);
-		
-		if (event->data.fd >= 0) {
-			IO_Event_Selector_EPoll_handle(selector, event);
-		} else {
-			IO_Event_Interrupt_clear(&selector->interrupt);
-		}
+	if (arguments.count) {
+		return rb_ensure(select_handle_events, (VALUE)&arguments, select_handle_events_ensure, (VALUE)&arguments);
+	} else {
+		return RB_INT2NUM(0);
 	}
-	
-	return INT2NUM(arguments.count);
 }
 
 VALUE IO_Event_Selector_EPoll_wakeup(VALUE self) {

data/ext/io/event/selector/kqueue.c

@@ -433,6 +433,7 @@ struct process_wait_arguments {
 	struct IO_Event_Selector_KQueue *selector;
 	struct IO_Event_Selector_KQueue_Waiting *waiting;
 	pid_t pid;
+	int flags;
 };
 
 static
@@ -461,7 +462,7 @@ VALUE process_wait_transfer(VALUE _arguments) {
 	
 	if (arguments->waiting->ready) {
 		process_prewait(arguments->pid);
-		return IO_Event_Selector_process_status_wait(arguments->pid);
+		return IO_Event_Selector_process_status_wait(arguments->pid, arguments->flags);
 	} else {
 		return Qfalse;
 	}
@@ -483,6 +484,7 @@ VALUE IO_Event_Selector_KQueue_process_wait(VALUE self, VALUE fiber, VALUE _pid,
 	TypedData_Get_Struct(self, struct IO_Event_Selector_KQueue, &IO_Event_Selector_KQueue_Type, selector);
 	
 	pid_t pid = NUM2PIDT(_pid);
+	int flags = NUM2INT(_flags);
 	
 	struct IO_Event_Selector_KQueue_Waiting waiting = {
 		.list = {.type = &IO_Event_Selector_KQueue_process_wait_list_type},
@@ -494,6 +496,7 @@ VALUE IO_Event_Selector_KQueue_process_wait(VALUE self, VALUE fiber, VALUE _pid,
 		.selector = selector,
 		.waiting = &waiting,
 		.pid = pid,
+		.flags = flags,
 	};
 	
 	int result = IO_Event_Selector_KQueue_Waiting_register(selector, pid, &waiting);
@@ -502,7 +505,7 @@ VALUE IO_Event_Selector_KQueue_process_wait(VALUE self, VALUE fiber, VALUE _pid,
 		if (errno == ESRCH) {
 			process_prewait(pid);
 			
-			return IO_Event_Selector_process_status_wait(pid);
+			return IO_Event_Selector_process_status_wait(pid, flags);
 		}
 		
 		rb_sys_fail("IO_Event_Selector_KQueue_process_wait:IO_Event_Selector_KQueue_Waiting_register");
@@ -818,6 +821,8 @@ struct select_arguments {
 	
 	struct timespec storage;
 	struct timespec *timeout;
+	
+	struct IO_Event_List saved;
 };
 
 static
@@ -859,7 +864,7 @@ void select_internal_with_gvl(struct select_arguments *arguments) {
 }
 
 static
-int IO_Event_Selector_KQueue_handle(struct IO_Event_Selector_KQueue *selector, uintptr_t identifier, struct IO_Event_Selector_KQueue_Descriptor *kqueue_descriptor)
+int IO_Event_Selector_KQueue_handle(struct IO_Event_Selector_KQueue *selector, uintptr_t identifier, struct IO_Event_Selector_KQueue_Descriptor *kqueue_descriptor, struct IO_Event_List *saved)
 {
 	// This is the mask of all events that occured for the given descriptor:
 	enum IO_Event ready_events = kqueue_descriptor->ready_events;
@@ -874,7 +879,6 @@ int IO_Event_Selector_KQueue_handle(struct IO_Event_Selector_KQueue *selector, u
 	
 	struct IO_Event_List *list = &kqueue_descriptor->list;
 	struct IO_Event_List *node = list->tail;
-	struct IO_Event_List saved = {NULL, NULL};
 	
 	// Reset the events back to 0 so that we can re-arm if necessary:
 	kqueue_descriptor->waiting_events = 0;
@@ -888,13 +892,13 @@ int IO_Event_Selector_KQueue_handle(struct IO_Event_Selector_KQueue *selector, u
 		if (DEBUG) fprintf(stderr, "IO_Event_Selector_KQueue_handle: identifier=%lu, ready_events=%d, matching_events=%d\n", identifier, ready_events, matching_events);
 		
 		if (matching_events) {
-			IO_Event_List_append(node, &saved);
+			IO_Event_List_append(node, saved);
 			
 			waiting->ready = matching_events;
 			IO_Event_Selector_fiber_transfer(waiting->fiber, 0, NULL);
 			
-			node = saved.tail;
-			IO_Event_List_pop(&saved);
+			node = saved->tail;
+			IO_Event_List_pop(saved);
 		} else {
 			kqueue_descriptor->waiting_events |= waiting->events;
 			node = node->tail;
@@ -904,6 +908,43 @@ int IO_Event_Selector_KQueue_handle(struct IO_Event_Selector_KQueue *selector, u
 	return IO_Event_Selector_KQueue_Descriptor_update(selector, identifier, kqueue_descriptor);
 }
 
+static
+VALUE select_handle_events(VALUE _arguments)
+{
+	struct select_arguments *arguments = (struct select_arguments *)_arguments;
+	struct IO_Event_Selector_KQueue *selector = arguments->selector;
+	
+	for (int i = 0; i < arguments->count; i += 1) {
+		if (arguments->events[i].udata) {
+			struct IO_Event_Selector_KQueue_Descriptor *kqueue_descriptor = arguments->events[i].udata;
+			kqueue_descriptor->ready_events |= events_from_kevent_filter(arguments->events[i].filter);
+		}
+	}
+	
+	for (int i = 0; i < arguments->count; i += 1) {
+		if (arguments->events[i].udata) {
+			struct IO_Event_Selector_KQueue_Descriptor *kqueue_descriptor = arguments->events[i].udata;
+			IO_Event_Selector_KQueue_handle(selector, arguments->events[i].ident, kqueue_descriptor, &arguments->saved);
+		} else {
+#ifdef IO_EVENT_SELECTOR_KQUEUE_USE_INTERRUPT
+			IO_Event_Interrupt_clear(&selector->interrupt);
+#endif
+		}
+	}
+	
+	return RB_INT2NUM(arguments->count);
+}
+
+static
+VALUE select_handle_events_ensure(VALUE _arguments)
+{
+	struct select_arguments *arguments = (struct select_arguments *)_arguments;
+	
+	IO_Event_List_free(&arguments->saved);
+	
+	return Qnil;
+}
+
 VALUE IO_Event_Selector_KQueue_select(VALUE self, VALUE duration) {
 	struct IO_Event_Selector_KQueue *selector = NULL;
 	TypedData_Get_Struct(self, struct IO_Event_Selector_KQueue, &IO_Event_Selector_KQueue_Type, selector);
@@ -916,7 +957,8 @@ VALUE IO_Event_Selector_KQueue_select(VALUE self, VALUE duration) {
 		.storage = {
 			.tv_sec = 0,
 			.tv_nsec = 0
-		}
+		},
+		.saved = {},
 	};
 	
 	arguments.timeout = &arguments.storage;
@@ -948,25 +990,11 @@ VALUE IO_Event_Selector_KQueue_select(VALUE self, VALUE duration) {
 		}
 	}
 	
-	for (int i = 0; i < arguments.count; i += 1) {
-		if (arguments.events[i].udata) {
-			struct IO_Event_Selector_KQueue_Descriptor *kqueue_descriptor = arguments.events[i].udata;
-			kqueue_descriptor->ready_events |= events_from_kevent_filter(arguments.events[i].filter);
-		}
-	}
-	
-	for (int i = 0; i < arguments.count; i += 1) {
-		if (arguments.events[i].udata) {
-			struct IO_Event_Selector_KQueue_Descriptor *kqueue_descriptor = arguments.events[i].udata;
-			IO_Event_Selector_KQueue_handle(selector, arguments.events[i].ident, kqueue_descriptor);
-		} else {
-#ifdef IO_EVENT_SELECTOR_KQUEUE_USE_INTERRUPT
-			IO_Event_Interrupt_clear(&selector->interrupt);
-#endif
-		}
+	if (arguments.count) {
+		return rb_ensure(select_handle_events, (VALUE)&arguments, select_handle_events_ensure, (VALUE)&arguments);
+	} else {
+		return RB_INT2NUM(0);
 	}
-	
-	return RB_INT2NUM(arguments.count);
 }
 
 VALUE IO_Event_Selector_KQueue_wakeup(VALUE self) {

data/ext/io/event/selector/list.h

@@ -21,6 +21,7 @@ inline static void IO_Event_List_initialize(struct IO_Event_List *list)
 inline static void IO_Event_List_clear(struct IO_Event_List *list)
 {
 	list->head = list->tail = NULL;
+	list->type = 0;
 }
 
 // Append an item to the end of the list.
@@ -64,7 +65,7 @@ inline static void IO_Event_List_pop(struct IO_Event_List *node)
 
 inline static void IO_Event_List_free(struct IO_Event_List *node)
 {
-	if (node->head != node->tail) {
+	if (node->head && node->tail) {
 		IO_Event_List_pop(node);
 	}
 }

data/ext/io/event/selector/selector.c

@@ -25,10 +25,6 @@ static const int DEBUG = 0;
 
 static ID id_transfer, id_alive_p;
 
-#ifndef HAVE_RB_PROCESS_STATUS_WAIT
-static VALUE process_wnohang;
-#endif
-
 VALUE IO_Event_Selector_fiber_transfer(VALUE fiber, int argc, VALUE *argv) {
 	// TODO Consider introducing something like `rb_fiber_scheduler_transfer(...)`.
 #ifdef HAVE__RB_FIBER_TRANSFER
@@ -76,9 +72,9 @@ int IO_Event_Selector_io_descriptor(VALUE io) {
 static ID id_wait;
 static VALUE rb_Process_Status = Qnil;
 
-VALUE IO_Event_Selector_process_status_wait(rb_pid_t pid)
+VALUE IO_Event_Selector_process_status_wait(rb_pid_t pid, int flags)
 {
-	return rb_funcall(rb_Process_Status, id_wait, 2, PIDT2NUM(pid), process_wnohang);
+	return rb_funcall(rb_Process_Status, id_wait, 2, PIDT2NUM(pid), INT2NUM(flags | WNOHANG));
 }
 #endif
 
@@ -157,7 +153,6 @@ void Init_IO_Event_Selector(VALUE IO_Event_Selector) {
 	
 #ifndef HAVE_RB_PROCESS_STATUS_WAIT
 	id_wait = rb_intern("wait");
-	process_wnohang = rb_const_get(rb_mProcess, rb_intern("WNOHANG"));
 	rb_Process_Status = rb_const_get_at(rb_mProcess, rb_intern("Status"));
 	rb_gc_register_mark_object(rb_Process_Status);
 #endif

data/ext/io/event/selector/selector.h

@@ -66,10 +66,11 @@ VALUE IO_Event_Selector_fiber_raise(VALUE fiber, int argc, VALUE *argv);
 int IO_Event_Selector_io_descriptor(VALUE io);
 #endif
 
+// Reap a process without hanging.
 #ifdef HAVE_RB_PROCESS_STATUS_WAIT
-#define IO_Event_Selector_process_status_wait(pid) rb_process_status_wait(pid)
+#define IO_Event_Selector_process_status_wait(pid, flags) rb_process_status_wait(pid, flags | WNOHANG)
 #else
-VALUE IO_Event_Selector_process_status_wait(rb_pid_t pid);
+VALUE IO_Event_Selector_process_status_wait(rb_pid_t pid, int flags);
 #endif
 
 int IO_Event_Selector_nonblock_set(int file_descriptor);

data/ext/io/event/selector/uring.c

@@ -428,6 +428,7 @@ struct process_wait_arguments {
 	struct IO_Event_Selector_URing_Waiting *waiting;
 	
 	pid_t pid;
+	int flags;
 	int descriptor;
 };
 
@@ -438,7 +439,7 @@ VALUE process_wait_transfer(VALUE _arguments) {
 	IO_Event_Selector_fiber_transfer(arguments->selector->backend.loop, 0, NULL);
 	
 	if (arguments->waiting->result) {
-		return IO_Event_Selector_process_status_wait(arguments->pid);
+		return IO_Event_Selector_process_status_wait(arguments->pid, arguments->flags);
 	} else {
 		return Qfalse;
 	}
@@ -460,6 +461,7 @@ VALUE IO_Event_Selector_URing_process_wait(VALUE self, VALUE fiber, VALUE _pid,
 	TypedData_Get_Struct(self, struct IO_Event_Selector_URing, &IO_Event_Selector_URing_Type, selector);
 	
 	pid_t pid = NUM2PIDT(_pid);
+	int flags = NUM2INT(_flags);
 	
 	int descriptor = pidfd_open(pid, 0);
 	if (descriptor < 0) {
@@ -477,6 +479,7 @@ VALUE IO_Event_Selector_URing_process_wait(VALUE self, VALUE fiber, VALUE _pid,
 		.selector = selector,
 		.waiting = &waiting,
 		.pid = pid,
+		.flags = flags,
 		.descriptor = descriptor,
 	};
 	

data/lib/io/event/selector/select.rb

@@ -280,7 +280,9 @@ module IO::Event
 			elsif Support.fiber_scheduler_v1?
 				# Ruby <= 3.1, limited IO::Buffer support.
 				def io_read(fiber, _io, buffer, length, offset = 0)
+					# We need to avoid any internal buffering, so we use a duplicated IO object:
 					io = IO.for_fd(_io.fileno, autoclose: false)
+					
 					total = 0
 					
 					maximum_size = buffer.size - offset
@@ -321,7 +323,9 @@ module IO::Event
 				end
 				
 				def io_write(fiber, _io, buffer, length, offset = 0)
+					# We need to avoid any internal buffering, so we use a duplicated IO object:
 					io = IO.for_fd(_io.fileno, autoclose: false)
+					
 					total = 0
 					
 					maximum_size = buffer.size - offset

data/lib/io/event/version.rb

@@ -5,6 +5,6 @@
 
 class IO
 	module Event
-		VERSION = "1.3.2"
+		VERSION = "1.3.3"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: io-event
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Samuel Williams
@@ -42,7 +42,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2023-08-24 00:00:00.000000000 Z
+date: 2023-10-24 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.0.dev
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: An event loop.