io-event 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 529ab26d211811182c1ac8b7b292431533c830eddcfd8781185c9ea4ff623c93
-  data.tar.gz: cef3ea8d930d3f3f92e0c814c0f89405a78e3da1d4ebd6c0d1e73bd32f6839a6
+  metadata.gz: dd5603ed5cc26eaa2f9d4261d7462ec1d435c169c36c2770af80c0d27fe2c4e2
+  data.tar.gz: 1ce4d895bfc5618e97bf84702e2591aa9b3aa947678e5eae8b1b42c0c4119607
 SHA512:
-  metadata.gz: 77cd0725f41f507e391f54dae4071c9b2721a1fc4ce1c4dbcbf7b4dac8a7453c0e4867679b9f9c615d82ce06af2b3f77745b0d1526f0c6bb02cf06a60c84f763
-  data.tar.gz: 6d9a389303af3b13540ff2761d8e35762e3af975c7e1defddf8765088129f43dc4584029947bafd2a6eb35c60f8206b0dc184d425c52163d1652392e62bb9333
+  metadata.gz: c5924e3108f8c731a55d36f5329519870931aaa16e14fab81ca7b56418afb77cc6bab395c10751b628ce2668ef5c570141af6237cc07c7a62bf8fc8a4b53c71a
+  data.tar.gz: a5e8281833ac2f7476ca298fc0446ad4479dd0f08cb7764c5f0940fd235446b903e03909acc669869b2847eab50e92c1ef80e6c77acef62b35525d39a48a5351

data/ext/extconf.rb

@@ -57,7 +57,7 @@ $srcs << "io/event/interrupt.c"
 
 have_func("rb_io_descriptor")
 have_func("&rb_process_status_wait")
-have_func('rb_fiber_current')
+have_func("rb_fiber_current")
 have_func("&rb_fiber_raise")
 
 have_header('ruby/io/buffer.h')

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

@@ -385,7 +385,7 @@ VALUE IO_Event_Selector_EPoll_io_wait(VALUE self, VALUE fiber, VALUE io, VALUE e
 	return rb_ensure(io_wait_transfer, (VALUE)&io_wait_arguments, io_wait_ensure, (VALUE)&io_wait_arguments);
 }
 
-#ifdef RUBY_FIBER_SCHEDULER_VERSION
+#ifdef HAVE_RUBY_IO_BUFFER_H
 
 struct io_read_arguments {
 	VALUE self;
@@ -715,9 +715,11 @@ void Init_IO_Event_Selector_EPoll(VALUE IO_Event_Selector) {
 	rb_define_method(IO_Event_Selector_EPoll, "close", IO_Event_Selector_EPoll_close, 0);
 	
 	rb_define_method(IO_Event_Selector_EPoll, "io_wait", IO_Event_Selector_EPoll_io_wait, 3);
-
+	
+#ifdef HAVE_RUBY_IO_BUFFER_H
 	rb_define_method(IO_Event_Selector_EPoll, "io_read", IO_Event_Selector_EPoll_io_read_compatible, -1);
 	rb_define_method(IO_Event_Selector_EPoll, "io_write", IO_Event_Selector_EPoll_io_write_compatible, -1);
+#endif
 	
 	// Once compatibility isn't a concern, we can do this:
 	// rb_define_method(IO_Event_Selector_EPoll, "io_read", IO_Event_Selector_EPoll_io_read, 5);

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

@@ -380,7 +380,7 @@ VALUE IO_Event_Selector_KQueue_io_wait(VALUE self, VALUE fiber, VALUE io, VALUE
 	return rb_rescue(io_wait_transfer, (VALUE)&io_wait_arguments, io_wait_rescue, (VALUE)&io_wait_arguments);
 }
 
-#ifdef RUBY_FIBER_SCHEDULER_VERSION
+#ifdef HAVE_RUBY_IO_BUFFER_H
 
 struct io_read_arguments {
 	VALUE self;
@@ -764,9 +764,11 @@ void Init_IO_Event_Selector_KQueue(VALUE IO_Event_Selector) {
 	rb_define_method(IO_Event_Selector_KQueue, "close", IO_Event_Selector_KQueue_close, 0);
 	
 	rb_define_method(IO_Event_Selector_KQueue, "io_wait", IO_Event_Selector_KQueue_io_wait, 3);
-
+	
+#ifdef HAVE_RUBY_IO_BUFFER_H
 	rb_define_method(IO_Event_Selector_KQueue, "io_read", IO_Event_Selector_KQueue_io_read_compatible, -1);
 	rb_define_method(IO_Event_Selector_KQueue, "io_write", IO_Event_Selector_KQueue_io_write_compatible, -1);
+#endif
 	
 	rb_define_method(IO_Event_Selector_KQueue, "process_wait", IO_Event_Selector_KQueue_process_wait, 3);
 }

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

@@ -21,15 +21,14 @@
 #include "selector.h"
 #include <fcntl.h>
 
-#ifndef HAVE_RB_PROCESS_STATUS_WAIT
-// Pull in WNOHANG.
-#include <sys/wait.h>
-#endif
-
 static const int DEBUG = 0;
 
 static ID id_transfer, id_alive_p;
 
+#ifndef HAVE_RB_PROCESS_STATUS_WAIT
+static VALUE process_wnohang;
+#endif
+
 VALUE IO_Event_Selector_fiber_transfer(VALUE fiber, int argc, VALUE *argv) {
 	// TODO Consider introducing something like `rb_fiber_scheduler_transfer(...)`.
 #ifdef HAVE__RB_FIBER_TRANSFER
@@ -79,26 +78,65 @@ static VALUE rb_Process_Status = Qnil;
 
 VALUE IO_Event_Selector_process_status_wait(rb_pid_t pid)
 {
-	return rb_funcall(rb_Process_Status, id_wait, 2, PIDT2NUM(pid), INT2NUM(WNOHANG));
+	return rb_funcall(rb_Process_Status, id_wait, 2, PIDT2NUM(pid), process_wnohang);
 }
 #endif
 
 int IO_Event_Selector_nonblock_set(int file_descriptor)
 {
+#ifdef _WIN32
+	u_long nonblock = 1;
+	int result = ioctlsocket(file_descriptor, FIONBIO, &nonblock);
+	// Windows does not provide any way to know this, so we always restore it back to unset:
+	return 0;
+#else
+	// Get the current mode:
 	int flags = fcntl(file_descriptor, F_GETFL, 0);
 	
+	// Set the non-blocking flag if it isn't already:
 	if (!(flags & O_NONBLOCK)) {
 		fcntl(file_descriptor, F_SETFL, flags | O_NONBLOCK);
 	}
 	
 	return flags;
+#endif
 }
 
 void IO_Event_Selector_nonblock_restore(int file_descriptor, int flags)
 {
+#ifdef _WIN32
+	// Yolo...
+	u_long nonblock = flags;
+	int result = ioctlsocket(file_descriptor, FIONBIO, &nonblock);
+#else
+	// The flags didn't have O_NONBLOCK set, so it would have been set, so we need to restore it:
 	if (!(flags & O_NONBLOCK)) {
-		fcntl(file_descriptor, F_SETFL, flags & ~flags);
+		fcntl(file_descriptor, F_SETFL, flags);
 	}
+#endif
+}
+
+struct IO_Event_Selector_nonblock_arguments {
+	int file_descriptor;
+	int flags;
+};
+
+static VALUE IO_Event_Selector_nonblock_ensure(VALUE _arguments) {
+	struct IO_Event_Selector_nonblock_arguments *arguments = (struct IO_Event_Selector_nonblock_arguments *)_arguments;
+	
+	IO_Event_Selector_nonblock_restore(arguments->file_descriptor, arguments->flags);
+	
+	return Qnil;
+}
+
+static VALUE IO_Event_Selector_nonblock(VALUE class, VALUE io)
+{
+	struct IO_Event_Selector_nonblock_arguments arguments = {
+		.file_descriptor = IO_Event_Selector_io_descriptor(io),
+		.flags = IO_Event_Selector_nonblock_set(arguments.file_descriptor)
+	};
+	
+	return rb_ensure(rb_yield, io, IO_Event_Selector_nonblock_ensure, (VALUE)&arguments);
 }
 
 void Init_IO_Event_Selector(VALUE IO_Event_Selector) {
@@ -119,9 +157,12 @@ void Init_IO_Event_Selector(VALUE IO_Event_Selector) {
 	
 #ifndef HAVE_RB_PROCESS_STATUS_WAIT
 	id_wait = rb_intern("wait");
+	process_wnohang = rb_const_get(rb_mProcess, rb_intern("WNOHANG"));
 	rb_Process_Status = rb_const_get_at(rb_mProcess, rb_intern("Status"));
 	rb_gc_register_mark_object(rb_Process_Status);
 #endif
+
+	rb_define_singleton_method(IO_Event_Selector, "nonblock", IO_Event_Selector_nonblock, 1);
 }
 
 struct wait_and_transfer_arguments {

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

@@ -326,6 +326,7 @@ VALUE io_wait_rescue(VALUE _arguments, VALUE exception) {
 	if (DEBUG) fprintf(stderr, "io_wait_rescue:io_uring_prep_poll_remove(%p)\n", (void*)arguments->fiber);
 	
 	io_uring_prep_poll_remove(sqe, (uintptr_t)arguments->fiber);
+	io_uring_sqe_set_data(sqe, NULL);
 	io_uring_submit_now(data);
 
 	rb_exc_raise(exception);
@@ -376,7 +377,7 @@ VALUE IO_Event_Selector_URing_io_wait(VALUE self, VALUE fiber, VALUE io, VALUE e
 	return rb_rescue(io_wait_transfer, (VALUE)&io_wait_arguments, io_wait_rescue, (VALUE)&io_wait_arguments);
 }
 
-#ifdef RUBY_FIBER_SCHEDULER_VERSION
+#ifdef HAVE_RUBY_IO_BUFFER_H
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(5,16,0)
 static inline off_t io_seekable(int descriptor) {
@@ -707,6 +708,8 @@ VALUE IO_Event_Selector_URing_wakeup(VALUE self) {
 		}
 		
 		io_uring_prep_nop(sqe);
+		// If you don't set this line, the SQE will eventually be recycled and have valid user data which can cause odd behaviour:
+		io_uring_sqe_set_data(sqe, NULL);
 		io_uring_submit(&data->ring);
 		
 		return Qtrue;
@@ -737,9 +740,11 @@ void Init_IO_Event_Selector_URing(VALUE IO_Event_Selector) {
 	rb_define_method(IO_Event_Selector_URing, "close", IO_Event_Selector_URing_close, 0);
 	
 	rb_define_method(IO_Event_Selector_URing, "io_wait", IO_Event_Selector_URing_io_wait, 3);
-
+	
+#ifdef HAVE_RUBY_IO_BUFFER_H
 	rb_define_method(IO_Event_Selector_URing, "io_read", IO_Event_Selector_URing_io_read_compatible, -1);
 	rb_define_method(IO_Event_Selector_URing, "io_write", IO_Event_Selector_URing_io_write_compatible, -1);
+#endif
 	
 	rb_define_method(IO_Event_Selector_URing, "io_close", IO_Event_Selector_URing_io_close, 1);
 	

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2022, by Samuel Williams.
+
+require 'io/nonblock'
+
+module IO::Event
+	module Selector
+		def self.nonblock(io, &block)
+			io.nonblock(&block)
+		end
+	end
+end

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

@@ -6,8 +6,6 @@
 require_relative '../interrupt'
 require_relative '../support'
 
-require 'io/nonblock'
-
 module IO::Event
 	module Selector
 		class Select
@@ -136,29 +134,35 @@ module IO::Event
 				waiter&.invalidate
 			end
 			
+			EAGAIN = -Errno::EAGAIN::Errno
+			EWOULDBLOCK = -Errno::EWOULDBLOCK::Errno
+			
+			def again?(errno)
+				errno == EAGAIN or errno == EWOULDBLOCK
+			end
+			
 			if Support.fiber_scheduler_v2?
-				EAGAIN = Errno::EAGAIN::Errno
-				
 				def io_read(fiber, io, buffer, length, offset = 0)
 					total = 0
-					io.nonblock = true
 					
-					while true
-						maximum_size = buffer.size - offset
-						result = Fiber.blocking{buffer.read(io, maximum_size, offset)}
-						
-						if result == -EAGAIN
-							if length > 0
-								self.io_wait(fiber, io, IO::READABLE)
-							else
+					Selector.nonblock(io) do
+						while true
+							maximum_size = buffer.size - offset
+							result = Fiber.blocking{buffer.read(io, maximum_size, offset)}
+							
+							if again?(result)
+								if length > 0
+									self.io_wait(fiber, io, IO::READABLE)
+								else
+									return result
+								end
+							elsif result < 0
 								return result
+							else
+								total += result
+								offset += result
+								break if total >= length
 							end
-						elsif result < 0
-							return result
-						else
-							total += result
-							offset += result
-							break if total >= length
 						end
 					end
 					
@@ -167,34 +171,34 @@ module IO::Event
 				
 				def io_write(fiber, io, buffer, length, offset = 0)
 					total = 0
-					io.nonblock = true
 					
-					while true
-						maximum_size = buffer.size - offset
-						result = Fiber.blocking{buffer.write(io, maximum_size, offset)}
-						
-						if result == -EAGAIN
-							if length > 0
-								self.io_wait(fiber, io, IO::READABLE)
-							else
+					Selector.nonblock(io) do
+						while true
+							maximum_size = buffer.size - offset
+							result = Fiber.blocking{buffer.write(io, maximum_size, offset)}
+							
+							if again?(result)
+								if length > 0
+									self.io_wait(fiber, io, IO::READABLE)
+								else
+									return result
+								end
+							elsif result < 0
 								return result
+							else
+								total += result
+								offset += result
+								break if total >= length
 							end
-						elsif result < 0
-							return result
-						else
-							total += result
-							offset += result
-							break if total >= length
 						end
 					end
 					
-					return offset
+					return total
 				end
 			elsif Support.fiber_scheduler_v1?
-				EAGAIN = Errno::EAGAIN::Errno
-				
 				def io_read(fiber, _io, buffer, length, offset = 0)
 					io = IO.for_fd(_io.fileno, autoclose: false)
+					total = 0
 					
 					while true
 						maximum_size = buffer.size - offset
@@ -204,13 +208,13 @@ module IO::Event
 							if length > 0
 								self.io_wait(fiber, io, IO::READABLE)
 							else
-								return -EAGAIN
+								return EWOULDBLOCK
 							end
 						when :wait_writable
 							if length > 0
 								self.io_wait(fiber, io, IO::WRITABLE)
 							else
-								return -EAGAIN
+								return EWOULDBLOCK
 							end
 						when nil
 							break
@@ -218,17 +222,19 @@ module IO::Event
 							buffer.set_string(result, offset)
 							
 							size = result.bytesize
+							total += size
 							offset += size
 							break if size >= length
 							length -= size
 						end
 					end
 					
-					return offset
+					return total
 				end
 				
 				def io_write(fiber, _io, buffer, length, offset = 0)
 					io = IO.for_fd(_io.fileno, autoclose: false)
+					total = 0
 					
 					while true
 						maximum_size = buffer.size - offset
@@ -239,22 +245,23 @@ module IO::Event
 							if length > 0
 								self.io_wait(fiber, io, IO::READABLE)
 							else
-								return -EAGAIN
+								return EWOULDBLOCK
 							end
 						when :wait_writable
 							if length > 0
 								self.io_wait(fiber, io, IO::WRITABLE)
 							else
-								return -EAGAIN
+								return EWOULDBLOCK
 							end
 						else
+							total += result
 							offset += result
 							break if result >= length
 							length -= result
 						end
 					end
 					
-					return offset
+					return total
 				end
 				
 				def blocking(&block)

data/lib/io/event/version.rb

@@ -5,6 +5,6 @@
 
 class IO
 	module Event
-		VERSION = "1.1.0"
+		VERSION = "1.1.2"
 	end
 end

data/lib/io/event.rb

@@ -10,5 +10,5 @@ begin
 	require 'IO_Event'
 rescue LoadError => error
 	warn "Could not load native event selector: #{error}"
-	# Ignore.
+	require_relative 'event/selector/nonblock'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: io-event
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Samuel Williams
@@ -41,7 +41,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2022-10-13 00:00:00.000000000 Z
+date: 2022-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bake
@@ -125,6 +125,7 @@ files:
 - lib/io/event/debug/selector.rb
 - lib/io/event/interrupt.rb
 - lib/io/event/selector.rb
+- lib/io/event/selector/nonblock.rb
 - lib/io/event/selector/select.rb
 - lib/io/event/support.rb
 - lib/io/event/version.rb