event 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df986c171ee38a8b081284b28cb7972f3b7ba96b60d47d370ccac6808fe01ff9
-  data.tar.gz: fd87f66165976f4704e9244f044aedda6a949c87f2879ede07cfc728a24f778e
+  metadata.gz: a4afaae3a40f7c5f5531db11369710205aa5e8f7410edbc8d7311114e733ec91
+  data.tar.gz: c8bee5169e94359781b5b3b1eb79f1d535ca992843791709b70794415d144e99
 SHA512:
-  metadata.gz: e522241d001f0d42b364ab51ff0e555c4cbde87daf91f3bedcd93bb8c14ee8a351b413b6156d7f9e94606c3a7536de39fcc71ef2525d85c420c6def51a092cc5
-  data.tar.gz: 297fe75b5789cb10dc32807a2a78bf36514773c1d41646cf1163c6fd7be7ecbedd1239bed631ff825836934dab9fc08eccfb27a2d15d39abb08159b05d01b95c
+  metadata.gz: cbfe1d0c91aa4ac371f61af680837db84e788dd8ecb8a604f8a76b3ede3a634afa7206f8855f04fa80f2ad93085976bc37b751fd0d48b57a49ffa843b8694be3
+  data.tar.gz: 3a37df8c300c32d5c8032d9249a5f9dc303267cf894973fdd177eb6f113a84ad87cf7b65806d06574ba757a3100effd82ab1386fece11219e1e854eba5f11f58

data/ext/event/selector/epoll.c

@@ -117,9 +117,7 @@ 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_fiber_transfer(data->backend.loop, 0, NULL);
-	
-	return Qnil;
+	return Event_Selector_fiber_transfer(data->backend.loop, 0, NULL);
 }
 
 VALUE Event_Selector_EPoll_resume(int argc, VALUE *argv, VALUE self)
@@ -127,9 +125,7 @@ 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_resume(&data->backend, argc, argv);
-	
-	return Qnil;
+	return Event_Selector_resume(&data->backend, argc, argv);
 }
 
 VALUE Event_Selector_EPoll_yield(VALUE self)
@@ -137,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)
@@ -157,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) {

data/ext/event/selector/kqueue.c

@@ -117,9 +117,7 @@ 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);
 	
-	Event_Selector_fiber_transfer(data->backend.loop, 0, NULL);
-	
-	return Qnil;
+	return Event_Selector_fiber_transfer(data->backend.loop, 0, NULL);
 }
 
 VALUE Event_Selector_KQueue_resume(int argc, VALUE *argv, VALUE self)
@@ -135,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)
@@ -155,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) {

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

@@ -120,9 +120,7 @@ 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_fiber_transfer(data->backend.loop, 0, NULL);
-	
-	return Qnil;
+	return Event_Selector_fiber_transfer(data->backend.loop, 0, NULL);
 }
 
 VALUE Event_Selector_URing_resume(int argc, VALUE *argv, VALUE self)
@@ -130,9 +128,7 @@ 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_resume(&data->backend, argc, argv);
-	
-	return Qnil;
+	return Event_Selector_resume(&data->backend, argc, argv);
 }
 
 VALUE Event_Selector_URing_yield(VALUE self)
@@ -140,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)
@@ -160,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) {

data/lib/event.rb

@@ -21,14 +21,6 @@
 require_relative 'event/version'
 require_relative 'event/selector'
 
-module Event
-	# These constants are the same as those defined in IO.
-	
-	READABLE = 1
-	PRIORITY = 2
-	WRITABLE = 4
-end
-
 begin
 	require_relative '../ext/event/event'
 rescue LoadError

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/interrupt.rb

@@ -0,0 +1,55 @@
+# 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_relative 'selector'
+
+module Event
+	# A thread safe synchronisation primative.
+	class Interrupt
+		def self.call(selector, &block)
+			self.new(selector, block)
+		end
+		
+		def initialize(selector, block)
+			@selector = selector
+			@input, @output = ::IO.pipe
+			
+			@fiber = Fiber.new do
+				while true
+					@selector.io_wait(@fiber, @input, READABLE)
+					block.call(@input.read_nonblock(1)&.ord)
+				end
+			end
+			
+			@fiber.transfer
+		end
+		
+		# Send a sigle byte interrupt.
+		def signal(event = 0)
+			@output.write(event.chr)
+			@output.flush
+		end
+		
+		def close
+			@input.close
+			@output.close
+		end
+	end
+end

data/lib/event/selector.rb

@@ -21,6 +21,11 @@
 require_relative 'selector/select'
 
 module Event
+	# These constants are the same as those defined in IO.
+	READABLE = 1
+	PRIORITY = 2
+	WRITABLE = 4
+	
 	module Selector
 		def self.default(env = ENV)
 			if name = env['EVENT_SELECTOR']&.to_sym

data/lib/event/version.rb

@@ -1,3 +1,3 @@
 module Event
-	VERSION = "0.9.1"
+	VERSION = "0.10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: event
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-15 00:00:00.000000000 Z
+date: 2021-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bake
@@ -86,7 +86,8 @@ 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/interrupt.rb
 - lib/event/selector.rb
 - lib/event/selector/select.rb
 - lib/event/version.rb

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