io-event 0.3.3 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 889604c87afea8f1d84e1ee40ada077792e84cfa77d074d695bf6cc1f27b69e1
-  data.tar.gz: c46aada520c6a8ba41918c7c3f794922befc5012fc9fe5954be6a4b15b920a20
+  metadata.gz: 92c441dcc5d0c1c052d12cca378cb86ed81ce156bbff09b8d699699424acb3e6
+  data.tar.gz: bd971d884cd6decd4b6e2b0de10248255d17161acb556a709f24aa732594eb32
 SHA512:
-  metadata.gz: 98050d505cf276b82824ab4c4371f632609c24fa06249feffbce10eeb8a3d8f45760c4472d4046b473a3da61ab75c60ddbbe93f0e9671d9bd5411abc705558a9
-  data.tar.gz: dc127c772d0f48fd2710e399aa5f59150724c37f5599b63c2aaba45804fdf1d68075b7808c679158ff7579fc85f5d7e987f7ee92e02493342dd7d2f29b2f5cb8
+  metadata.gz: b296a4cabf9c7db248139f23821bd9f43894269494c9f831dd0e56a67ab4b89e7346dcb7bb20c510a5067a2309e0372a743a862c548a7f781c84e3f6a51e4287
+  data.tar.gz: fd8df36184a53e494ec16e378721f0d35305c97b561e393821eae88d0c7b8775f04f9f883821530f07a2584525978a4c1c14912dba4f35cfe366638f396a82db

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

@@ -299,6 +299,11 @@ VALUE io_wait_transfer(VALUE _arguments) {
 	
 	VALUE result = IO_Event_Selector_fiber_transfer(arguments->data->backend.loop, 0, NULL);
 	
+	// If the fiber is being cancelled, it might be resumed with nil:
+	if (!RTEST(result)) {
+		return Qfalse;
+	}
+	
 	return INT2NUM(events_from_epoll_flags(NUM2INT(result)));
 };
 
@@ -365,7 +370,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;
@@ -437,7 +442,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 +545,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 +558,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

@@ -355,6 +355,11 @@ VALUE io_wait_transfer(VALUE _arguments) {
 	
 	VALUE result = IO_Event_Selector_fiber_transfer(arguments->data->backend.loop, 0, NULL);
 	
+	// If the fiber is being cancelled, it might be resumed with nil:
+	if (!RTEST(result)) {
+		return Qfalse;
+	}
+	
 	return INT2NUM(events_from_kqueue_filter(RB_NUM2INT(result)));
 }
 
@@ -396,7 +401,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 +483,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 +610,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 +623,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,
@@ -336,6 +338,10 @@ VALUE io_wait_transfer(VALUE _arguments) {
 	VALUE result = IO_Event_Selector_fiber_transfer(data->backend.loop, 0, NULL);
 	if (DEBUG) fprintf(stderr, "io_wait:IO_Event_Selector_fiber_transfer -> %d\n", RB_NUM2INT(result));
 
+	if (!RTEST(result)) {
+		return Qfalse;
+	}
+
 	// We explicitly filter the resulting events based on the requested events.
 	// In some cases, poll will report events we didn't ask for.
 	short flags = arguments->flags & NUM2INT(result);
@@ -371,12 +377,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);
 	
@@ -394,7 +416,7 @@ 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);
@@ -427,7 +449,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);
 	
@@ -445,7 +467,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);
@@ -558,6 +580,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 +592,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 +607,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.3"
+	VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: io-event
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 1.0.1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-18 00:00:00.000000000 Z
+date: 2021-12-24 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.3.2
 signing_key:
 specification_version: 4
 summary: An event loop.