io-event 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 202f6fedc64c46fd6d6ecfb8d8ca9a8e5f6e41c1c46182bb5b62ed03116aeb07
-  data.tar.gz: a1d8fe1987852db3c4c6187c771783c98c1c661536690b74a499a951273da39f
+  metadata.gz: 82ae60c9c790437fc720a98489a0edcc345cca0420d795b2e33dcd8729f30dd2
+  data.tar.gz: f1a585938bb11cab9dd29a5acb50831feadce6e60d515112d2e8b22fdda5f65b
 SHA512:
-  metadata.gz: f1d276fb8062dca9c05ed078f9ad91aac24e26d1a835ccee875d7ebe4e98e0bf93a236c0b97cf876aaccb4b40b52ffc4669d41c8e36215430e9d74c887c753a8
-  data.tar.gz: 3765cd83a4e178e25fb6f9f24a6b4f4be014a3120465c380afe9daef5f3fdbbc63ac3db336ddcf986eab3adb49b5b85aa20b460916b3f4f9a2d140424a5ec843
+  metadata.gz: 34578267eccd7ae7c7c902f44db64f2be4a63e596c4c4522ed2199a5fd4c1247f1bcf31b02b0b2c21a8aa2856979c45421f86a01f0fbd32b824f5df91dd1ab7f
+  data.tar.gz: 3d4f4acd7739cc67c04e65c4a6f4079bd0d887c50cbb13f0d979b4d7f7f94916dc6067f93a33b8a63c67cae45b0f0743c2b9f4af4e46b1e33a7397910026ee86

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

@@ -540,7 +540,11 @@ void select_internal_without_gvl(struct select_arguments *arguments) {
 	arguments->data->blocked = 0;
 	
 	if (arguments->count == -1) {
-		rb_sys_fail("select_internal_without_gvl:epoll_wait");
+		if (errno != EINTR) {
+			rb_sys_fail("select_internal_without_gvl:epoll_wait");
+		} else {
+			arguments->count = 0;
+		}
 	}
 }
 
@@ -549,7 +553,11 @@ void select_internal_with_gvl(struct select_arguments *arguments) {
 	select_internal((void *)arguments);
 	
 	if (arguments->count == -1) {
-		rb_sys_fail("select_internal_with_gvl:epoll_wait");
+		if (errno != EINTR) {
+			rb_sys_fail("select_internal_with_gvl:epoll_wait");
+		} else {
+			arguments->count = 0;
+		}
 	}
 }
 

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

@@ -605,7 +605,11 @@ void select_internal_without_gvl(struct select_arguments *arguments) {
 	arguments->data->blocked = 0;
 	
 	if (arguments->count == -1) {
-		rb_sys_fail("select_internal_without_gvl:kevent");
+		if (errno != EINTR) {
+			rb_sys_fail("select_internal_without_gvl:kevent");
+		} else {
+			arguments->count = 0;
+		}
 	}
 }
 
@@ -614,7 +618,11 @@ void select_internal_with_gvl(struct select_arguments *arguments) {
 	select_internal((void *)arguments);
 	
 	if (arguments->count == -1) {
-		rb_sys_fail("select_internal_with_gvl:kevent");
+		if (errno != EINTR) {
+			rb_sys_fail("select_internal_with_gvl:kevent");
+		} else {
+			arguments->count = 0;
+		}
 	}
 }
 

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

@@ -27,6 +27,8 @@
 
 #include "pidfd.c"
 
+#include <linux/version.h>
+
 enum {
 	DEBUG = 0,
 	DEBUG_IO_READ = 0,
@@ -371,12 +373,28 @@ VALUE IO_Event_Selector_URing_io_wait(VALUE self, VALUE fiber, VALUE io, VALUE e
 
 #ifdef HAVE_RUBY_IO_BUFFER_H
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,16,0)
+static inline off_t io_seekable(int descriptor) {
+	return -1;
+}
+#else
+#warning Upgrade your kernel to 5.16! io_uring bugs prevent efficient io_read/io_write hooks.
+static inline off_t io_seekable(int descriptor)
+{
+	if (lseek(descriptor, 0, SEEK_CUR) == -1) {
+		return 0;
+	} else {
+		return -1;
+	}
+}
+#endif
+
 static int io_read(struct IO_Event_Selector_URing *data, VALUE fiber, int descriptor, char *buffer, size_t length) {
 	struct io_uring_sqe *sqe = io_get_sqe(data);
 
 	if (DEBUG) fprintf(stderr, "io_read:io_uring_prep_read(fiber=%p)\n", (void*)fiber);
 
-	io_uring_prep_read(sqe, descriptor, buffer, length, -1);
+	io_uring_prep_read(sqe, descriptor, buffer, length, io_seekable(descriptor));
 	io_uring_sqe_set_data(sqe, (void*)fiber);
 	io_uring_submit_now(data);
 	
@@ -427,7 +445,7 @@ int io_write(struct IO_Event_Selector_URing *data, VALUE fiber, int descriptor,
 	
 	if (DEBUG) fprintf(stderr, "io_write:io_uring_prep_write(fiber=%p)\n", (void*)fiber);
 
-	io_uring_prep_write(sqe, descriptor, buffer, length, -1);
+	io_uring_prep_write(sqe, descriptor, buffer, length, io_seekable(descriptor));
 	io_uring_sqe_set_data(sqe, (void*)fiber);
 	io_uring_submit_pending(data);
 	
@@ -558,6 +576,8 @@ int select_internal_without_gvl(struct select_arguments *arguments) {
 	
 	if (arguments->result == -ETIME) {
 		arguments->result = 0;
+	} else if (arguments->result == -EINTR) {
+		arguments->result = 0;
 	} else if (arguments->result < 0) {
 		rb_syserr_fail(-arguments->result, "select_internal_without_gvl:io_uring_wait_cqe_timeout");
 	} else {
@@ -568,8 +588,6 @@ int select_internal_without_gvl(struct select_arguments *arguments) {
 	return arguments->result;
 }
 
-// #define IO_EVENT_SELECTOR_URING_UDATA_INTERRUPT ((__u64) -2)
-
 static inline
 unsigned select_process_completions(struct io_uring *ring) {
 	unsigned completed = 0;
@@ -585,10 +603,6 @@ unsigned select_process_completions(struct io_uring *ring) {
 			continue;
 		}
 		
-		// if (cqe->user_data == IO_EVENT_SELECTOR_URING_UDATA_INTERRUPT) {
-		// 	io_uring_cq_advance(ring, 1);
-		// }
-		
 		VALUE fiber = (VALUE)cqe->user_data;
 		VALUE result = RB_INT2NUM(cqe->res);
 		

data/lib/io/event/selector.rb

@@ -31,12 +31,10 @@ module IO::Event
 				end
 			end
 			
-			if self.const_defined?(:URing)
-				return URing
+			if self.const_defined?(:EPoll)
+				return EPoll
 			elsif self.const_defined?(:KQueue)
 				return KQueue
-			elsif self.const_defined?(:EPoll)
-				return EPoll
 			else
 				return Select
 			end

data/lib/io/event/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: io-event
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-22 00:00:00.000000000 Z
+date: 2021-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bake
@@ -113,14 +113,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.0
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: An event loop.