io-event 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbc13d55bf16de818e95478a83d0da64de1b9844bf92fd2970df3e8cc42d8240
-  data.tar.gz: 41e8fb1ad62705688c44ff774e44360ffef8223c8d308c01d1163b66b67c3abe
+  metadata.gz: df3b3dcc41afd982188c85b96e4d63056ae5edb43c41a5f650f8af9d2e6d5bf1
+  data.tar.gz: d3b1ca8e0241b85517940941507163c2c0a1faff442908521e0749b1848d5820
 SHA512:
-  metadata.gz: 878bb331d512cd99115da6451c07e06160fcf868e208280ef042d652be2d5cd606b1bb14623337ff1672729cb2f20b78f85232fd793a5baea274b3b5159a51ef
-  data.tar.gz: 85fc1b0faa924bb3c4f62de80262275a321f8b36a23954f110e9e78e7d7c156a0df62b3bdcc1feabaff14ab14107db6f37d51aa7ad0d00c139690b7231b482c4
+  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;
 
@@ -325,26 +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 (duplicate >= 0) close(duplicate);
+		// 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/lib/io/event/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: io-event
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Samuel Williams
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-09 00:00:00.000000000 Z
+date: 2022-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bake
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.8
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: An event loop.