io-event 1.4.3 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48833d95b36913a471c49a15933705c021582488d4f0a83ab26b2cc08a39b092
-  data.tar.gz: c2ad33420135a7a72315e71362b4663503bf6bc8c6561cf4416bfc8e42f5398c
+  metadata.gz: aa82f1290f00aaf8cadbae8346653a4291f2e14d4ffec326972507ee69859720
+  data.tar.gz: aaed781d30c999d4cab7be1b3e4056e339d55256802b7c12c9d66fd46d64dcce
 SHA512:
-  metadata.gz: ebc42847281fc77b058ab6b66c582ea7b58889eb28739c0d25f252b76c037d6341d53b06695595eae413fe67b1f9d10f564c110f01b379ccd10cc628a92e309c
-  data.tar.gz: a6d0dc1b314cc5c05e5284bfd5d981436ae932bc399355c4cd9d1e9f2ea033c794d4f526c23de64cfbb9f7df5f39058e2511b79fcaebaeec0365c1a5aca919f6
+  metadata.gz: fa1d7ee55e1af2a88d377366b8322a88fddd3c6d918edbcd636ce032e9bcfe98200fae4eb2ff192cbd8c469502a6390f6422ab210bfcd115adff666f6dcd9ca0
+  data.tar.gz: c0e15ecb8c57b9b7d19bf0a4ab7d56b34da728b53608b767d11ae468eadb086237058e75586bc146caac11883197f3cbf9ed491dc86c6e95dc2f3b6e77930a53

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

@@ -59,6 +59,8 @@ struct IO_Event_Selector_EPoll
 	int descriptor;
 	int blocked;
 	
+	struct timespec idle_duration;
+	
 	struct IO_Event_Interrupt interrupt;
 	struct IO_Event_Array descriptors;
 };
@@ -384,6 +386,15 @@ VALUE IO_Event_Selector_EPoll_loop(VALUE self) {
 	return selector->backend.loop;
 }
 
+VALUE IO_Event_Selector_EPoll_idle_duration(VALUE self) {
+	struct IO_Event_Selector_EPoll *selector = NULL;
+	TypedData_Get_Struct(self, struct IO_Event_Selector_EPoll, &IO_Event_Selector_EPoll_Type, selector);
+	
+	double duration = selector->idle_duration.tv_sec + (selector->idle_duration.tv_nsec / 1000000000.0);
+	
+	return DBL2NUM(duration);
+}
+
 VALUE IO_Event_Selector_EPoll_close(VALUE self) {
 	struct IO_Event_Selector_EPoll *selector = NULL;
 	TypedData_Get_Struct(self, struct IO_Event_Selector_EPoll, &IO_Event_Selector_EPoll_Type, selector);
@@ -966,6 +977,9 @@ VALUE IO_Event_Selector_EPoll_select(VALUE self, VALUE duration) {
 	struct IO_Event_Selector_EPoll *selector = NULL;
 	TypedData_Get_Struct(self, struct IO_Event_Selector_EPoll, &IO_Event_Selector_EPoll_Type, selector);
 	
+	selector->idle_duration.tv_sec = 0;
+	selector->idle_duration.tv_nsec = 0;
+	
 	int ready = IO_Event_Selector_queue_flush(&selector->backend);
 	
 	struct select_arguments arguments = {
@@ -991,8 +1005,15 @@ VALUE IO_Event_Selector_EPoll_select(VALUE self, VALUE duration) {
 		arguments.timeout = make_timeout(duration, &arguments.storage);
 		
 		if (!timeout_nonblocking(arguments.timeout)) {
-			// Wait for events to occur
+			struct timespec start_time;
+			IO_Event_Selector_current_time(&start_time);
+			
+			// Wait for events to occur:
 			select_internal_without_gvl(&arguments);
+			
+			struct timespec end_time;
+			IO_Event_Selector_current_time(&end_time);
+			IO_Event_Selector_elapsed_time(&start_time, &end_time, &selector->idle_duration);
 		}
 	}
 	
@@ -1025,6 +1046,7 @@ void Init_IO_Event_Selector_EPoll(VALUE IO_Event_Selector) {
 	rb_define_method(IO_Event_Selector_EPoll, "initialize", IO_Event_Selector_EPoll_initialize, 1);
 	
 	rb_define_method(IO_Event_Selector_EPoll, "loop", IO_Event_Selector_EPoll_loop, 0);
+	rb_define_method(IO_Event_Selector_EPoll, "idle_duration", IO_Event_Selector_EPoll_idle_duration, 0);
 	
 	rb_define_method(IO_Event_Selector_EPoll, "transfer", IO_Event_Selector_EPoll_transfer, 0);
 	rb_define_method(IO_Event_Selector_EPoll, "resume", IO_Event_Selector_EPoll_resume, -1);

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

@@ -68,6 +68,8 @@ struct IO_Event_Selector_KQueue
 	int descriptor;
 	int blocked;
 	
+	struct timespec idle_duration;
+	
 #ifdef IO_EVENT_SELECTOR_KQUEUE_USE_INTERRUPT
 	struct IO_Event_Interrupt interrupt;
 #endif
@@ -367,6 +369,15 @@ VALUE IO_Event_Selector_KQueue_loop(VALUE self) {
 	return selector->backend.loop;
 }
 
+VALUE IO_Event_Selector_KQueue_idle_duration(VALUE self) {
+	struct IO_Event_Selector_KQueue *selector = NULL;
+	TypedData_Get_Struct(self, struct IO_Event_Selector_EPoll, &IO_Event_Selector_KQueue_Type, selector);
+	
+	double duration = selector->idle_duration.tv_sec + (selector->idle_duration.tv_nsec / 1000000000.0);
+	
+	return DBL2NUM(duration);
+}
+
 VALUE IO_Event_Selector_KQueue_close(VALUE self) {
 	struct IO_Event_Selector_KQueue *selector = NULL;
 	TypedData_Get_Struct(self, struct IO_Event_Selector_KQueue, &IO_Event_Selector_KQueue_Type, selector);
@@ -949,6 +960,9 @@ VALUE IO_Event_Selector_KQueue_select(VALUE self, VALUE duration) {
 	struct IO_Event_Selector_KQueue *selector = NULL;
 	TypedData_Get_Struct(self, struct IO_Event_Selector_KQueue, &IO_Event_Selector_KQueue_Type, selector);
 	
+	selector->idle_duration.tv_sec = 0;
+	selector->idle_duration.tv_nsec = 0;
+	
 	int ready = IO_Event_Selector_queue_flush(&selector->backend);
 	
 	struct select_arguments arguments = {
@@ -985,8 +999,15 @@ VALUE IO_Event_Selector_KQueue_select(VALUE self, VALUE duration) {
 		if (!timeout_nonblocking(arguments.timeout)) {
 			arguments.count = KQUEUE_MAX_EVENTS;
 			
+			struct timespec start_time;
+			IO_Event_Selector_current_time(&start_time);
+			
 			if (DEBUG) fprintf(stderr, "IO_Event_Selector_KQueue_select timeout=" PRINTF_TIMESPEC "\n", PRINTF_TIMESPEC_ARGS(arguments.storage));
 			select_internal_without_gvl(&arguments);
+			
+			struct timespec end_time;
+			IO_Event_Selector_current_time(&end_time);
+			IO_Event_Selector_elapsed_time(&start_time, &end_time, &selector->idle_duration);
 		}
 	}
 	
@@ -1041,6 +1062,7 @@ void Init_IO_Event_Selector_KQueue(VALUE IO_Event_Selector) {
 	rb_define_method(IO_Event_Selector_KQueue, "initialize", IO_Event_Selector_KQueue_initialize, 1);
 	
 	rb_define_method(IO_Event_Selector_KQueue, "loop", IO_Event_Selector_KQueue_loop, 0);
+	rb_define_method(IO_Event_Selector_KQueue, "idle_duration", IO_Event_Selector_KQueue_idle_duration, 0);
 	
 	rb_define_method(IO_Event_Selector_KQueue, "transfer", IO_Event_Selector_KQueue_transfer, 0);
 	rb_define_method(IO_Event_Selector_KQueue, "resume", IO_Event_Selector_KQueue_resume, -1);

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

@@ -82,7 +82,7 @@ int IO_Event_Selector_nonblock_set(int file_descriptor)
 {
 #ifdef _WIN32
 	u_long nonblock = 1;
-	int result = ioctlsocket(file_descriptor, FIONBIO, &nonblock);
+	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
@@ -103,7 +103,7 @@ 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);
+	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)) {

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

@@ -34,7 +34,9 @@
 #endif
 
 #include <time.h>
-#include <sys/wait.h>
+#ifdef HAVE_RB_PROCESS_STATUS_WAIT
+  #include <sys/wait.h>
+#endif
 
 enum IO_Event {
 	IO_EVENT_READABLE = 1,

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

@@ -50,6 +50,8 @@ struct IO_Event_Selector_URing
 	size_t pending;
 	int blocked;
 	
+	struct timespec idle_duration;
+	
 	struct IO_Event_Array completions;
 	struct IO_Event_List free_list;
 };
@@ -266,6 +268,15 @@ VALUE IO_Event_Selector_URing_loop(VALUE self) {
 	return selector->backend.loop;
 }
 
+VALUE IO_Event_Selector_URing_idle_duration(VALUE self) {
+	struct IO_Event_Selector_URing *selector = NULL;
+	TypedData_Get_Struct(self, struct IO_Event_Selector_URing, &IO_Event_Selector_URing_Type, selector);
+	
+	double duration = selector->idle_duration.tv_sec + (selector->idle_duration.tv_nsec / 1000000000.0);
+	
+	return DBL2NUM(duration);
+}
+
 VALUE IO_Event_Selector_URing_close(VALUE self) {
 	struct IO_Event_Selector_URing *selector = NULL;
 	TypedData_Get_Struct(self, struct IO_Event_Selector_URing, &IO_Event_Selector_URing_Type, selector);
@@ -1009,6 +1020,9 @@ VALUE IO_Event_Selector_URing_select(VALUE self, VALUE duration) {
 	struct IO_Event_Selector_URing *selector = NULL;
 	TypedData_Get_Struct(self, struct IO_Event_Selector_URing, &IO_Event_Selector_URing_Type, selector);
 	
+	selector->idle_duration.tv_sec = 0;
+	selector->idle_duration.tv_nsec = 0;
+	
 	// Flush any pending events:
 	io_uring_submit_flush(selector);
 	
@@ -1031,9 +1045,16 @@ VALUE IO_Event_Selector_URing_select(VALUE self, VALUE duration) {
 		arguments.timeout = make_timeout(duration, &arguments.storage);
 		
 		if (!selector->backend.ready && !timeout_nonblocking(arguments.timeout)) {
+			struct timespec start_time;
+			IO_Event_Selector_current_time(&start_time);
+			
 			// This is a blocking operation, we wait for events:
 			result = select_internal_without_gvl(&arguments);
 			
+			struct timespec end_time;
+			IO_Event_Selector_current_time(&end_time);
+			IO_Event_Selector_elapsed_time(&start_time, &end_time, &selector->idle_duration);
+			
 			// After waiting/flushing the SQ, check if there are any completions:
 			if (result > 0) {
 				result = select_process_completions(selector);
@@ -1083,6 +1104,7 @@ void Init_IO_Event_Selector_URing(VALUE IO_Event_Selector) {
 	rb_define_method(IO_Event_Selector_URing, "initialize", IO_Event_Selector_URing_initialize, 1);
 	
 	rb_define_method(IO_Event_Selector_URing, "loop", IO_Event_Selector_URing_loop, 0);
+	rb_define_method(IO_Event_Selector_URing, "idle_duration", IO_Event_Selector_URing_idle_duration, 0);
 	
 	rb_define_method(IO_Event_Selector_URing, "transfer", IO_Event_Selector_URing_transfer, 0);
 	rb_define_method(IO_Event_Selector_URing, "resume", IO_Event_Selector_URing_resume, -1);

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2021-2022, by Samuel Williams.
+# Copyright, 2021-2024, by Samuel Williams.
 
 require_relative '../support'
 
@@ -33,6 +33,10 @@ module IO::Event
 				@log = log
 			end
 			
+			def idle_duration
+				@selector.idle_duration
+			end
+			
 			def now
 				Process.clock_gettime(Process::CLOCK_MONOTONIC)
 			end

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

@@ -19,10 +19,15 @@ module IO::Event
 				
 				@ready = Queue.new
 				@interrupt = Interrupt.attach(self)
+				
+				@idle_duration = 0.0
 			end
 			
 			attr :loop
 			
+			# This is the amount of time the event loop was idle during the last select call.
+			attr :idle_duration
+			
 			# If the event loop is currently sleeping, wake it up.
 			def wakeup
 				if @blocked
@@ -415,6 +420,10 @@ module IO::Event
 				duration = 0 unless @ready.empty?
 				error = nil
 				
+				if duration && duration > 0.0
+					start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+				end
+				
 				# 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
@@ -423,6 +432,10 @@ module IO::Event
 					# Requeue below...
 				ensure
 					@blocked = false
+					if start_time
+						end_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+						@idle_duration = end_time - start_time
+					end
 				end
 				
 				if error

data/lib/io/event/selector.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2021-2023, by Samuel Williams.
+# Copyright, 2021-2024, by Samuel Williams.
 
 require_relative 'selector/select'
 require_relative 'debug/selector'

data/lib/io/event/version.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2021-2023, by Samuel Williams.
+# Copyright, 2021-2024, by Samuel Williams.
 
 class IO
 	module Event
-		VERSION = "1.4.3"
+		VERSION = "1.5.0"
 	end
 end

data/license.md

@@ -1,11 +1,12 @@
 # MIT License
 
-Copyright, 2021-2023, by Samuel Williams.  
+Copyright, 2021-2024, by Samuel Williams.  
 Copyright, 2021, by Delton Ding.  
-Copyright, 2021, by Benoit Daloze.  
+Copyright, 2021-2024, by Benoit Daloze.  
 Copyright, 2022, by Alex Matchneer.  
 Copyright, 2022, by Bruno Sutic.  
 Copyright, 2023, by Math Ieu.  
+Copyright, 2024, by Pavel Rosický.  
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: io-event
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.5.0
 platform: ruby
 authors:
 - Samuel Williams
 - Math Ieu
+- Benoit Daloze
 - Bruno Sutic
 - Alex Matchneer
-- Benoit Daloze
 - Delton Ding
+- Pavel Rosický
 autorequire:
 bindir: bin
 cert_chain:
@@ -42,7 +43,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-02-05 00:00:00.000000000 Z
+date: 2024-03-04 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -97,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.5
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: An event loop.