io-event 1.20.1 → 1.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 437c1dff3aa9fadc428686be0ef1884f7d59114dc3b546e4df3e4223a718c41f
-  data.tar.gz: 2ced5f6b930077d5337b3cf5bca1acce1405c0b98915516df112c4066721f5f9
+  metadata.gz: 634a83d174720978fa28231fa599a3f9ac4b27bc727b4fd934a3999ccd3b0df0
+  data.tar.gz: 0f34bf53b9103e3dc55f545c479c8850ca0b22425caba6029d3c7dbb93b3b322
 SHA512:
-  metadata.gz: 071dcdd32b6e400313ed4654558421c47fbc6b333f5b9907532ec55d16ea72784d6e1fc21bf6261b63b3f92240566107c24d677b8268f087e72ac84af2120f0e
-  data.tar.gz: 601d5696527cfe301042b944e029249562568957c922bdf0d0c91404d7512f08253e455d6c76b569f17dea5712c4f93b86e036788b8bced248f24f9edc5e7871
+  metadata.gz: bcce50b95a8f978df63deb0e41bda0e9ea4911ea2ba7a1074628fbce6d6b59d314008ec0ca2cc165a067f020f079bb6940df822732a31f92fab96187cc3bffdd
+  data.tar.gz: f77dd827a584493fe156cc0f61b07bfa1b3081a514cf591bb156228c6b23b7d54bb1f15c2bb73e9b3a65bd4be6eb13d508a933fdf1a78e2ff314e59b8a79e370

data/ext/io/event/list.h

@@ -90,7 +90,7 @@ inline static size_t IO_Event_List_memory_size(const struct IO_Event_List *list)
 // Return true if the list is empty.
 inline static int IO_Event_List_empty(const struct IO_Event_List *list)
 {
-	return list->head == list->tail;
+	return list->head == list;
 }
 
 // Enumerate all items in the list, assuming the list will not be modified during iteration.

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

@@ -81,6 +81,7 @@ struct IO_Event_Selector_URing_Completion
 	struct IO_Event_List list;
 	
 	struct IO_Event_Selector_URing_Waiting *waiting;
+	bool operation_pending;
 	bool cancellation_pending;
 };
 
@@ -207,10 +208,12 @@ struct IO_Event_Selector_URing_Completion * IO_Event_Selector_URing_Completion_a
 	if (DEBUG_COMPLETION) fprintf(stderr, "IO_Event_Selector_URing_Completion_acquire(%p, limit=%ld)\n", (void*)completion, selector->completions.limit);
 	
 	assert(completion->waiting == NULL);
+	assert(!completion->operation_pending);
 	assert(!completion->cancellation_pending);
 	
 	waiting->completion = completion;
 	completion->waiting = waiting;
+	completion->operation_pending = true;
 	
 	return completion;
 }
@@ -230,6 +233,7 @@ inline static
 void IO_Event_Selector_URing_Completion_recycle(struct IO_Event_Selector_URing *selector, struct IO_Event_Selector_URing_Completion *completion)
 {
 	assert(completion->waiting == NULL);
+	assert(!completion->operation_pending);
 	assert(!completion->cancellation_pending);
 	
 	IO_Event_List_prepend(&selector->free_list, &completion->list);
@@ -240,6 +244,9 @@ void IO_Event_Selector_URing_Completion_complete(struct IO_Event_Selector_URing
 {
 	if (DEBUG_COMPLETION) fprintf(stderr, "IO_Event_Selector_URing_Completion_complete(%p)\n", (void*)completion);
 	
+	assert(completion->operation_pending);
+	completion->operation_pending = false;
+	
 	IO_Event_Selector_URing_Completion_cancel(completion);
 	
 	// A cancellation SQE still refers to this completion record. Keep it out of
@@ -257,7 +264,7 @@ void IO_Event_Selector_URing_Completion_cancellation_complete(struct IO_Event_Se
 	assert(completion->cancellation_pending);
 	completion->cancellation_pending = false;
 	
-	if (completion->waiting == NULL) {
+	if (!completion->operation_pending) {
 		IO_Event_Selector_URing_Completion_recycle(selector, completion);
 	}
 }
@@ -283,6 +290,7 @@ void IO_Event_Selector_URing_Completion_initialize(void *element)
 	IO_Event_List_initialize(&completion->list);
 	completion->list.type = &IO_Event_Selector_URing_Completion_Type;
 	completion->waiting = NULL;
+	completion->operation_pending = false;
 	completion->cancellation_pending = false;
 }
 
@@ -563,9 +571,20 @@ void IO_Event_Selector_URing_Completion_cancel_async(struct IO_Event_Selector_UR
 	io_uring_submit_pending(selector);
 }
 
+static
+VALUE IO_Event_Selector_URing_Waiting_wait_yield(VALUE _selector)
+{
+	struct IO_Event_Selector_URing *selector = (struct IO_Event_Selector_URing *)_selector;
+	
+	return IO_Event_Selector_loop_yield(&selector->backend);
+}
+
 static
 void IO_Event_Selector_URing_Waiting_cancel_and_wait(struct IO_Event_Selector_URing *selector, struct IO_Event_Selector_URing_Waiting *waiting)
 {
+	int state = 0;
+	VALUE error = Qnil;
+	
 	if (waiting->completion) {
 		IO_Event_Selector_URing_Completion_cancel_async(selector, waiting->completion);
 		
@@ -573,11 +592,24 @@ void IO_Event_Selector_URing_Waiting_cancel_and_wait(struct IO_Event_Selector_UR
 		// Keep the C frame, buffer lock and completion record alive until the
 		// original operation CQE confirms that it can no longer access memory.
 		while (waiting->completion) {
-			IO_Event_Selector_loop_yield(&selector->backend);
+			int current_state = 0;
+			rb_protect(IO_Event_Selector_URing_Waiting_wait_yield, (VALUE)selector, &current_state);
+			
+			if (current_state && !state) {
+				state = current_state;
+				error = rb_errinfo();
+			}
+			
+			rb_set_errinfo(Qnil);
 		}
 	}
 	
 	IO_Event_Selector_URing_Waiting_cancel(waiting);
+	
+	if (state) {
+		rb_set_errinfo(error);
+		rb_jump_tag(state);
+	}
 }
 
 #pragma mark - Process.wait
@@ -648,10 +680,18 @@ static
 VALUE process_wait_transfer(VALUE _arguments) {
 	struct process_wait_arguments *arguments = (struct process_wait_arguments *)_arguments;
 	
+#ifdef IO_EVENT_SELECTOR_URING_USE_WAITID
 	IO_Event_Selector_loop_yield(&arguments->selector->backend);
 	
-#ifdef IO_EVENT_SELECTOR_URING_USE_WAITID
+	if (arguments->waiting->completion) {
+		// The kernel may still write to siginfo or reap the child. Keep the C frame alive until the original operation completes, then distinguish cancellation from process completion:
+		IO_Event_Selector_URing_Waiting_cancel_and_wait(arguments->selector, arguments->waiting);
+	}
+	
 	int32_t result = arguments->waiting->result;
+	if (result == -ECANCELED) {
+		return Qfalse;
+	}
 	
 	if (DEBUG) fprintf(stderr, "waitid result=%d pid=%d code=%d status=%d\n", result, arguments->siginfo.si_pid, arguments->siginfo.si_code, arguments->siginfo.si_status);
 	
@@ -672,6 +712,8 @@ VALUE process_wait_transfer(VALUE _arguments) {
 	return IO_Event_Selector_process_status_reap(arguments->siginfo.si_pid, arguments->flags);
 #endif
 #else
+	IO_Event_Selector_loop_yield(&arguments->selector->backend);
+	
 	if (arguments->waiting->result) {
 		return IO_Event_Selector_process_status_reap(arguments->pid, arguments->flags);
 	} else {
@@ -684,15 +726,17 @@ static
 VALUE process_wait_ensure(VALUE _arguments) {
 	struct process_wait_arguments *arguments = (struct process_wait_arguments *)_arguments;
 	
+#ifdef IO_EVENT_SELECTOR_URING_USE_WAITID
+	// `waitid` may write to stack-backed siginfo while cancellation is pending:
+	IO_Event_Selector_URing_Waiting_cancel_and_wait(arguments->selector, arguments->waiting);
+#else
 	if (arguments->waiting->completion) {
 		IO_Event_Selector_URing_Completion_cancel_async(arguments->selector, arguments->waiting->completion);
 	}
 	
-#ifndef IO_EVENT_SELECTOR_URING_USE_WAITID
 	close(arguments->descriptor);
-#endif
-	
 	IO_Event_Selector_URing_Waiting_cancel(arguments->waiting);
+#endif
 	
 	return Qnil;
 }

data/lib/io/event/version.rb

@@ -7,6 +7,6 @@
 class IO
 	# @namespace
 	module Event
-		VERSION = "1.20.1"
+		VERSION = "1.21.1"
 	end
 end

data/readme.md

@@ -18,6 +18,11 @@ Please see the [project documentation](https://socketry.github.io/io-event/) for
 
 Please see the [project releases](https://socketry.github.io/io-event/releases/index) for all releases.
 
+### v1.21.1
+
+  - Fix the `URing` completion free-list empty check so its sole entry can be reused instead of unnecessarily allocating a new completion.
+  - Keep cancelled `URing` completion records allocated until both the operation and cancellation completions have been processed.
+
 ### v1.20.0
 
   - Add compatibility with Ruby 4.1's fiber scheduler interface version 4. Buffered IO operations now use `(offset, length)`, perform a single transfer of at most `length` bytes, return short transfers directly, and report `-EAGAIN` without waiting. Earlier Ruby versions retain the existing minimum-progress behavior.
@@ -55,10 +60,6 @@ Please see the [project releases](https://socketry.github.io/io-event/releases/i
 
   - Report inherited selector objects as closed after fork, and avoid closing descriptors they no longer own.
 
-### v1.16.4
-
-  - Correctly implement `Interrupt#signal` so that it is robust enough to be called by `Scheduler#unblock`.
-
 ## Contributing
 
 We welcome contributions to this project.

data/releases.md

@@ -1,5 +1,10 @@
 # Releases
 
+## v1.21.1
+
+  - Fix the `URing` completion free-list empty check so its sole entry can be reused instead of unnecessarily allocating a new completion.
+  - Keep cancelled `URing` completion records allocated until both the operation and cancellation completions have been processed.
+
 ## v1.20.0
 
   - Add compatibility with Ruby 4.1's fiber scheduler interface version 4. Buffered IO operations now use `(offset, length)`, perform a single transfer of at most `length` bytes, return short transfers directly, and report `-EAGAIN` without waiting. Earlier Ruby versions retain the existing minimum-progress behavior.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: io-event
 version: !ruby/object:Gem::Version
-  version: 1.20.1
+  version: 1.21.1
 platform: ruby
 authors:
 - Samuel Williams