io-event 1.4.0 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f53f20e456a5b4a5ef56e4293e9f8f080e30c16b6d3cd7022d7d8da22ebfe84
-  data.tar.gz: cf6186d1eef0725483af5a47141dbf50bd6bcc96513bfd528c35dc693f4d7db2
+  metadata.gz: a0dd172aa1e65b9163bea2a39c1294f147c21eddcd22b3bd9439431329d8dd66
+  data.tar.gz: bdc9e0a4fc251b721f3cbdd06350f82f17b07a2e8d114ce68ec998c88e5993ef
 SHA512:
-  metadata.gz: ff231970a60cedcec409eb1294de3c6a29eff82440bab558cc3618fc537b5461fb4514fbdc401d9a21630193a8ab293529579c191dc5d446c5eb45eccc3c4d4b
-  data.tar.gz: 73a8a5cc5eb62fdc231b2d45c6591e367758ebb0e48a6a179a91877a08d6f0b9cd86ecf8c179ddab5f1cb81c0b05c9c8c345e0983de3e866ad420e189f7bbc4f
+  metadata.gz: 3beab3c2611dce16f10ec3045adad764b5c4ae67ac406ef9440a892d3d2eccac1cb9981d6bf5a027b19fdc665387a7b7b22b0144f595bf00beae44c9a3c83188
+  data.tar.gz: 33a62cc1ca97e50a6637baff60fd7a46d4003b81f66266496e3535fa4c732f07179ddbd920f7b97e25f43cc21e8394641db76d0b5ea8c16ee77c0d2619d085b5

data/ext/io/event/event.h

@@ -22,8 +22,6 @@
 
 #include <ruby.h>
 
-#include "extconf.h"
-
 void Init_IO_Event(void);
 
 #ifdef HAVE_LIBURING_H

data/ext/io/event/interrupt.h

@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include "extconf.h"
+#include <ruby.h>
 
 #ifdef HAVE_SYS_EVENTFD_H
 struct IO_Event_Interrupt {

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

@@ -3,6 +3,7 @@
 
 // Provides a simple implementation of unique pointers to elements of the given size.
 
+#include <ruby.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <assert.h>

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

@@ -18,7 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#include "kqueue.h"
+#include "epoll.h"
 #include "selector.h"
 #include "list.h"
 #include "array.h"

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

@@ -1,6 +1,7 @@
 // Released under the MIT License.
 // Copyright, 2023, by Samuel Williams.
 
+#include <ruby.h>
 #include <stdio.h>
 #include <assert.h>
 

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

@@ -18,6 +18,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#include <ruby.h>
+
 #include <sys/types.h>
 #include <sys/syscall.h>
 #include <unistd.h>

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

@@ -602,7 +602,7 @@ 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.
+#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) {

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

@@ -9,7 +9,17 @@ module IO::Event
 	module Debug
 		# Enforces the selector interface and delegates operations to a wrapped selector instance.
 		class Selector
-			def initialize(selector)
+			def self.wrap(selector, env = ENV)
+				log = nil
+				
+				if log_path = env['IO_EVENT_DEBUG_SELECTOR_LOG']
+					log = File.open(log_path, 'w')
+				end
+				
+				return self.new(selector, log: log)
+			end
+			
+			def initialize(selector, log: nil)
 				@selector = selector
 				
 				@readable = {}
@@ -19,6 +29,20 @@ module IO::Event
 				unless Fiber.current == selector.loop
 					Kernel::raise "Selector must be initialized on event loop fiber!"
 				end
+				
+				@log = log
+			end
+			
+			def now
+				Process.clock_gettime(Process::CLOCK_MONOTONIC)
+			end
+			
+			def log(message)
+				return unless @log
+				
+				Fiber.blocking do
+					@log.puts("T+%10.1f; %s" % [now, message])
+				end
 			end
 			
 			def wakeup
@@ -26,6 +50,8 @@ module IO::Event
 			end
 			
 			def close
+				log("Closing selector")
+				
 				if @selector.nil?
 					Kernel::raise "Selector already closed!"
 				end
@@ -36,22 +62,27 @@ module IO::Event
 			
 			# Transfer from the calling fiber to the event loop.
 			def transfer
+				log("Transfering to event loop")
 				@selector.transfer
 			end
 			
 			def resume(*arguments)
+				log("Resuming fiber with #{arguments.inspect}")
 				@selector.resume(*arguments)
 			end
 			
 			def yield
+				log("Yielding to event loop")
 				@selector.yield
 			end
 			
 			def push(fiber)
+				log("Pushing fiber #{fiber.inspect} to ready list")
 				@selector.push(fiber)
 			end
 			
 			def raise(fiber, *arguments)
+				log("Raising exception on fiber #{fiber.inspect} with #{arguments.inspect}")
 				@selector.raise(fiber, *arguments)
 			end
 			
@@ -60,19 +91,23 @@ module IO::Event
 			end
 			
 			def process_wait(*arguments)
+				log("Waiting for process with #{arguments.inspect}")
 				@selector.process_wait(*arguments)
 			end
 			
 			def io_wait(fiber, io, events)
+				log("Waiting for IO #{io.inspect} for events #{events.inspect}")
 				@selector.io_wait(fiber, io, events)
 			end
 			
-			def io_read(...)
-				@selector.io_read(...)
+			def io_read(fiber, io, buffer, length, offset = 0)
+				log("Reading from IO #{io.inspect} with buffer #{buffer}; length #{length} offset #{offset}")
+				@selector.io_read(fiber, io, buffer, length, offset)
 			end
 			
-			def io_write(...)
-				@selector.io_write(...)
+			def io_write(fiber, io, buffer, length, offset = 0)
+				log("Writing to IO #{io.inspect} with buffer #{buffer}; length #{length} offset #{offset}")
+				@selector.io_write(fiber, io, buffer, length, offset)
 			end
 			
 			def respond_to?(name, include_private = false)
@@ -80,6 +115,7 @@ module IO::Event
 			end
 			
 			def select(duration = nil)
+				log("Selecting for #{duration.inspect}")
 				unless Fiber.current == @selector.loop
 					Kernel::raise "Selector must be run on event loop fiber!"
 				end

data/lib/io/event/selector.rb

@@ -29,7 +29,7 @@ module IO::Event
 			selector = default(env).new(loop)
 			
 			if debug = env['IO_EVENT_DEBUG_SELECTOR']
-				selector = Debug::Selector.new(selector)
+				selector = Debug::Selector.wrap(selector, env)
 			end
 			
 			return selector

data/lib/io/event/version.rb

@@ -5,6 +5,6 @@
 
 class IO
 	module Event
-		VERSION = "1.4.0"
+		VERSION = "1.4.2"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: io-event
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.2
 platform: ruby
 authors:
 - Samuel Williams
@@ -42,7 +42,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2023-12-28 00:00:00.000000000 Z
+date: 2024-01-15 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: An event loop.