io-event 1.14.2 → 1.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0deb2b3991062957f5767ac97e9abf7fe72b20e2264d08fd81293c407f92024f
-  data.tar.gz: 93b9e08ea55f39b5b983b8627b91720047154a2f778d86fea620da54d5e3173c
+  metadata.gz: 153dd5fa3b8e1b61e31f0304ac5b0c3dd274a877899b7569d092865219cd18e8
+  data.tar.gz: 5eae7ea5c192e2df1e3c02738dc76a6c3072ad0265eee78b26ee74a17ce43697
 SHA512:
-  metadata.gz: 2e58ec44e475bad561ddd53797a1552037fc92a4602dd89f6af92148130d4486d7dca47b6ae09bf11373be7e393a1baea835ae29e3ea388da4d4189b1d87be47
-  data.tar.gz: 9040993cc15180b65f142a28529d6672dceb88de0ae887ca9f1815bf0e11d4fe7929a3295ec50110b6c7faab83728cf36bf5c51d564b377eca4af40b756e9140
+  metadata.gz: 9b85b8d27de9d9319fcba699b6c939670a898210170f842ff7381a8f0446d04c1ca7da3f994265ce77cd2631ee621cbcb6943d39eb386045a169675d87a7d8f3
+  data.tar.gz: 3b4482cbe17cef909e01fb1701b30320f46497c97a3a7c77fe1c11da33cfd4eb20353dcc68476b25c147f410e217b42a45c9a1c0ee14e8dca1f54ceaf0051619

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

@@ -728,7 +728,7 @@ VALUE io_write_loop(VALUE _arguments) {
 			break;
 		} else if (length > 0 && IO_Event_try_again(errno)) {
 			if (DEBUG_IO_WRITE) fprintf(stderr, "IO_Event_Selector_KQueue_io_wait(fd=%d, length=%zu)\n", arguments->descriptor, length);
-			IO_Event_Selector_KQueue_io_wait(arguments->self, arguments->fiber, arguments->io, RB_INT2NUM(IO_EVENT_READABLE));
+			IO_Event_Selector_KQueue_io_wait(arguments->self, arguments->fiber, arguments->io, RB_INT2NUM(IO_EVENT_WRITABLE));
 		} else {
 			if (DEBUG_IO_WRITE) fprintf(stderr, "io_write_loop(fd=%d, length=%zu) -> errno=%d\n", arguments->descriptor, length, errno);
 			return rb_fiber_scheduler_io_result(-1, errno);
@@ -737,7 +737,7 @@ VALUE io_write_loop(VALUE _arguments) {
 		maximum_size = size - offset;
 	}
 	
-	if (DEBUG_IO_READ) fprintf(stderr, "io_write_loop(fd=%d, length=%zu) -> %zu\n", arguments->descriptor, length, offset);
+	if (DEBUG_IO_WRITE) fprintf(stderr, "io_write_loop(fd=%d, length=%zu) -> %zu\n", arguments->descriptor, length, offset);
 	return rb_fiber_scheduler_io_result(total, 0);
 };
 

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

@@ -29,7 +29,7 @@ VALUE IO_Event_Selector_process_status_wait(rb_pid_t pid, int flags)
 int IO_Event_Selector_nonblock_set(int file_descriptor)
 {
 #ifdef _WIN32
-	rb_w32_set_nonblock(file_descriptor);
+	return rb_w32_set_nonblock(file_descriptor);
 #else
 	// Get the current mode:
 	int flags = fcntl(file_descriptor, F_GETFL, 0);

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

@@ -988,6 +988,10 @@ VALUE IO_Event_Selector_URing_io_close(VALUE self, VALUE io) {
 		io_uring_prep_close(sqe, descriptor);
 		io_uring_sqe_set_data(sqe, NULL);
 		io_uring_submit_now(selector);
+		
+		// It would be nice to explore not flushing immediately, but instead deferring to the next select cycle.
+		// The problem with this approach is that if the user expects the file descriptor to be closed immediately, (e.g. before fork), it may not be closed in time.
+		// io_uring_submit_pending(selector);
 	} else {
 		close(descriptor);
 	}
@@ -1101,13 +1105,19 @@ unsigned select_process_completions(struct IO_Event_Selector_URing *selector) {
 		}
 		
 		io_uring_cq_advance(ring, 1);
-		// This marks the waiting operation as "complete":
-		IO_Event_Selector_URing_Completion_release(selector, completion);
 		
+		VALUE fiber = 0;
 		if (waiting && waiting->fiber) {
 			assert(waiting->result != -ECANCELED);
 			
-			IO_Event_Selector_loop_resume(&selector->backend, waiting->fiber, 0, NULL);
+			fiber = waiting->fiber;
+		}
+
+		// This marks the waiting operation as "complete":
+		IO_Event_Selector_URing_Completion_release(selector, completion);
+		
+		if (fiber) {
+			IO_Event_Selector_loop_resume(&selector->backend, fiber, 0, NULL);
 		}
 	}
 	

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

@@ -128,6 +128,12 @@ module IO::Event
 				@selector.ready?
 			end
 			
+			# Run the given blocking operation and wait for its completion.
+			def blocking_operation_wait(operation)
+				log("Waiting for blocking operation #{operation.inspect}")
+				@selector.blocking_operation_wait(operation)
+			end
+			
 			# Wait for the given process, forwarded to the underlying selector.
 			def process_wait(*arguments)
 				log("Waiting for process with #{arguments.inspect}")

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

@@ -230,7 +230,7 @@ module IO::Event
 							
 							if result < 0
 								if length > 0 and again?(result)
-									self.io_wait(fiber, io, IO::READABLE)
+									self.io_wait(fiber, io, IO::WRITABLE)
 								else
 									return result
 								end
@@ -287,7 +287,7 @@ module IO::Event
 							
 							if again?(result)
 								if length > 0
-									self.io_wait(fiber, io, IO::READABLE)
+									self.io_wait(fiber, io, IO::WRITABLE)
 								else
 									return result
 								end

data/lib/io/event/version.rb

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

data/readme.md

@@ -18,6 +18,10 @@ 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.14.3
+
+  - Fix several implementation bugs that could cause deadlocks on blocking writes.
+
 ### v1.14.0
 
   - [Enhanced `IO::Event::PriorityHeap` with deletion and bulk insertion methods](https://socketry.github.io/io-event/releases/index#enhanced-io::event::priorityheap-with-deletion-and-bulk-insertion-methods)

data/releases.md

@@ -1,5 +1,9 @@
 # Releases
 
+## v1.14.3
+
+  - Fix several implementation bugs that could cause deadlocks on blocking writes.
+
 ## v1.14.0
 
 ### Enhanced `IO::Event::PriorityHeap` with deletion and bulk insertion methods

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: io-event
 version: !ruby/object:Gem::Version
-  version: 1.14.2
+  version: 1.14.3
 platform: ruby
 authors:
 - Samuel Williams
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: An event loop.
 test_files: []