event 0.9.0 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d1a02b3163aca45dcdb7ac4f3589e18894c3e753262d7934ea0f473c88e2a38
-  data.tar.gz: fac7fd3d48e616e1c03ca9cb6af19b8457c4dadb452261bb1f4b628d70297bcb
+  metadata.gz: ede0cef441063c9e8675858ccbb0fb10a9e14403e812829531f8a5fedf144499
+  data.tar.gz: 47519c0f64233d29be411f6148cb1c831734ed36a56f863881d5fa14e2f7245e
 SHA512:
-  metadata.gz: 54c8d94a288dc450decd427c2bd7af850b635133b90ca25ee15f4f934c3e9b78cd8465402d1fabb9c4bae8ae3b7fef8c1849567e23303601a2bca4dfefc9acf3
-  data.tar.gz: 757e2b00714ace1767d732ab37c93372bd44d14da4911f46190b8ba0efcb1ba249743509fc3c68e957c4b24804ddd35a844257b81e279de0f3fd487d1058015e
+  metadata.gz: 16a588ae4f5319f430ffd31cf0374defaf099b87db406f27c6af8b667666038725587dfac4d3b328a5496a65335882263b846de1a67934df432beaceae23cff7
+  data.tar.gz: 61a29c0c4379953b56ac6aef3b002513ac58603f16b2c9656afb61fcfbb91b9954a47bbf3bb04a414977f7ba11205974e229c1d38856fc491b84124cae7814cf

data/ext/event/selector/epoll.c

@@ -112,14 +112,20 @@ VALUE Event_Selector_EPoll_close(VALUE self) {
 	return Qnil;
 }
 
-VALUE Event_Selector_EPoll_resume(int argc, VALUE *argv, VALUE self)
+VALUE Event_Selector_EPoll_transfer(VALUE self)
 {
 	struct Event_Selector_EPoll *data = NULL;
 	TypedData_Get_Struct(self, struct Event_Selector_EPoll, &Event_Selector_EPoll_Type, data);
 	
-	Event_Selector_resume(&data->backend, argc, argv);
+	return Event_Selector_fiber_transfer(data->backend.loop, 0, NULL);
+}
+
+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);
 	
-	return Qnil;
+	return Event_Selector_resume(&data->backend, argc, argv);
 }
 
 VALUE Event_Selector_EPoll_yield(VALUE self)
@@ -127,9 +133,7 @@ VALUE Event_Selector_EPoll_yield(VALUE self)
 	struct Event_Selector_EPoll *data = NULL;
 	TypedData_Get_Struct(self, struct Event_Selector_EPoll, &Event_Selector_EPoll_Type, data);
 	
-	Event_Selector_yield(&data->backend);
-	
-	return Qnil;
+	return Event_Selector_yield(&data->backend);
 }
 
 VALUE Event_Selector_EPoll_push(VALUE self, VALUE fiber)
@@ -147,7 +151,7 @@ VALUE Event_Selector_EPoll_raise(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);
 	
-	return Event_Selector_wait_and_raise(&data->backend, argc, argv);
+	return Event_Selector_raise(&data->backend, argc, argv);
 }
 
 VALUE Event_Selector_EPoll_ready_p(VALUE self) {
@@ -550,6 +554,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, 0);
 	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);

data/ext/event/selector/kqueue.c

@@ -112,6 +112,14 @@ VALUE Event_Selector_KQueue_close(VALUE self) {
 	return Qnil;
 }
 
+VALUE Event_Selector_KQueue_transfer(VALUE self)
+{
+	struct Event_Selector_KQueue *data = NULL;
+	TypedData_Get_Struct(self, struct Event_Selector_KQueue, &Event_Selector_KQueue_Type, data);
+	
+	return Event_Selector_fiber_transfer(data->backend.loop, 0, NULL);
+}
+
 VALUE Event_Selector_KQueue_resume(int argc, VALUE *argv, VALUE self)
 {
 	struct Event_Selector_KQueue *data = NULL;
@@ -125,9 +133,7 @@ VALUE Event_Selector_KQueue_yield(VALUE self)
 	struct Event_Selector_KQueue *data = NULL;
 	TypedData_Get_Struct(self, struct Event_Selector_KQueue, &Event_Selector_KQueue_Type, data);
 	
-	Event_Selector_yield(&data->backend);
-	
-	return Qnil;
+	return Event_Selector_yield(&data->backend);
 }
 
 VALUE Event_Selector_KQueue_push(VALUE self, VALUE fiber)
@@ -145,7 +151,7 @@ VALUE Event_Selector_KQueue_raise(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_raise(&data->backend, argc, argv);
+	return Event_Selector_raise(&data->backend, argc, argv);
 }
 
 VALUE Event_Selector_KQueue_ready_p(VALUE self) {
@@ -616,6 +622,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, 0);
 	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);

data/ext/event/selector/selector.c

@@ -26,14 +26,17 @@ static ID id_transfer, id_alive_p;
 VALUE Event_Selector_fiber_transfer(VALUE fiber, int argc, VALUE *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);
+	if (RTEST(rb_obj_is_fiber(fiber))) {
+		if (RTEST(rb_fiber_alive_p(fiber))) {
+			return rb_fiber_transfer(fiber, argc, argv);
+		}
+		
+		return Qnil;
 	}
-#else
+#endif
 	if (RTEST(rb_funcall(fiber, id_alive_p, 0))) {
 		return rb_funcallv(fiber, id_transfer, argc, argv);
 	}
-#endif
 	
 	return Qnil;
 }
@@ -197,7 +200,7 @@ static VALUE wait_and_raise(VALUE _arguments) {
 	return Event_Selector_fiber_raise(fiber, argc, argv);
 }
 
-VALUE Event_Selector_wait_and_raise(struct Event_Selector *backend, int argc, VALUE *argv)
+VALUE Event_Selector_raise(struct Event_Selector *backend, int argc, VALUE *argv)
 {
 	rb_check_arity(argc, 2, UNLIMITED_ARGUMENTS);
 	

data/ext/event/selector/selector.h

@@ -105,7 +105,7 @@ void Event_Selector_mark(struct Event_Selector *backend) {
 }
 
 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);
+VALUE Event_Selector_raise(struct Event_Selector *backend, int argc, VALUE *argv);
 
 static inline
 VALUE Event_Selector_yield(struct Event_Selector *backend)

data/ext/event/selector/uring.c

@@ -115,14 +115,20 @@ VALUE Event_Selector_URing_close(VALUE self) {
 	return Qnil;
 }
 
-VALUE Event_Selector_URing_resume(int argc, VALUE *argv, VALUE self)
+VALUE Event_Selector_URing_transfer(VALUE self)
 {
 	struct Event_Selector_URing *data = NULL;
 	TypedData_Get_Struct(self, struct Event_Selector_URing, &Event_Selector_URing_Type, data);
 	
-	Event_Selector_resume(&data->backend, argc, argv);
+	return Event_Selector_fiber_transfer(data->backend.loop, 0, NULL);
+}
+
+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);
 	
-	return Qnil;
+	return Event_Selector_resume(&data->backend, argc, argv);
 }
 
 VALUE Event_Selector_URing_yield(VALUE self)
@@ -130,9 +136,7 @@ VALUE Event_Selector_URing_yield(VALUE self)
 	struct Event_Selector_URing *data = NULL;
 	TypedData_Get_Struct(self, struct Event_Selector_URing, &Event_Selector_URing_Type, data);
 	
-	Event_Selector_yield(&data->backend);
-	
-	return Qnil;
+	return Event_Selector_yield(&data->backend);
 }
 
 VALUE Event_Selector_URing_push(VALUE self, VALUE fiber)
@@ -150,7 +154,7 @@ VALUE Event_Selector_URing_raise(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);
 	
-	return Event_Selector_wait_and_raise(&data->backend, argc, argv);
+	return Event_Selector_raise(&data->backend, argc, argv);
 }
 
 VALUE Event_Selector_URing_ready_p(VALUE self) {
@@ -615,6 +619,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, 0);
 	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);

data/lib/event/debug/selector.rb

@@ -0,0 +1,140 @@
+# Copyright, 2021, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require "event/version"
+
+module Event
+	module Debug
+		class Selector
+			def initialize(selector)
+				@selector = selector
+				
+				@readable = {}
+				@writable = {}
+				@priority = {}
+			end
+			
+			def close
+				if @selector.nil?
+					raise "Selector already closed!"
+				end
+				
+				@selector.close
+				@selector = nil
+			end
+			
+			def transfer(fiber, *arguments)
+				@selector.transfer(fiber, *arguments)
+			end
+			
+			def transfer(*arguments)
+				@selector.transfer(*arguments)
+			end
+			
+			def resume(*arguments)
+				@selector.resume(*arguments)
+			end
+			
+			def yield
+				@selector.yield
+			end
+			
+			def push(fiber)
+				@selector.push(fiber)
+			end
+			
+			def raise(fiber, *arguments)
+				@selector.raise(fiber, *arguments)
+			end
+			
+			def ready?
+				@selector.ready?
+			end
+			
+			def process_wait(*arguments)
+				@selector.process_wait(*arguments)
+			end
+			
+			def io_wait(fiber, io, events)
+				register_readable(fiber, io, events)
+			end
+			
+			def select(duration = nil)
+				@selector.select(duration)
+			end
+			
+			private
+			
+			def register_readable(fiber, io, events)
+				if (events & READABLE) > 0
+					if @readable.key?(io)
+						raise "Cannot wait for #{io} to become readable from multiple fibers."
+					end
+					
+					begin
+						@readable[io] = fiber
+						
+						register_writable(fiber, io, events)
+					ensure
+						@readable.delete(io)
+					end
+				else
+					register_writable(fiber, io, events)
+				end
+			end
+			
+			def register_writable(fiber, io, events)
+				if (events & WRITABLE) > 0
+					if @writable.key?(io)
+						raise "Cannot wait for #{io} to become writable from multiple fibers."
+					end
+					
+					begin
+						@writable[io] = fiber
+						
+						register_priority(fiber, io, events)
+					ensure
+						@writable.delete(io)
+					end
+				else
+					register_priority(fiber, io, events)
+				end
+			end
+			
+			def register_priority(fiber, io, events)
+				if (events & PRIORITY) > 0
+					if @priority.key?(io)
+						raise "Cannot wait for #{io} to become priority from multiple fibers."
+					end
+					
+					begin
+						@priority[io] = fiber
+						
+						@selector.io_wait(fiber, io, events)
+					ensure
+						@priority.delete(io)
+					end
+				else
+					@selector.io_wait(fiber, io, events)
+				end
+			end
+		end
+	end
+end

data/lib/event/selector/select.rb

@@ -50,6 +50,11 @@ module Event
 				end
 			end
 			
+			# Transfer from the current fiber to the event loop.
+			def transfer
+				@loop.transfer
+			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)

data/lib/event/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: event
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.4
 platform: ruby
 authors:
 - Samuel Williams
@@ -86,7 +86,7 @@ files:
 - ext/event/selector/uring.c
 - ext/event/selector/uring.h
 - lib/event.rb
-- lib/event/debug.rb
+- lib/event/debug/selector.rb
 - lib/event/selector.rb
 - lib/event/selector/select.rb
 - lib/event/version.rb
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.0.dev
 signing_key:
 specification_version: 4
 summary: An event loop.

data/lib/event/debug.rb

@@ -1,126 +0,0 @@
-# Copyright, 2021, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-require "event/version"
-
-module Event
-	class Debug
-		def initialize(selector)
-			@selector = selector
-			
-			@readable = {}
-			@writable = {}
-			@priority = {}
-		end
-		
-		def close
-			if @selector.nil?
-				raise "Selector already closed!"
-			end
-			
-			@selector.close
-			@selector = nil
-		end
-		
-		def transfer(fiber, *arguments)
-			@selector.transfer(fiber, *arguments)
-		end
-		
-		def yield
-			@selector.yield
-		end
-		
-		def push(fiber)
-			@selector.push(fiber)
-		end
-		
-		def raise(fiber, *arguments)
-			@selector.raise(fiber, *arguments)
-		end
-		
-		def ready?
-			@selector.ready?
-		end
-		
-		def io_wait(fiber, io, events)
-			register_readable(fiber, io, events)
-		end
-		
-		def select(duration = nil)
-			@selector.select(duration)
-		end
-		
-		private
-		
-		def register_readable(fiber, io, events)
-			if (events & READABLE) > 0
-				if @readable.key?(io)
-					raise "Cannot wait for #{io} to become readable from multiple fibers."
-				end
-				
-				begin
-					@readable[io] = fiber
-					
-					register_writable(fiber, io, events)
-				ensure
-					@readable.delete(io)
-				end
-			else
-				register_writable(fiber, io, events)
-			end
-		end
-		
-		def register_writable(fiber, io, events)
-			if (events & WRITABLE) > 0
-				if @writable.key?(io)
-					raise "Cannot wait for #{io} to become writable from multiple fibers."
-				end
-				
-				begin
-					@writable[io] = fiber
-					
-					register_priority(fiber, io, events)
-				ensure
-					@writable.delete(io)
-				end
-			else
-				register_priority(fiber, io, events)
-			end
-		end
-		
-		def register_priority(fiber, io, events)
-			if (events & PRIORITY) > 0
-				if @priority.key?(io)
-					raise "Cannot wait for #{io} to become priority from multiple fibers."
-				end
-				
-				begin
-					@priority[io] = fiber
-					
-					@selector.io_wait(fiber, io, events)
-				ensure
-					@priority.delete(io)
-				end
-			else
-				@selector.io_wait(fiber, io, events)
-			end
-		end
-	end
-end