io-event 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea935760f7d99c16037d0737c0b67e7fa7f407f502e3035abced4396d4d90ca5
-  data.tar.gz: 28c4387ae3ad0dec06a0bbd13de4db04a0277b826a500a2fa12840dc2fb7ce9f
+  metadata.gz: 45049c22b990de175e733bdcce4045d7c4028dd50fa8018ec03b76ec76bfe1f2
+  data.tar.gz: 250555adf9d939804cc19f050e8cc42d9f2848e90f75cbcf46abc6543a67dbf1
 SHA512:
-  metadata.gz: 4423aa96cfda0606a089d920459f4a2011ea40b0f32680f729a72d0ff253c946a0e01251eb18e15c35e95813aa3df34fe8d99fe2f8dee1027041c858f2adc1be
-  data.tar.gz: 53a942a3af8f56f1a029777917a0198555355382837c91f5f754a2d8b73a9ada750d605c524fbc9fd0c544e35c527e1d240a1c078b3299258656980feffa11c7
+  metadata.gz: ed43ce7a15045fbad357e4e8b6eb176635ebd4148a2d3a5c229cc9af6c246f3d5bd0c8a80969f0a487fac468365b040888ef1e104275e0c82ef2397923bd24e3
+  data.tar.gz: 7d36cf2bb3f8dbdddba94564057b767415ff8da2884c8810c2b88e5dae1162a5f17f7bc538a8f766e1be6c6fb14e0fd213f08182b8e8e29e1fea77292dc8f37d

data/ext/extconf.rb

@@ -39,6 +39,8 @@ if have_header('sys/event.h')
 	$srcs << "io/event/selector/kqueue.c"
 end
 
+have_header('sys/wait.h')
+
 have_header('sys/eventfd.h')
 $srcs << "io/event/interrupt.c"
 

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

@@ -786,14 +786,7 @@ struct timespec * make_timeout(VALUE duration, struct timespec * storage) {
 		return NULL;
 	}
 	
-	if (FIXNUM_P(duration)) {
-		storage->tv_sec = NUM2TIMET(duration);
-		storage->tv_nsec = 0;
-		
-		return storage;
-	}
-	
-	else if (RB_FLOAT_TYPE_P(duration)) {
+	if (RB_FLOAT_TYPE_P(duration)) {
 		double value = RFLOAT_VALUE(duration);
 		time_t seconds = value;
 		
@@ -803,6 +796,13 @@ struct timespec * make_timeout(VALUE duration, struct timespec * storage) {
 		return storage;
 	}
 	
+	else if (RB_INTEGER_TYPE_P(duration)) {
+		storage->tv_sec = NUM2TIMET(duration);
+		storage->tv_nsec = 0;
+		
+		return storage;
+	}
+	
 	rb_raise(rb_eArgError, "unable to convert timeout: %"PRIsVALUE, rb_inspect(duration));
 }
 

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

@@ -799,14 +799,7 @@ struct timespec * make_timeout(VALUE duration, struct timespec * storage) {
 		return NULL;
 	}
 	
-	if (FIXNUM_P(duration)) {
-		storage->tv_sec = NUM2TIMET(duration);
-		storage->tv_nsec = 0;
-		
-		return storage;
-	}
-	
-	else if (RB_FLOAT_TYPE_P(duration)) {
+	if (RB_FLOAT_TYPE_P(duration)) {
 		double value = RFLOAT_VALUE(duration);
 		time_t seconds = value;
 		
@@ -816,6 +809,13 @@ struct timespec * make_timeout(VALUE duration, struct timespec * storage) {
 		return storage;
 	}
 	
+	else if (RB_INTEGER_TYPE_P(duration)) {
+		storage->tv_sec = NUM2TIMET(duration);
+		storage->tv_nsec = 0;
+		
+		return storage;
+	}
+	
 	rb_raise(rb_eArgError, "unable to convert timeout: %"PRIsVALUE, rb_inspect(duration));
 }
 

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

@@ -34,8 +34,9 @@
 #endif
 
 #include <time.h>
-#ifdef HAVE_RB_PROCESS_STATUS_WAIT
-  #include <sys/wait.h>
+
+#ifdef HAVE_SYS_WAIT_H
+#include <sys/wait.h>
 #endif
 
 enum IO_Event {

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

@@ -901,14 +901,7 @@ struct __kernel_timespec * make_timeout(VALUE duration, struct __kernel_timespec
 		return NULL;
 	}
 	
-	if (FIXNUM_P(duration)) {
-		storage->tv_sec = NUM2TIMET(duration);
-		storage->tv_nsec = 0;
-		
-		return storage;
-	}
-	
-	else if (RB_FLOAT_TYPE_P(duration)) {
+	if (RB_FLOAT_TYPE_P(duration)) {
 		double value = RFLOAT_VALUE(duration);
 		time_t seconds = value;
 		
@@ -918,6 +911,13 @@ struct __kernel_timespec * make_timeout(VALUE duration, struct __kernel_timespec
 		return storage;
 	}
 	
+	else if (RB_INTEGER_TYPE_P(duration)) {
+		storage->tv_sec = NUM2TIMET(duration);
+		storage->tv_nsec = 0;
+		
+		return storage;
+	}
+	
 	rb_raise(rb_eArgError, "unable to convert timeout: %"PRIsVALUE, rb_inspect(duration));
 }
 

data/lib/io/event/timers.rb

@@ -9,20 +9,20 @@ class IO
 	module Event
 		class Timers
 			class Handle
-				def initialize(offset, block)
-					@offset = offset
+				def initialize(time, block)
+					@time = time
 					@block = block
 				end
 				
 				def < other
-					@offset < other.offset
+					@time < other.time
 				end
 				
 				def > other
-					@offset > other.offset
+					@time > other.time
 				end
 				
-				attr :offset
+				attr :time
 				attr :block
 				
 				def call(...)
@@ -49,15 +49,19 @@ class IO
 				return @heap.size
 			end
 			
-			def schedule(offset, block)
-				handle = Handle.new(offset, block)
+			# Schedule a block to be called at a specific time in the future.
+			# @parameter time [Time] The time at which the block should be called, relative to {#now}.
+			def schedule(time, block)
+				handle = Handle.new(time, block)
 				@scheduled << handle
 				
 				return handle
 			end
 			
-			def after(timeout, &block)
-				schedule(now + timeout, block)
+			# Schedule a block to be called after a specific time offset, relative to the current time as returned by {#now}.
+			# @parameter offset [Time] The time offset from the current time at which the block should be called.
+			def after(offset, &block)
+				schedule(self.now + offset, block)
 			end
 			
 			def wait_interval(now = self.now)
@@ -67,7 +71,7 @@ class IO
 					if handle.cancelled?
 						@heap.pop
 					else
-						return handle.offset - now
+						return handle.time - now
 					end
 				end
 			end
@@ -84,7 +88,7 @@ class IO
 				while handle = @heap.peek
 					if handle.cancelled?
 						@heap.pop
-					elsif handle.offset <= now
+					elsif handle.time <= now
 						# Remove the earliest timer from the heap:
 						@heap.pop
 						

data/lib/io/event/version.rb

@@ -5,6 +5,6 @@
 
 class IO
 	module Event
-		VERSION = "1.6.1"
+		VERSION = "1.6.2"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: io-event
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Samuel Williams