event 0.7.0 → 0.8.0

data/ext/event/{backend → selector}/uring.h

@@ -22,7 +22,7 @@
 
 #include <ruby.h>
 
-#define EVENT_BACKEND_URING
+#define EVENT_SELECTOR_URING
 
-void Init_Event_Backend_URing(VALUE Event_Backend);
-VALUE Event_Backend_URing_select(VALUE self, VALUE duration);
+void Init_Event_Selector_URing(VALUE Event_Selector);
+VALUE Event_Selector_URing_select(VALUE self, VALUE duration);

data/lib/event.rb

@@ -19,7 +19,8 @@
 # THE SOFTWARE.
 
 require_relative 'event/version'
-require_relative 'event/backend'
+require_relative 'event/selector'
+require_relative 'event/selector'
 
 module Event
 	# These constants are the same as those defined in IO.

data/lib/event/debug.rb

@@ -0,0 +1,126 @@
+# 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

data/lib/event/selector.rb

@@ -18,9 +18,32 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require "event/version"
+require_relative 'selector/select'
 
 module Event
-	class Selector
+	module Selector
+		def self.default(env = ENV)
+			if name = env['EVENT_SELECTOR']&.to_sym
+				if Event::Selector.const_defined?(name)
+					return Event::Selector.const_get(name)
+				else
+					warn "Could not find EVENT_SELECTOR=#{name}!"
+				end
+			end
+			
+			if self.const_defined?(:URing)
+				return Event::Selector::URing
+			elsif self.const_defined?(:KQueue)
+				return Event::Selector::KQueue
+			elsif self.const_defined?(:EPoll)
+				return Event::Selector::EPoll
+			else
+				return Event::Selector::Select
+			end
+		end
+		
+		def self.new(...)
+			default.new(...)
+		end
 	end
 end

data/lib/event/{backend → selector}/select.rb

@@ -19,7 +19,7 @@
 # THE SOFTWARE.
 
 module Event
-	module Backend
+	module Selector
 		class Select
 			def initialize(loop)
 				@loop = loop
@@ -36,18 +36,30 @@ module Event
 				@writable = nil
 			end
 			
-			def defer
+			def transfer(fiber, *arguments)
+				@ready.push(Fiber.current)
+				fiber.transfer(*arguments)
+			ensure
+				@ready.delete(fiber)
+			end
+			
+			def yield
 				fiber = Fiber.current
 				@ready.push(fiber)
 				@loop.transfer
 			ensure
-				# Linear scan :(
 				@ready.delete(fiber)
 			end
 			
-			def transfer(fiber)
+			def push(fiber)
+				@ready.push(fiber)
+			end
+			
+			def raise(fiber, *arguments)
 				@ready.push(Fiber.current)
-				fiber.transfer
+				@fiber.raise(*arguments)
+			ensure
+				@ready.delete(fiber)
 			end
 			
 			def ready?
@@ -139,8 +151,13 @@ module Event
 			end
 			
 			def select(duration = nil)
-				while @ready.any?
-					@ready.pop.transfer
+				if @ready.any?
+					ready = @ready
+					@ready = Array.new
+					
+					ready.each do |fiber|
+						fiber.transfer if fiber.alive?
+					end
 				end
 				
 				readable, writable, _ = ::IO.select(@readable.keys, @writable.keys, nil, duration)

data/lib/event/version.rb

@@ -1,3 +1,3 @@
 module Event
-	VERSION = "0.7.0"
+	VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: event
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-13 00:00:00.000000000 Z
+date: 2021-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bake
@@ -74,16 +74,6 @@ extensions:
 extra_rdoc_files: []
 files:
 - ext/event/Makefile
-- ext/event/backend.o
-- ext/event/backend/backend.c
-- ext/event/backend/backend.h
-- ext/event/backend/epoll.c
-- ext/event/backend/epoll.h
-- ext/event/backend/kqueue.c
-- ext/event/backend/kqueue.h
-- ext/event/backend/pidfd.c
-- ext/event/backend/uring.c
-- ext/event/backend/uring.h
 - ext/event/event.bundle
 - ext/event/event.c
 - ext/event/event.h
@@ -92,11 +82,20 @@ files:
 - ext/event/extconf.rb
 - ext/event/kqueue.o
 - ext/event/mkmf.log
+- ext/event/selector.o
+- ext/event/selector/epoll.c
+- ext/event/selector/epoll.h
+- ext/event/selector/kqueue.c
+- ext/event/selector/kqueue.h
+- ext/event/selector/pidfd.c
+- ext/event/selector/selector.c
+- ext/event/selector/selector.h
+- ext/event/selector/uring.c
+- ext/event/selector/uring.h
 - lib/event.rb
-- lib/event/backend.rb
-- lib/event/backend/select.rb
-- lib/event/debug/selector.rb
+- lib/event/debug.rb
 - lib/event/selector.rb
+- lib/event/selector/select.rb
 - lib/event/version.rb
 homepage: https://github.com/socketry/event
 licenses:

data/ext/event/backend/backend.c

@@ -1,178 +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.
-
-#include "backend.h"
-#include <fcntl.h>
-
-#ifndef HAVE__RB_FIBER_TRANSFER
-static ID id_transfer;
-
-VALUE
-Event_Backend_fiber_transfer(VALUE fiber) {
-	return rb_funcall(fiber, id_transfer, 0);
-}
-
-VALUE
-Event_Backend_fiber_transfer_result(VALUE fiber, VALUE result) {
-	return rb_funcall(fiber, id_transfer, 1, result);
-}
-#endif
-
-#ifndef HAVE_RB_IO_DESCRIPTOR
-static ID id_fileno;
-
-int Event_Backend_io_descriptor(VALUE io) {
-	return RB_NUM2INT(rb_funcall(io, id_fileno, 0));
-}
-#endif
-
-#ifndef HAVE_RB_PROCESS_STATUS_WAIT
-static ID id_wait;
-static VALUE rb_Process_Status = Qnil;
-
-VALUE Event_Backend_process_status_wait(rb_pid_t pid)
-{
-	return rb_funcall(rb_Process_Status, id_wait, 2, PIDT2NUM(pid), INT2NUM(WNOHANG));
-}
-#endif
-
-int Event_Backend_nonblock_set(int file_descriptor)
-{
-	int flags = fcntl(file_descriptor, F_GETFL, 0);
-	
-	if (!(flags & O_NONBLOCK)) {
-		fcntl(file_descriptor, F_SETFL, flags | O_NONBLOCK);
-	}
-	
-	return flags;
-}
-
-void Event_Backend_nonblock_restore(int file_descriptor, int flags)
-{
-	if (!(flags & O_NONBLOCK)) {
-		fcntl(file_descriptor, F_SETFL, flags & ~flags);
-	}
-}
-
-void Init_Event_Backend(VALUE Event_Backend) {
-#ifndef HAVE_RB_IO_DESCRIPTOR
-	id_fileno = rb_intern("fileno");
-#endif
-	
-#ifndef HAVE__RB_FIBER_TRANSFER
-	id_transfer = rb_intern("transfer");
-#endif
-	
-#ifndef HAVE_RB_PROCESS_STATUS_WAIT
-	id_wait = rb_intern("wait");
-	rb_Process_Status = rb_const_get_at(rb_mProcess, rb_intern("Status"));
-#endif
-}
-
-struct wait_and_transfer_arguments {
-	struct Event_Backend *backend;
-	struct Event_Backend_Queue *waiting;
-};
-
-static void queue_pop(struct Event_Backend *backend, struct Event_Backend_Queue *waiting) {
-	if (waiting->behind) {
-		waiting->behind->infront = waiting->infront;
-	} else {
-		backend->waiting = waiting->infront;
-	}
-	
-	if (waiting->infront) {
-		waiting->infront->behind = waiting->behind;
-	} else {
-		backend->ready = waiting->behind;
-	}
-}
-
-static void queue_push(struct Event_Backend *backend, struct Event_Backend_Queue *waiting) {
-	if (backend->waiting) {
-		backend->waiting->behind = waiting;
-		waiting->infront = backend->waiting;
-	} else {
-		backend->ready = waiting;
-	}
-	
-	backend->waiting = waiting;
-}
-
-static VALUE wait_and_transfer(VALUE fiber) {
-	return Event_Backend_fiber_transfer(fiber);
-}
-
-static VALUE wait_and_transfer_ensure(VALUE _arguments) {
-	struct wait_and_transfer_arguments *arguments = (struct wait_and_transfer_arguments *)_arguments;
-	
-	queue_pop(arguments->backend, arguments->waiting);
-	
-	return Qnil;
-}
-
-void Event_Backend_wait_and_transfer(struct Event_Backend *backend, VALUE fiber)
-{
-	struct Event_Backend_Queue waiting = {
-		.behind = NULL,
-		.infront = NULL,
-		.fiber = rb_fiber_current()
-	};
-	
-	queue_push(backend, &waiting);
-	
-	struct wait_and_transfer_arguments arguments = {
-		.backend = backend,
-		.waiting = &waiting,
-	};
-	
-	rb_ensure(wait_and_transfer, fiber, wait_and_transfer_ensure, (VALUE)&arguments);
-}
-
-void Event_Backend_ready_pop(struct Event_Backend *backend)
-{
-	// Get the current tail and head of the queue:
-	struct Event_Backend_Queue *waiting = backend->waiting;
-	
-	// Process from head to tail in order:
-	// During this, more items may be appended to tail.
-	while (backend->ready) {
-		struct Event_Backend_Queue *ready = backend->ready;
-		
-		Event_Backend_fiber_transfer(ready->fiber);
-		
-		if (ready == waiting) break;
-	}
-}
-
-void Event_Backend_elapsed_time(struct timespec* start, struct timespec* stop, struct timespec *duration)
-{
-	if ((stop->tv_nsec - start->tv_nsec) < 0) {
-		duration->tv_sec = stop->tv_sec - start->tv_sec - 1;
-		duration->tv_nsec = stop->tv_nsec - start->tv_nsec + 1000000000;
-	} else {
-		duration->tv_sec = stop->tv_sec - start->tv_sec;
-		duration->tv_nsec = stop->tv_nsec - start->tv_nsec;
-	}
-}
-
-void Event_Backend_current_time(struct timespec *time) {
-	clock_gettime(CLOCK_MONOTONIC, time);
-}