event 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62bded3e0e8e8929ef5f76b427a975f1444c215d3566423e17b6aecdcbbb1f0b
-  data.tar.gz: 6c241f562c00af271443406efa52c935f84fb6b30023b4c7086a8c4ee5b7b965
+  metadata.gz: 3d1a02b3163aca45dcdb7ac4f3589e18894c3e753262d7934ea0f473c88e2a38
+  data.tar.gz: fac7fd3d48e616e1c03ca9cb6af19b8457c4dadb452261bb1f4b628d70297bcb
 SHA512:
-  metadata.gz: 75b5af033d60eb53df18b9b6fe9805827ccd4bfef0f4e26943428ddb4aee43006ce4eb12897102d33d50b31834c7bbd0be70821f2bcd6fe30cab5a657839321a
-  data.tar.gz: 57d719b1318c0740c58df4476ffb44719c8ded66d78889eeb60e15aead7d86e9778ad464a460dda4a2318f3435450e43778873aac8ea7a9c0150c37f828b4646
+  metadata.gz: 54c8d94a288dc450decd427c2bd7af850b635133b90ca25ee15f4f934c3e9b78cd8465402d1fabb9c4bae8ae3b7fef8c1849567e23303601a2bca4dfefc9acf3
+  data.tar.gz: 757e2b00714ace1767d732ab37c93372bd44d14da4911f46190b8ba0efcb1ba249743509fc3c68e957c4b24804ddd35a844257b81e279de0f3fd487d1058015e

data/ext/event/event.c

@@ -26,9 +26,9 @@ VALUE Event_Selector = Qnil;
 
 void Init_event()
 {
-	#ifdef HAVE_RB_EXT_RACTOR_SAFE
+#ifdef HAVE_RB_EXT_RACTOR_SAFE
 	rb_ext_ractor_safe(true);
-	#endif
+#endif
 	
 	Event = rb_define_module("Event");
 	Event_Selector = rb_define_module_under(Event, "Selector");

data/ext/event/extconf.rb

@@ -33,6 +33,7 @@ $CFLAGS << " -Wall"
 $srcs = ["event.c", "selector/selector.c"]
 $VPATH << "$(srcdir)/selector"
 
+have_func('rb_ext_ractor_safe')
 have_func('&rb_fiber_transfer')
 
 if have_library('uring') and have_header('liburing.h')
@@ -49,6 +50,7 @@ end
 
 have_func("rb_io_descriptor")
 have_func("&rb_process_status_wait")
+have_func('rb_fiber_current')
 have_func("&rb_fiber_raise")
 
 have_header('ruby/io/buffer.h')

data/ext/event/selector/epoll.c

@@ -112,12 +112,12 @@ VALUE Event_Selector_EPoll_close(VALUE self) {
 	return Qnil;
 }
 
-VALUE Event_Selector_EPoll_transfer(int argc, VALUE *argv, VALUE self)
+VALUE Event_Selector_EPoll_resume(int argc, VALUE *argv, VALUE self)
 {
 	struct Event_Selector_EPoll *data = NULL;
 	TypedData_Get_Struct(self, struct Event_Selector_EPoll, &Event_Selector_EPoll_Type, data);
 	
-	Event_Selector_wait_and_transfer(&data->backend, argc, argv);
+	Event_Selector_resume(&data->backend, argc, argv);
 	
 	return Qnil;
 }
@@ -550,7 +550,7 @@ void Init_Event_Selector_EPoll(VALUE Event_Selector) {
 	rb_define_alloc_func(Event_Selector_EPoll, Event_Selector_EPoll_allocate);
 	rb_define_method(Event_Selector_EPoll, "initialize", Event_Selector_EPoll_initialize, 1);
 	
-	rb_define_method(Event_Selector_EPoll, "transfer", Event_Selector_EPoll_transfer, -1);
+	rb_define_method(Event_Selector_EPoll, "resume", Event_Selector_EPoll_resume, -1);
 	rb_define_method(Event_Selector_EPoll, "yield", Event_Selector_EPoll_yield, 0);
 	rb_define_method(Event_Selector_EPoll, "push", Event_Selector_EPoll_push, 1);
 	rb_define_method(Event_Selector_EPoll, "raise", Event_Selector_EPoll_raise, -1);

data/ext/event/selector/kqueue.c

@@ -112,12 +112,12 @@ VALUE Event_Selector_KQueue_close(VALUE self) {
 	return Qnil;
 }
 
-VALUE Event_Selector_KQueue_transfer(int argc, VALUE *argv, VALUE self)
+VALUE Event_Selector_KQueue_resume(int argc, VALUE *argv, VALUE self)
 {
 	struct Event_Selector_KQueue *data = NULL;
 	TypedData_Get_Struct(self, struct Event_Selector_KQueue, &Event_Selector_KQueue_Type, data);
 	
-	return Event_Selector_wait_and_transfer(&data->backend, argc, argv);
+	return Event_Selector_resume(&data->backend, argc, argv);
 }
 
 VALUE Event_Selector_KQueue_yield(VALUE self)
@@ -379,7 +379,7 @@ VALUE io_read_loop(VALUE _arguments) {
 			offset += result;
 			length -= result;
 		} else if (errno == EAGAIN || errno == EWOULDBLOCK) {
-			Event_Selector_KQueue_io_wait(arguments->self, arguments->fiber, arguments->io, RB_INT2NUM(READABLE));
+			Event_Selector_KQueue_io_wait(arguments->self, arguments->fiber, arguments->io, RB_INT2NUM(EVENT_READABLE));
 		} else {
 			rb_sys_fail("Event_Selector_KQueue_io_read");
 		}
@@ -454,7 +454,7 @@ VALUE io_write_loop(VALUE _arguments) {
 			offset += result;
 			length -= result;
 		} else if (errno == EAGAIN || errno == EWOULDBLOCK) {
-			Event_Selector_KQueue_io_wait(arguments->self, arguments->fiber, arguments->io, RB_INT2NUM(WRITABLE));
+			Event_Selector_KQueue_io_wait(arguments->self, arguments->fiber, arguments->io, RB_INT2NUM(EVENT_WRITABLE));
 		} else {
 			rb_sys_fail("Event_Selector_KQueue_io_write");
 		}
@@ -616,7 +616,7 @@ void Init_Event_Selector_KQueue(VALUE Event_Selector) {
 	rb_define_alloc_func(Event_Selector_KQueue, Event_Selector_KQueue_allocate);
 	rb_define_method(Event_Selector_KQueue, "initialize", Event_Selector_KQueue_initialize, 1);
 	
-	rb_define_method(Event_Selector_KQueue, "transfer", Event_Selector_KQueue_transfer, -1);
+	rb_define_method(Event_Selector_KQueue, "resume", Event_Selector_KQueue_resume, -1);
 	rb_define_method(Event_Selector_KQueue, "yield", Event_Selector_KQueue_yield, 0);
 	rb_define_method(Event_Selector_KQueue, "push", Event_Selector_KQueue_push, 1);
 	rb_define_method(Event_Selector_KQueue, "raise", Event_Selector_KQueue_raise, -1);

data/ext/event/selector/selector.c

@@ -23,11 +23,20 @@
 
 static ID id_transfer, id_alive_p;
 
-#ifndef HAVE__RB_FIBER_TRANSFER
 VALUE Event_Selector_fiber_transfer(VALUE fiber, int argc, VALUE *argv) {
-	return rb_funcallv(fiber, id_transfer, argc, argv);
-}
+	// TODO Consider introducing something like `rb_fiber_scheduler_transfer(...)`.
+#ifdef HAVE__RB_FIBER_TRANSFER
+	if (RTEST(rb_fiber_alive_p(fiber))) {
+		return rb_fiber_transfer(fiber, argc, argv);
+	}
+#else
+	if (RTEST(rb_funcall(fiber, id_alive_p, 0))) {
+		return rb_funcallv(fiber, id_transfer, argc, argv);
+	}
 #endif
+	
+	return Qnil;
+}
 
 #ifndef HAVE__RB_FIBER_RAISE
 static ID id_raise;
@@ -37,6 +46,15 @@ VALUE Event_Selector_fiber_raise(VALUE fiber, int argc, VALUE *argv) {
 }
 #endif
 
+#ifndef HAVE_RB_FIBER_CURRENT
+static ID id_current;
+
+static VALUE rb_fiber_current() {
+	return rb_funcall(rb_cFiber, id_current, 0);
+}
+#endif
+
+
 #ifndef HAVE_RB_IO_DESCRIPTOR
 static ID id_fileno;
 
@@ -81,6 +99,10 @@ void Init_Event_Selector(VALUE Event_Selector) {
 	id_raise = rb_intern("raise");
 #endif
 	
+#ifndef HAVE_RB_FIBER_CURRENT
+	id_current = rb_intern("current");
+#endif
+	
 #ifndef HAVE_RB_IO_DESCRIPTOR
 	id_fileno = rb_intern("fileno");
 #endif
@@ -142,7 +164,7 @@ static VALUE wait_and_transfer_ensure(VALUE _arguments) {
 	return Qnil;
 }
 
-VALUE Event_Selector_wait_and_transfer(struct Event_Selector *backend, int argc, VALUE *argv)
+VALUE Event_Selector_resume(struct Event_Selector *backend, int argc, VALUE *argv)
 {
 	rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
 	

data/ext/event/selector/selector.h

@@ -38,11 +38,7 @@ enum Event {
 
 void Init_Event_Selector();
 
-#ifdef HAVE__RB_FIBER_TRANSFER
-#define Event_Selector_fiber_transfer(fiber, argc, argv) rb_fiber_transfer(fiber, argc, argv)
-#else
 VALUE Event_Selector_fiber_transfer(VALUE fiber, int argc, VALUE *argv);
-#endif
 
 #ifdef HAVE__RB_FIBER_RAISE
 #define Event_Selector_fiber_raise(fiber, argc, argv) rb_fiber_raise(fiber, argc, argv)
@@ -108,13 +104,13 @@ void Event_Selector_mark(struct Event_Selector *backend) {
 	}
 }
 
-VALUE Event_Selector_wait_and_transfer(struct Event_Selector *backend, int argc, VALUE *argv);
+VALUE Event_Selector_resume(struct Event_Selector *backend, int argc, VALUE *argv);
 VALUE Event_Selector_wait_and_raise(struct Event_Selector *backend, int argc, VALUE *argv);
 
 static inline
 VALUE Event_Selector_yield(struct Event_Selector *backend)
 {
-	return Event_Selector_wait_and_transfer(backend, 1, &backend->loop);
+	return Event_Selector_resume(backend, 1, &backend->loop);
 }
 
 void Event_Selector_queue_push(struct Event_Selector *backend, VALUE fiber);

data/ext/event/selector/uring.c

@@ -115,12 +115,12 @@ VALUE Event_Selector_URing_close(VALUE self) {
 	return Qnil;
 }
 
-VALUE Event_Selector_URing_transfer(int argc, VALUE *argv, VALUE self)
+VALUE Event_Selector_URing_resume(int argc, VALUE *argv, VALUE self)
 {
 	struct Event_Selector_URing *data = NULL;
 	TypedData_Get_Struct(self, struct Event_Selector_URing, &Event_Selector_URing_Type, data);
 	
-	Event_Selector_wait_and_transfer(&data->backend, argc, argv);
+	Event_Selector_resume(&data->backend, argc, argv);
 	
 	return Qnil;
 }
@@ -615,7 +615,7 @@ void Init_Event_Selector_URing(VALUE Event_Selector) {
 	rb_define_alloc_func(Event_Selector_URing, Event_Selector_URing_allocate);
 	rb_define_method(Event_Selector_URing, "initialize", Event_Selector_URing_initialize, 1);
 	
-	rb_define_method(Event_Selector_URing, "transfer", Event_Selector_URing_transfer, -1);
+	rb_define_method(Event_Selector_URing, "resume", Event_Selector_URing_resume, -1);
 	rb_define_method(Event_Selector_URing, "yield", Event_Selector_URing_yield, 0);
 	rb_define_method(Event_Selector_URing, "push", Event_Selector_URing_push, 1);
 	rb_define_method(Event_Selector_URing, "raise", Event_Selector_URing_raise, -1);

data/lib/event.rb

@@ -20,7 +20,6 @@
 
 require_relative 'event/version'
 require_relative 'event/selector'
-require_relative 'event/selector'
 
 module Event
 	# These constants are the same as those defined in IO.

data/lib/event/selector/select.rb

@@ -36,30 +36,53 @@ module Event
 				@writable = nil
 			end
 			
-			def transfer(fiber, *arguments)
-				@ready.push(Fiber.current)
+			Queue = Struct.new(:fiber) do
+				def transfer(*arguments)
+					fiber&.transfer(*arguments)
+				end
+				
+				def alive?
+					fiber&.alive?
+				end
+				
+				def nullify
+					self.fiber = nil
+				end
+			end
+			
+			# Transfer from the current fiber to the specified fiber. Put the current fiber into the ready list.
+			def resume(fiber, *arguments)
+				queue = Queue.new(Fiber.current)
+				@ready.push(queue)
+				
 				fiber.transfer(*arguments)
 			ensure
-				@ready.delete(fiber)
+				queue.nullify
 			end
 			
+			# Yield from the current fiber back to the event loop. Put the current fiber into the ready list.
 			def yield
-				fiber = Fiber.current
-				@ready.push(fiber)
+				queue = Queue.new(Fiber.current)
+				@ready.push(queue)
+				
 				@loop.transfer
 			ensure
-				@ready.delete(fiber)
+				queue.nullify
 			end
 			
+			# Append the given fiber into the ready list.
 			def push(fiber)
 				@ready.push(fiber)
 			end
 			
+			# Transfer to the given fiber and raise an exception. Put the current fiber into the ready list.
 			def raise(fiber, *arguments)
-				@ready.push(Fiber.current)
+				queue = Queue.new(Fiber.current)
+				@ready.push(queue)
+				
 				fiber.raise(*arguments)
 			ensure
-				@ready.delete(fiber)
+				queue.nullify
 			end
 			
 			def ready?
@@ -150,7 +173,7 @@ module Event
 				thread&.kill
 			end
 			
-			def select(duration = nil)
+			private def pop_ready
 				if @ready.any?
 					ready = @ready
 					@ready = Array.new
@@ -158,6 +181,14 @@ module Event
 					ready.each do |fiber|
 						fiber.transfer if fiber.alive?
 					end
+					
+					return true
+				end
+			end
+			
+			def select(duration = nil)
+				if pop_ready
+					duration = 0
 				end
 				
 				readable, writable, _ = ::IO.select(@readable.keys, @writable.keys, nil, duration)

data/lib/event/version.rb

@@ -1,3 +1,3 @@
 module Event
-	VERSION = "0.8.2"
+	VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: event
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-14 00:00:00.000000000 Z
+date: 2021-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bake
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: An event loop.