io-event 1.20.1 → 1.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 437c1dff3aa9fadc428686be0ef1884f7d59114dc3b546e4df3e4223a718c41f
-  data.tar.gz: 2ced5f6b930077d5337b3cf5bca1acce1405c0b98915516df112c4066721f5f9
+  metadata.gz: 10e55b8652762ef313727e0fb2c6ce68ef3c8ecfa867642b6c2098a04007210e
+  data.tar.gz: ee38d8bfc2cad72ca635ddddcb1e9ff647f86c1961df88239b468e6eeae03102
 SHA512:
-  metadata.gz: 071dcdd32b6e400313ed4654558421c47fbc6b333f5b9907532ec55d16ea72784d6e1fc21bf6261b63b3f92240566107c24d677b8268f087e72ac84af2120f0e
-  data.tar.gz: 601d5696527cfe301042b944e029249562568957c922bdf0d0c91404d7512f08253e455d6c76b569f17dea5712c4f93b86e036788b8bced248f24f9edc5e7871
+  metadata.gz: f635f52c19266b13191c5572fb34e513f6665ff049434dbc1045dcce83a96ac3edf0418f727417a4dca41fbb4d9336e5deb737a76c996de4cac939937a278b7d
+  data.tar.gz: ca520970a7088c0d57d3d0a531cc916c009f290d7a5784f7e8f674802a14505785cb58c06491f89bd161dec871221ca71491f6a235015f467f6be862c9e99d3e

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

@@ -648,10 +648,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 +680,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 +694,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.0"
 	end
 end

metadata

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