io-event 0.3.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd0859ac56f4bcd713026e8e7faa0547ec57d195c35abe8d6bcfa77dda89f25d
-  data.tar.gz: 1d6c6debea4d7a822f383e5d3b7c1ed0698b5928b2637ad65069b0798ea557d8
+  metadata.gz: 82ae60c9c790437fc720a98489a0edcc345cca0420d795b2e33dcd8729f30dd2
+  data.tar.gz: f1a585938bb11cab9dd29a5acb50831feadce6e60d515112d2e8b22fdda5f65b
 SHA512:
-  metadata.gz: 2edfbfddcecac51db0093e30df9b04ac49fceb2cef189b8d46cfecc564ac47f3ef4c1680632cfb4ab0266e6529472764dc6ac81b0ae715f0b4a7707e8c4d9acd
-  data.tar.gz: a2bb38d0bf5a7cde138c94f2cd799be2a184b035c70e88e24f32dca91e20051473594fea7883c223ceb612e71beb499f9d81ef6335e4469f313b0de6fd31947b
+  metadata.gz: 34578267eccd7ae7c7c902f44db64f2be4a63e596c4c4522ed2199a5fd4c1247f1bcf31b02b0b2c21a8aa2856979c45421f86a01f0fbd32b824f5df91dd1ab7f
+  data.tar.gz: 3d4f4acd7739cc67c04e65c4a6f4079bd0d887c50cbb13f0d979b4d7f7f94916dc6067f93a33b8a63c67cae45b0f0743c2b9f4af4e46b1e33a7397910026ee86

data/ext/io/event/event.c

@@ -24,7 +24,7 @@
 VALUE IO_Event = Qnil;
 VALUE IO_Event_Selector = Qnil;
 
-void Init_IO_Event()
+void Init_IO_Event(void)
 {
 #ifdef HAVE_RB_EXT_RACTOR_SAFE
 	rb_ext_ractor_safe(true);

data/ext/io/event/event.h

@@ -24,7 +24,7 @@
 
 #include "extconf.h"
 
-void Init_IO_Event();
+void Init_IO_Event(void);
 
 #ifdef HAVE_LIBURING_H
 #include "selector/uring.h"

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

@@ -365,7 +365,7 @@ VALUE io_read_loop(VALUE _arguments) {
 	
 	void *base;
 	size_t size;
-	rb_io_buffer_get_mutable(arguments->buffer, &base, &size);
+	rb_io_buffer_get_bytes_for_writing(arguments->buffer, &base, &size);
 	
 	size_t offset = 0;
 	size_t length = arguments->length;
@@ -380,10 +380,10 @@ VALUE io_read_loop(VALUE _arguments) {
 			length -= result;
 		} else if (result == 0) {
 			break;
-		} else if (length > 0 && IO_Event_try_again(-result)) {
+		} else if (length > 0 && IO_Event_try_again(errno)) {
 			IO_Event_Selector_EPoll_io_wait(arguments->self, arguments->fiber, arguments->io, RB_INT2NUM(IO_EVENT_READABLE));
 		} else {
-			return rb_fiber_scheduler_io_result(-1, -result);
+			return rb_fiber_scheduler_io_result(-1, errno);
 		}
 	}
 	
@@ -437,7 +437,7 @@ VALUE io_write_loop(VALUE _arguments) {
 	
 	const void *base;
 	size_t size;
-	rb_io_buffer_get_immutable(arguments->buffer, &base, &size);
+	rb_io_buffer_get_bytes_for_reading(arguments->buffer, &base, &size);
 	
 	size_t offset = 0;
 	size_t length = arguments->length;
@@ -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

@@ -396,7 +396,7 @@ VALUE io_read_loop(VALUE _arguments) {
 	
 	void *base;
 	size_t size;
-	rb_io_buffer_get_mutable(arguments->buffer, &base, &size);
+	rb_io_buffer_get_bytes_for_writing(arguments->buffer, &base, &size);
 	
 	size_t offset = 0;
 	size_t length = arguments->length;
@@ -478,7 +478,7 @@ VALUE io_write_loop(VALUE _arguments) {
 	
 	const void *base;
 	size_t size;
-	rb_io_buffer_get_immutable(arguments->buffer, &base, &size);
+	rb_io_buffer_get_bytes_for_reading(arguments->buffer, &base, &size);
 	
 	size_t offset = 0;
 	size_t length = arguments->length;
@@ -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,7 +27,12 @@
 
 #include "pidfd.c"
 
-static const int DEBUG = 0;
+#include <linux/version.h>
+
+enum {
+	DEBUG = 0,
+	DEBUG_IO_READ = 0,
+};
 
 static VALUE IO_Event_Selector_URing = Qnil;
 
@@ -368,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, 0);
+	io_uring_prep_read(sqe, descriptor, buffer, length, io_seekable(descriptor));
 	io_uring_sqe_set_data(sqe, (void*)fiber);
 	io_uring_submit_now(data);
 	
@@ -391,14 +412,16 @@ VALUE IO_Event_Selector_URing_io_read(VALUE self, VALUE fiber, VALUE io, VALUE b
 	
 	void *base;
 	size_t size;
-	rb_io_buffer_get_mutable(buffer, &base, &size);
+	rb_io_buffer_get_bytes_for_writing(buffer, &base, &size);
 	
 	size_t offset = 0;
 	size_t length = NUM2SIZET(_length);
 	
 	while (true) {
 		size_t maximum_size = size - offset;
+		if (DEBUG_IO_READ) fprintf(stderr, "io_read(%d, +%ld, %ld)\n", descriptor, offset, maximum_size);
 		int result = io_read(data, fiber, descriptor, (char*)base+offset, maximum_size);
+		if (DEBUG_IO_READ) fprintf(stderr, "io_read(%d, +%ld, %ld) -> %d\n", descriptor, offset, maximum_size, result);
 		
 		if (result > 0) {
 			offset += result;
@@ -422,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, 0);
+	io_uring_prep_write(sqe, descriptor, buffer, length, io_seekable(descriptor));
 	io_uring_sqe_set_data(sqe, (void*)fiber);
 	io_uring_submit_pending(data);
 	
@@ -440,7 +463,7 @@ VALUE IO_Event_Selector_URing_io_write(VALUE self, VALUE fiber, VALUE io, VALUE
 	
 	const void *base;
 	size_t size;
-	rb_io_buffer_get_immutable(buffer, &base, &size);
+	rb_io_buffer_get_bytes_for_reading(buffer, &base, &size);
 	
 	size_t offset = 0;
 	size_t length = NUM2SIZET(_length);
@@ -553,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 {
@@ -563,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;
@@ -580,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/select.rb

@@ -158,7 +158,7 @@ module IO::Event
 						else
 							break unless result
 							
-							buffer.copy(result, offset)
+							buffer.set_string(result, offset)
 							
 							size = result.bytesize
 							offset += size
@@ -176,7 +176,7 @@ module IO::Event
 					while true
 						maximum_size = buffer.size - offset
 						
-						chunk = buffer.to_str(offset, maximum_size)
+						chunk = buffer.get_string(offset, maximum_size)
 						case result = blocking{io.write_nonblock(chunk, exception: false)}
 						when :wait_readable
 							if length > 0

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.3.1"
+	VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: io-event
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-18 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.dev
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: An event loop.