io-event 1.2.3 → 1.3.0

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

@@ -165,8 +165,8 @@ module IO::Event
 					total = 0
 					
 					Selector.nonblock(io) do
-						while true
-							maximum_size = buffer.size - offset
+						maximum_size = buffer.size - offset
+						while maximum_size > 0
 							result = Fiber.blocking{buffer.read(io, maximum_size, offset)}
 							
 							if again?(result)
@@ -182,6 +182,8 @@ module IO::Event
 								offset += result
 								break if total >= length
 							end
+							
+							maximum_size = buffer.size - offset
 						end
 					end
 					
@@ -192,8 +194,8 @@ module IO::Event
 					total = 0
 					
 					Selector.nonblock(io) do
-						while true
-							maximum_size = buffer.size - offset
+						maximum_size = buffer.size - offset
+						while maximum_size > 0
 							result = Fiber.blocking{buffer.write(io, maximum_size, offset)}
 							
 							if again?(result)
@@ -209,6 +211,8 @@ module IO::Event
 								offset += result
 								break if total >= length
 							end
+							
+							maximum_size = buffer.size - offset
 						end
 					end
 					
@@ -219,9 +223,8 @@ module IO::Event
 					io = IO.for_fd(_io.fileno, autoclose: false)
 					total = 0
 					
-					while true
-						maximum_size = buffer.size - offset
-						
+					maximum_size = buffer.size - offset
+					while maximum_size > 0
 						case result = blocking{io.read_nonblock(maximum_size, exception: false)}
 						when :wait_readable
 							if length > 0
@@ -246,6 +249,8 @@ module IO::Event
 							break if size >= length
 							length -= size
 						end
+						
+						maximum_size = buffer.size - offset
 					end
 					
 					return total
@@ -259,9 +264,8 @@ module IO::Event
 					io = IO.for_fd(_io.fileno, autoclose: false)
 					total = 0
 					
-					while true
-						maximum_size = buffer.size - offset
-						
+					maximum_size = buffer.size - offset
+					while maximum_size > 0
 						chunk = buffer.get_string(offset, maximum_size)
 						case result = blocking{io.write_nonblock(chunk, exception: false)}
 						when :wait_readable
@@ -282,6 +286,8 @@ module IO::Event
 							break if result >= length
 							length -= result
 						end
+						
+						maximum_size = buffer.size - offset
 					end
 					
 					return total
@@ -342,12 +348,26 @@ module IO::Event
 					end
 				end
 				
-				@blocked = true
 				duration = 0 unless @ready.empty?
-				readable, writable, priority = ::IO.select(readable, writable, priority, duration)
-				@blocked = false
+				error = nil
+				
+				# We need to handle interrupts on blocking IO. Every other implementation uses EINTR, but that doesn't work with `::IO.select` as it will retry the call on EINTR.
+				Thread.handle_interrupt(::Exception => :on_blocking) do
+					@blocked = true
+					readable, writable, priority = ::IO.select(readable, writable, priority, duration)
+				rescue ::Exception => error
+					# Requeue below...
+				ensure
+					@blocked = false
+				end
+				
+				if error
+					# Requeue the error into the pending exception queue:
+					Thread.current.raise(error)
+					return 0
+				end
 				
-				ready = Hash.new(0)
+				ready = Hash.new(0).compare_by_identity
 				
 				readable&.each do |io|
 					ready[io] |= IO::READABLE

data/lib/io/event/selector.rb

@@ -11,11 +11,7 @@ module IO::Event
 	module Selector
 		def self.default(env = ENV)
 			if name = env['IO_EVENT_SELECTOR']&.to_sym
-				if const_defined?(name)
-					return const_get(name)
-				else
-					warn "Could not find IO_EVENT_SELECTOR=#{name}!"
-				end
+				return const_get(name)
 			end
 			
 			if self.const_defined?(:URing)

data/lib/io/event/version.rb

@@ -5,6 +5,6 @@
 
 class IO
 	module Event
-		VERSION = "1.2.3"
+		VERSION = "1.3.0"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: io-event
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -42,7 +42,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2023-07-26 00:00:00.000000000 Z
+date: 2023-08-23 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -57,10 +57,12 @@ files:
 - ext/io/event/event.h
 - ext/io/event/interrupt.c
 - ext/io/event/interrupt.h
+- ext/io/event/selector/array.h
 - ext/io/event/selector/epoll.c
 - ext/io/event/selector/epoll.h
 - ext/io/event/selector/kqueue.c
 - ext/io/event/selector/kqueue.h
+- ext/io/event/selector/list.h
 - ext/io/event/selector/pidfd.c
 - ext/io/event/selector/selector.c
 - ext/io/event/selector/selector.h