io-event 1.0.2 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 050c0a061c54668eaf5d41eab6d70644410a0e6469b7e68cd26a6fa7c4a50f8a
-  data.tar.gz: 22be34dad07b0f75fc68045ff17b92c29ffbebdc06e4f570d3f92758d8532192
+  metadata.gz: df3b3dcc41afd982188c85b96e4d63056ae5edb43c41a5f650f8af9d2e6d5bf1
+  data.tar.gz: d3b1ca8e0241b85517940941507163c2c0a1faff442908521e0749b1848d5820
 SHA512:
-  metadata.gz: 92a187c8f2034aba8c33117fdc48a4055112cf1ea481a77d5fa7acc84683bedd04e295cb01e29c66ca2b23851debe8f86ec306d183c6c8474f5c44c2aef461da
-  data.tar.gz: 9e4da7190480b3d56556c440ebf922134e139b93cdd8c6ca5f8b7cea24c15bb8b943e6437b0c492d135f76dfaec32d63cc3ed43987545436c116d43e16ca5c4c
+  metadata.gz: 0dcd4266b204828ed5514075ba2e00cdab0de2f20a63d8d37ee831493778b713e72ef51a97857fe1e3ec6761b1ba9f2a71bfb9e6b185249c18a1f6d9a3b28265
+  data.tar.gz: eaa160b9cb38c5564dad8b4b81971a6e8a30f27f409d8e547dff1514165eaced3d4954ea1db1ed33a4f22b2aeb82069aa7ad0755b84deb96d654a148904852b6

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

@@ -28,7 +28,9 @@
 #include "pidfd.c"
 #include "../interrupt.h"
 
-static const int DEBUG = 0;
+enum {
+	DEBUG = 0,
+};
 
 static VALUE IO_Event_Selector_EPoll = Qnil;
 
@@ -231,6 +233,11 @@ VALUE IO_Event_Selector_EPoll_process_wait(VALUE self, VALUE fiber, VALUE pid, V
 	};
 	
 	process_wait_arguments.descriptor = pidfd_open(process_wait_arguments.pid, 0);
+	
+	if (process_wait_arguments.descriptor == -1) {
+		rb_sys_fail("IO_Event_Selector_EPoll_process_wait:pidfd_open");
+	}
+	
 	rb_update_max_fd(process_wait_arguments.descriptor);
 	
 	struct epoll_event event = {
@@ -241,6 +248,7 @@ VALUE IO_Event_Selector_EPoll_process_wait(VALUE self, VALUE fiber, VALUE pid, V
 	int result = epoll_ctl(data->descriptor, EPOLL_CTL_ADD, process_wait_arguments.descriptor, &event);
 	
 	if (result == -1) {
+		close(process_wait_arguments.descriptor);
 		rb_sys_fail("IO_Event_Selector_EPoll_process_wait:epoll_ctl");
 	}
 	
@@ -319,24 +327,38 @@ VALUE IO_Event_Selector_EPoll_io_wait(VALUE self, VALUE fiber, VALUE io, VALUE e
 	event.events = epoll_flags_from_events(NUM2INT(events));
 	event.data.ptr = (void*)fiber;
 	
-	// fprintf(stderr, "<- fiber=%p descriptor=%d\n", (void*)fiber, descriptor);
+	if (DEBUG) fprintf(stderr, "<- fiber=%p descriptor=%d\n", (void*)fiber, descriptor);
 	
 	// A better approach is to batch all changes:
 	int result = epoll_ctl(data->descriptor, EPOLL_CTL_ADD, descriptor, &event);
 	
 	if (result == -1 && errno == EEXIST) {
 		// The file descriptor was already inserted into epoll.
-		duplicate = descriptor = dup(descriptor);
-		
-		rb_update_max_fd(duplicate);
+		duplicate = dup(descriptor);
 		
-		if (descriptor == -1)
+		if (duplicate == -1) {
 			rb_sys_fail("IO_Event_Selector_EPoll_io_wait:dup");
+		}
+		
+		descriptor = duplicate;
+		
+		rb_update_max_fd(descriptor);
 		
 		result = epoll_ctl(data->descriptor, EPOLL_CTL_ADD, descriptor, &event);
 	}
 	
 	if (result == -1) {
+		// If we duplicated the file descriptor, ensure it's closed:
+		if (duplicate >= 0) {
+			close(duplicate);
+		}
+		
+		if (errno == EPERM) {
+			IO_Event_Selector_queue_push(&data->backend, fiber);
+			IO_Event_Selector_yield(&data->backend);
+			return events;
+		}
+		
 		rb_sys_fail("IO_Event_Selector_EPoll_io_wait:epoll_ctl");
 	}
 	

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

@@ -21,6 +21,11 @@
 #include "selector.h"
 #include <fcntl.h>
 
+#ifndef HAVE_RB_PROCESS_STATUS_WAIT
+// Pull in WNOHANG.
+#include <sys/wait.h>
+#endif
+
 static const int DEBUG = 0;
 
 static ID id_transfer, id_alive_p;

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

@@ -47,12 +47,9 @@ module IO::Event
 				@selector = nil
 			end
 			
-			def transfer(fiber, *arguments)
-				@selector.transfer(fiber, *arguments)
-			end
-			
-			def transfer(*arguments)
-				@selector.transfer(*arguments)
+			# Transfer from the calling fiber to the event loop.
+			def transfer
+				@selector.transfer
 			end
 			
 			def resume(*arguments)

data/lib/io/event/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module IO::Event
-	VERSION = "1.0.2"
+	VERSION = "1.0.5"
 end

metadata

@@ -1,14 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: io-event
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.5
 platform: ruby
 authors:
 - Samuel Williams
+- machty
+- Benoit Daloze
+- Delton Ding
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-14 00:00:00.000000000 Z
+date: 2022-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bake