io-event 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c19fdf43c5e63eb628c4ebb1feedcd048eac2e3ec4b83571f05bcb239eed9d02
-  data.tar.gz: 141749bc238099c65ebcc6db1d0d8b8ce1c3477e6e11a9f62e6c50572b9b6d84
+  metadata.gz: 02cbd4beff5335467997d91cbdc8e3bbf509947a15e2f36636b3e4e29b7cd91e
+  data.tar.gz: 9ca1138136d115d1fdfd4e41446f6f7b684de878ec6a7834f27a9ea6ba210896
 SHA512:
-  metadata.gz: c3da16be3fd6a0f98106f3e263ff2229e61a03bf5660fee1d3bb1bf6c191f1fd7475aabb85c8b5c29b25f6205816c728b42d68c74e4a123cea6810ac7be44b23
-  data.tar.gz: '026937a0ad18ba0f2783a8e8b8624177e8fbae34ca1a52eb2c5ccd59ae8231d4eea192fc3cc6b54d60e7d5d40d630f97754afa12e115f9ac44bd79caa9e52eee'
+  metadata.gz: 5fe958c76100f346101702b285b140bebe3a149525288cf8e83a1a1806a710928627e8c2d5ae4d8ec716836c264d6f645daa77b944ce1d59a5aaef6ac572e7aa
+  data.tar.gz: 9ce5953f7c6c3fba1e41e61fcc4ae7e24a294624a004fc532724fd49c707afc14a837359547df45611e0df6ab35e9d954e6f8e09eed748c845ad6ed8a6b61076

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

@@ -569,7 +569,6 @@ VALUE IO_Event_Selector_EPoll_io_write_compatible(int argc, VALUE *argv, VALUE s
 
 #endif
 
-#if defined(HAVE_EPOLL_PWAIT2)
 static
 struct timespec * make_timeout(VALUE duration, struct timespec * storage) {
 	if (duration == Qnil) {
@@ -600,31 +599,6 @@ static
 int timeout_nonblocking(struct timespec * timespec) {
 	return timespec && timespec->tv_sec == 0 && timespec->tv_nsec == 0;
 }
-#else
-static
-int make_timeout(VALUE duration) {
-	if (duration == Qnil) {
-		return -1;
-	}
-	
-	if (FIXNUM_P(duration)) {
-		return NUM2LONG(duration) * 1000L;
-	}
-	
-	else if (RB_FLOAT_TYPE_P(duration)) {
-		double value = RFLOAT_VALUE(duration);
-		
-		return value * 1000;
-	}
-	
-	rb_raise(rb_eRuntimeError, "unable to convert timeout");
-}
-
-static
-int timeout_nonblocking(int timeout) {
-	return timeout == 0;
-}
-#endif
 
 struct select_arguments {
 	struct IO_Event_Selector_EPoll *data;
@@ -632,24 +606,52 @@ struct select_arguments {
 	int count;
 	struct epoll_event events[EPOLL_MAX_EVENTS];
 
-#if defined(HAVE_EPOLL_PWAIT2)
 	struct timespec * timeout;
 	struct timespec storage;
-#else
-	int timeout;
-#endif
 };
 
+static int make_timeout_ms(struct timespec * timeout) {
+	if (timeout == NULL) {
+		return -1;
+	}
+	
+	if (timeout_nonblocking(timeout)) {
+		return 0;
+	}
+	
+	return (timeout->tv_sec * 1000) + (timeout->tv_nsec / 1000000);
+}
+
+static
+int enosys_error(int result) {
+	if (result == -1) {
+		return errno == ENOSYS;
+	}
+	
+	return 0;
+}
+
 static
 void * select_internal(void *_arguments) {
 	struct select_arguments * arguments = (struct select_arguments *)_arguments;
 	
 #if defined(HAVE_EPOLL_PWAIT2)
 	arguments->count = epoll_pwait2(arguments->data->descriptor, arguments->events, EPOLL_MAX_EVENTS, arguments->timeout, NULL);
-#else
-	arguments->count = epoll_wait(arguments->data->descriptor, arguments->events, EPOLL_MAX_EVENTS, arguments->timeout);
+	
+	// Comment out the above line and enable the below lines to test ENOSYS code path.
+	// arguments->count = -1;
+	// errno = ENOSYS;
+	
+	if (!enosys_error(arguments->count)) {
+		return NULL;
+	}
+	else {
+		// Fall through and execute epoll_wait fallback.
+	}
 #endif
 	
+	arguments->count = epoll_wait(arguments->data->descriptor, arguments->events, EPOLL_MAX_EVENTS, make_timeout_ms(arguments->timeout));
+	
 	return NULL;
 }
 
@@ -689,20 +691,14 @@ VALUE IO_Event_Selector_EPoll_select(VALUE self, VALUE duration) {
 	
 	struct select_arguments arguments = {
 		.data = data,
-#if defined(HAVE_EPOLL_PWAIT2)
 		.storage = {
 			.tv_sec = 0,
 			.tv_nsec = 0
-		}
-#else
-		.timeout = 0
-#endif
+		},
 	};
-	
-#if defined(HAVE_EPOLL_PWAIT2)
+
 	arguments.timeout = &arguments.storage;
-#endif
-	
+
 	// Process any currently pending events:
 	select_internal_with_gvl(&arguments);
 	
@@ -712,11 +708,7 @@ VALUE IO_Event_Selector_EPoll_select(VALUE self, VALUE duration) {
 	// 3. There are no items in the ready list,
 	// then we can perform a blocking select.
 	if (!ready && !arguments.count && !data->backend.ready) {
-#if defined(HAVE_EPOLL_PWAIT2)
 		arguments.timeout = make_timeout(duration, &arguments.storage);
-#else
-		arguments.timeout = make_timeout(duration);
-#endif
 		
 		if (!timeout_nonblocking(arguments.timeout)) {
 			// Wait for events to occur

data/lib/io/event/version.rb

@@ -5,6 +5,6 @@
 
 class IO
 	module Event
-		VERSION = "1.2.0"
+		VERSION = "1.2.1"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: io-event
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Samuel Williams
@@ -41,7 +41,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2023-04-30 00:00:00.000000000 Z
+date: 2023-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bake
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.7
 signing_key:
 specification_version: 4
 summary: An event loop.