io-event 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ac87cae13b6195eaa78351aff579000e12c3d9ed982d8202af4d745996a7a76
-  data.tar.gz: 1289b6e2f4c72ec34d5cdcb1565f5a9a96135a271a33370ac57ad958e4574da1
+  metadata.gz: 5ea156f474e12257bd5b2db77f8f647d8291a0e4fd6c3d78914e1f26abd35c52
+  data.tar.gz: fe0ebd9fce449827c06faf4d59d2c1ca86e62e9ccdbada21389646cd2133d7f6
 SHA512:
-  metadata.gz: ecfb2339742c8f6bcfcdb1d263a3355a6a28d417d626a37c1ba20f68425b8cb4fe597a04b7b3464a09fd201192d0e23957393fc7975f09a29399eb9429096b74
-  data.tar.gz: 9690bdf7559834e9e3c5345c42fa8447188c5f2ee6a65983371432f3ffc69c1e5837f0364b57040e5e7a32f582b1d19580eb6c01d710951fa794953a2fc41079
+  metadata.gz: ca948d973ad94bfbb9b6c166741e5cb5cd75439bfb47d07809a8d41fdecebdf4e9df9f0862aaa716ad444ab5ab9bf4b1cc1204698a5e7bd1a7f0ae6465c0dba2
+  data.tar.gz: 1e27d5073302b93a1ef9d5b51c6f8a5945546cc95e2b54b0985a746fc2810318c5c4c0f1b5cbc20686f277362cf197d2162a4f95d2b4bec2ee00e11f84ed2b1a

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

@@ -370,27 +370,24 @@ VALUE io_read_loop(VALUE _arguments) {
 	size_t offset = 0;
 	size_t length = arguments->length;
 	
-	while (length > 0) {
+	while (true) {
 		size_t maximum_size = size - offset;
 		ssize_t result = read(arguments->descriptor, (char*)base+offset, maximum_size);
 		
-		if (result == 0) {
-			break;
-		} else if (result > 0) {
+		if (result > 0) {
 			offset += result;
-			
-			// Ensure we don't underflow length:
-			if ((size_t)result < length)
-				length -= result;
-			else break;
-		} else if (errno == EAGAIN || errno == EWOULDBLOCK) {
+			if ((size_t)result >= length) break;
+			length -= result;
+		} else if (result == 0) {
+			break;
+		} else if (length > 0 && IO_Event_try_again(-result)) {
 			IO_Event_Selector_EPoll_io_wait(arguments->self, arguments->fiber, arguments->io, RB_INT2NUM(IO_EVENT_READABLE));
 		} else {
-			rb_sys_fail("IO_Event_Selector_EPoll_io_read:read");
+			return rb_fiber_scheduler_io_result(-1, -result);
 		}
 	}
 	
-	return SIZET2NUM(offset);
+	return rb_fiber_scheduler_io_result(offset, 0);
 }
 
 static
@@ -449,22 +446,24 @@ VALUE io_write_loop(VALUE _arguments) {
 		rb_raise(rb_eRuntimeError, "Length exceeds size of buffer!");
 	}
 	
-	while (length > 0) {
-		ssize_t result = write(arguments->descriptor, (char*)base+offset, length);
+	while (true) {
+		size_t maximum_size = size - offset;
+		ssize_t result = write(arguments->descriptor, (char*)base+offset, maximum_size);
 		
-		if (result >= 0) {
+		if (result > 0) {
 			offset += result;
-			
-			// Result must always be <= than length:
+			if ((size_t)result >= length) break;
 			length -= result;
-		} else if (errno == EAGAIN || errno == EWOULDBLOCK) {
+		} else if (result == 0) {
+			break;
+		} 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_WRITABLE));
 		} else {
-			rb_sys_fail("IO_Event_Selector_EPoll_io_write:write");
+			return rb_fiber_scheduler_io_result(-1, errno);
 		}
 	}
 	
-	return SIZET2NUM(offset);
+	return rb_fiber_scheduler_io_result(offset, 0);
 };
 
 static

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

@@ -26,6 +26,13 @@
 #include <time.h>
 #include <errno.h>
 
+enum {
+	DEBUG = 0,
+	DEBUG_IO_READ = 0,
+	DEBUG_IO_WRITE = 0,
+	DEBUG_IO_WAIT = 0
+};
+
 static VALUE IO_Event_Selector_KQueue = Qnil;
 
 enum {KQUEUE_MAX_EVENTS = 64};
@@ -363,6 +370,8 @@ VALUE IO_Event_Selector_KQueue_io_wait(VALUE self, VALUE fiber, VALUE io, VALUE
 		.descriptor = descriptor,
 	};
 	
+	if (DEBUG_IO_WAIT) fprintf(stderr, "IO_Event_Selector_KQueue_io_wait descriptor=%d\n", descriptor);
+	
 	return rb_rescue(io_wait_transfer, (VALUE)&io_wait_arguments, io_wait_rescue, (VALUE)&io_wait_arguments);
 }
 
@@ -392,27 +401,31 @@ VALUE io_read_loop(VALUE _arguments) {
 	size_t offset = 0;
 	size_t length = arguments->length;
 	
-	while (length > 0) {
+	if (DEBUG_IO_READ) fprintf(stderr, "io_read_loop(fd=%d, length=%zu)\n", arguments->descriptor, length);
+	
+	while (true) {
 		size_t maximum_size = size - offset;
+		if (DEBUG_IO_READ) fprintf(stderr, "read(%d, +%ld, %ld)\n", arguments->descriptor, offset, maximum_size);
 		ssize_t result = read(arguments->descriptor, (char*)base+offset, maximum_size);
+		if (DEBUG_IO_READ) fprintf(stderr, "read(%d, +%ld, %ld) -> %lld\n", arguments->descriptor, offset, maximum_size, result);
 		
-		if (result == 0) {
-			break;
-		} else if (result > 0) {
+		if (result > 0) {
 			offset += result;
-			
-			// Ensure we don't underflow length:
-			if ((size_t)result < length)
-				length -= result;
-			else break;
-		} else if (errno == EAGAIN || errno == EWOULDBLOCK) {
+			if ((size_t)result >= length) break;
+			length -= result;
+		} else if (result == 0) {
+			break;
+		} else if (length > 0 && IO_Event_try_again(errno)) {
+			if (DEBUG_IO_READ) fprintf(stderr, "IO_Event_Selector_KQueue_io_wait(fd=%d, length=%zu)\n", arguments->descriptor, length);
 			IO_Event_Selector_KQueue_io_wait(arguments->self, arguments->fiber, arguments->io, RB_INT2NUM(IO_EVENT_READABLE));
 		} else {
-			rb_sys_fail("IO_Event_Selector_KQueue_io_read:read");
+			if (DEBUG_IO_READ) fprintf(stderr, "io_read_loop(fd=%d, length=%zu) -> errno=%d\n", arguments->descriptor, length, errno);
+			return rb_fiber_scheduler_io_result(-1, errno);
 		}
 	}
 	
-	return SIZET2NUM(offset);
+	if (DEBUG_IO_READ) fprintf(stderr, "io_read_loop(fd=%d, length=%zu) -> %zu\n", arguments->descriptor, length, offset);
+	return rb_fiber_scheduler_io_result(offset, 0);
 }
 
 static
@@ -474,22 +487,31 @@ VALUE io_write_loop(VALUE _arguments) {
 		rb_raise(rb_eRuntimeError, "Length exceeds size of buffer!");
 	}
 	
-	while (length > 0) {
-		ssize_t result = write(arguments->descriptor, (char*)base+offset, length);
+	if (DEBUG_IO_WRITE) fprintf(stderr, "io_write_loop(fd=%d, length=%zu)\n", arguments->descriptor, length);
+	
+	while (true) {
+		size_t maximum_size = size - offset;
+		if (DEBUG_IO_WRITE) fprintf(stderr, "write(%d, +%ld, %ld, length=%zu)\n", arguments->descriptor, offset, maximum_size, length);
+		ssize_t result = write(arguments->descriptor, (char*)base+offset, maximum_size);
+		if (DEBUG_IO_WRITE) fprintf(stderr, "write(%d, +%ld, %ld) -> %lld\n", arguments->descriptor, offset, maximum_size, result);
 		
-		if (result >= 0) {
+		if (result > 0) {
 			offset += result;
-			
-			// Result must always be <= than length:
+			if ((size_t)result >= length) break;
 			length -= result;
-		} else if (errno == EAGAIN || errno == EWOULDBLOCK) {
-			IO_Event_Selector_KQueue_io_wait(arguments->self, arguments->fiber, arguments->io, RB_INT2NUM(IO_EVENT_WRITABLE));
+		} else if (result == 0) {
+			break;
+		} else if (length > 0 && IO_Event_try_again(errno)) {
+			if (DEBUG_IO_WRITE) fprintf(stderr, "IO_Event_Selector_KQueue_io_wait(fd=%d, length=%zu)\n", arguments->descriptor, length);
+			IO_Event_Selector_KQueue_io_wait(arguments->self, arguments->fiber, arguments->io, RB_INT2NUM(IO_EVENT_READABLE));
 		} else {
-			rb_sys_fail("IO_Event_Selector_KQueue_io_write:write");
+			if (DEBUG_IO_WRITE) fprintf(stderr, "io_write_loop(fd=%d, length=%zu) -> errno=%d\n", arguments->descriptor, length, errno);
+			return rb_fiber_scheduler_io_result(-1, errno);
 		}
 	}
 	
-	return SIZET2NUM(offset);
+	if (DEBUG_IO_READ) fprintf(stderr, "io_write_loop(fd=%d, length=%zu) -> %zu\n", arguments->descriptor, length, offset);
+	return rb_fiber_scheduler_io_result(offset, 0);
 };
 
 static
@@ -620,7 +642,9 @@ VALUE IO_Event_Selector_KQueue_select(VALUE self, VALUE duration) {
 	// Non-comprehensive testing shows this gives a 1.5x speedup.
 	
 	// First do the syscall with no timeout to get any immediately available events:
+	if (DEBUG) fprintf(stderr, "\r\nselect_internal_with_gvl timeout=" PRINTF_TIMESPEC "\r\n", PRINTF_TIMESPEC_ARGS(arguments.storage));
 	select_internal_with_gvl(&arguments);
+	if (DEBUG) fprintf(stderr, "\r\nselect_internal_with_gvl done\r\n");
 	
 	// If we:
 	// 1. Didn't process any ready fibers, and
@@ -633,6 +657,7 @@ VALUE IO_Event_Selector_KQueue_select(VALUE self, VALUE duration) {
 		if (!timeout_nonblocking(arguments.timeout)) {
 			arguments.count = KQUEUE_MAX_EVENTS;
 			
+			if (DEBUG) fprintf(stderr, "IO_Event_Selector_KQueue_select timeout=" PRINTF_TIMESPEC "\n", PRINTF_TIMESPEC_ARGS(arguments.storage));
 			select_internal_without_gvl(&arguments);
 		}
 	}

data/ext/io/event/selector/selector.h

@@ -26,6 +26,7 @@
 
 #ifdef HAVE_RUBY_IO_BUFFER_H
 #include <ruby/io/buffer.h>
+#include <ruby/fiber/scheduler.h>
 #endif
 
 #include <time.h>
@@ -40,6 +41,10 @@ enum IO_Event {
 
 void Init_IO_Event_Selector();
 
+static inline int IO_Event_try_again(int error) {
+	return error == EAGAIN || error == EWOULDBLOCK;
+}
+
 VALUE IO_Event_Selector_fiber_transfer(VALUE fiber, int argc, VALUE *argv);
 
 #ifdef HAVE__RB_FIBER_RAISE

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

@@ -396,27 +396,24 @@ VALUE IO_Event_Selector_URing_io_read(VALUE self, VALUE fiber, VALUE io, VALUE b
 	size_t offset = 0;
 	size_t length = NUM2SIZET(_length);
 	
-	while (length > 0) {
+	while (true) {
 		size_t maximum_size = size - offset;
 		int result = io_read(data, fiber, descriptor, (char*)base+offset, maximum_size);
 		
-		if (result == 0) {
-			break;
-		} else if (result > 0) {
+		if (result > 0) {
 			offset += result;
-			
-			// Ensure we don't underflow length:
-			if ((size_t)result < length)
-				length -= result;
-			else break;
-		} else if (-result == EAGAIN || -result == EWOULDBLOCK) {
+			if ((size_t)result >= length) break;
+			length -= result;
+		} else if (result == 0) {
+			break;
+		} else if (length > 0 && IO_Event_try_again(-result)) {
 			IO_Event_Selector_URing_io_wait(self, fiber, io, RB_INT2NUM(IO_EVENT_READABLE));
 		} else {
-			rb_syserr_fail(-result, strerror(-result));
+			return rb_fiber_scheduler_io_result(-1, -result);
 		}
 	}
 	
-	return SIZET2NUM(offset);
+	return rb_fiber_scheduler_io_result(offset, 0);
 }
 
 static
@@ -452,21 +449,24 @@ VALUE IO_Event_Selector_URing_io_write(VALUE self, VALUE fiber, VALUE io, VALUE
 		rb_raise(rb_eRuntimeError, "Length exceeds size of buffer!");
 	}
 	
-	while (length > 0) {
-		int result = io_write(data, fiber, descriptor, (char*)base+offset, length);
+	while (true) {
+		size_t maximum_size = size - offset;
+		int result = io_write(data, fiber, descriptor, (char*)base+offset, maximum_size);
 		
-		if (result >= 0) {
+		if (result > 0) {
 			offset += result;
 			if ((size_t)result >= length) break;
 			length -= result;
-		} else if (-result == EAGAIN || -result == EWOULDBLOCK) {
+		} else if (result == 0) {
+			break;
+		} else if (length > 0 && IO_Event_try_again(-result)) {
 			IO_Event_Selector_URing_io_wait(self, fiber, io, RB_INT2NUM(IO_EVENT_WRITABLE));
 		} else {
-			rb_syserr_fail(-result, strerror(-result));
+			return rb_fiber_scheduler_io_result(-1, -result);
 		}
 	}
 	
-	return SIZET2NUM(offset);
+	return rb_fiber_scheduler_io_result(offset, 0);
 }
 
 #endif

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

@@ -134,25 +134,36 @@ module IO::Event
 			end
 			
 			if IO.const_defined?(:Buffer)
+				EAGAIN = Errno::EAGAIN::Errno
+				
 				def io_read(fiber, io, buffer, length)
 					offset = 0
 					
-					while length > 0
-						# The maximum size we can read:
+					while true
 						maximum_size = buffer.size - offset
 						
 						case result = blocking{io.read_nonblock(maximum_size, exception: false)}
 						when :wait_readable
-							self.io_wait(fiber, io, IO::READABLE)
+							if length > 0
+								self.io_wait(fiber, io, IO::READABLE)
+							else
+								return -EAGAIN
+							end
 						when :wait_writable
-							self.io_wait(fiber, io, IO::WRITABLE)
+							if length > 0
+								self.io_wait(fiber, io, IO::WRITABLE)
+							else
+								return -EAGAIN
+							end
 						else
 							break unless result
 							
 							buffer.copy(result, offset)
 							
-							offset += result.bytesize
-							length -= result.bytesize
+							size = result.bytesize
+							offset += size
+							break if size >= length
+							length -= size
 						end
 					end
 					
@@ -162,16 +173,26 @@ module IO::Event
 				def io_write(fiber, io, buffer, length)
 					offset = 0
 					
-					while length > 0
-						# From offset until the end:
-						chunk = buffer.to_str(offset, length)
+					while true
+						maximum_size = buffer.size - offset
+						
+						chunk = buffer.to_str(offset, maximum_size)
 						case result = blocking{io.write_nonblock(chunk, exception: false)}
 						when :wait_readable
-							self.io_wait(fiber, io, IO::READABLE)
+							if length > 0
+								self.io_wait(fiber, io, IO::READABLE)
+							else
+								return -EAGAIN
+							end
 						when :wait_writable
-							self.io_wait(fiber, io, IO::WRITABLE)
+							if length > 0
+								self.io_wait(fiber, io, IO::WRITABLE)
+							else
+								return -EAGAIN
+							end
 						else
 							offset += result
+							break if result >= length
 							length -= result
 						end
 					end

data/lib/io/event/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: io-event
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-16 00:00:00.000000000 Z
+date: 2021-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bake
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 description:
 email:
 executables: []