event 0.7.0 → 0.9.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,7 @@
 # THE SOFTWARE.
 
 require_relative 'event/version'
-require_relative 'event/backend'
+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,53 @@ module Event
 				@writable = nil
 			end
 			
-			def defer
-				fiber = Fiber.current
-				@ready.push(fiber)
+			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
+				queue.nullify
+			end
+			
+			# Yield from the current fiber back to the event loop. Put the current fiber into the ready list.
+			def yield
+				queue = Queue.new(Fiber.current)
+				@ready.push(queue)
+				
 				@loop.transfer
 			ensure
-				# Linear scan :(
-				@ready.delete(fiber)
+				queue.nullify
+			end
+			
+			# Append the given fiber into the ready list.
+			def push(fiber)
+				@ready.push(fiber)
 			end
 			
-			def transfer(fiber)
-				@ready.push(Fiber.current)
-				fiber.transfer
+			# Transfer to the given fiber and raise an exception. Put the current fiber into the ready list.
+			def raise(fiber, *arguments)
+				queue = Queue.new(Fiber.current)
+				@ready.push(queue)
+				
+				fiber.raise(*arguments)
+			ensure
+				queue.nullify
 			end
 			
 			def ready?
@@ -138,9 +173,22 @@ module Event
 				thread&.kill
 			end
 			
+			private def pop_ready
+				if @ready.any?
+					ready = @ready
+					@ready = Array.new
+					
+					ready.each do |fiber|
+						fiber.transfer if fiber.alive?
+					end
+					
+					return true
+				end
+			end
+			
 			def select(duration = nil)
-				while @ready.any?
-					@ready.pop.transfer
+				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.7.0"
+	VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: event
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-13 00:00:00.000000000 Z
+date: 2021-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bake
@@ -73,30 +73,22 @@ extensions:
 - ext/event/extconf.rb
 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
-- ext/event/event.o
-- ext/event/extconf.h
 - ext/event/extconf.rb
-- ext/event/kqueue.o
-- ext/event/mkmf.log
+- 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:
@@ -117,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.

data/ext/event/Makefile

@@ -1,267 +0,0 @@
-
-SHELL = /bin/sh
-
-# V=0 quiet, V=1 verbose.  other values don't work.
-V = 0
-Q1 = $(V:1=)
-Q = $(Q1:0=@)
-ECHO1 = $(V:1=@ :)
-ECHO = $(ECHO1:0=@ echo)
-NULLCMD = :
-
-#### Start of system configuration section. ####
-
-srcdir = .
-topdir = /Users/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0
-hdrdir = $(topdir)
-arch_hdrdir = /Users/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0/x86_64-darwin20
-PATH_SEPARATOR = :
-VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby:$(srcdir)/backend
-prefix = $(DESTDIR)/Users/samuel/.rubies/ruby-3.0.1
-rubysitearchprefix = $(rubylibprefix)/$(sitearch)
-rubyarchprefix = $(rubylibprefix)/$(arch)
-rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
-exec_prefix = $(prefix)
-vendorarchhdrdir = $(vendorhdrdir)/$(sitearch)
-sitearchhdrdir = $(sitehdrdir)/$(sitearch)
-rubyarchhdrdir = $(rubyhdrdir)/$(arch)
-vendorhdrdir = $(rubyhdrdir)/vendor_ruby
-sitehdrdir = $(rubyhdrdir)/site_ruby
-rubyhdrdir = $(includedir)/$(RUBY_VERSION_NAME)
-vendorarchdir = $(vendorlibdir)/$(sitearch)
-vendorlibdir = $(vendordir)/$(ruby_version)
-vendordir = $(rubylibprefix)/vendor_ruby
-sitearchdir = $(sitelibdir)/$(sitearch)
-sitelibdir = $(sitedir)/$(ruby_version)
-sitedir = $(rubylibprefix)/site_ruby
-rubyarchdir = $(rubylibdir)/$(arch)
-rubylibdir = $(rubylibprefix)/$(ruby_version)
-sitearchincludedir = $(includedir)/$(sitearch)
-archincludedir = $(includedir)/$(arch)
-sitearchlibdir = $(libdir)/$(sitearch)
-archlibdir = $(libdir)/$(arch)
-ridir = $(datarootdir)/$(RI_BASE_NAME)
-mandir = $(datarootdir)/man
-localedir = $(datarootdir)/locale
-libdir = $(exec_prefix)/lib
-psdir = $(docdir)
-pdfdir = $(docdir)
-dvidir = $(docdir)
-htmldir = $(docdir)
-infodir = $(datarootdir)/info
-docdir = $(datarootdir)/doc/$(PACKAGE)
-oldincludedir = $(SDKROOT)/usr/include
-includedir = $(prefix)/include
-runstatedir = $(localstatedir)/run
-localstatedir = $(prefix)/var
-sharedstatedir = $(prefix)/com
-sysconfdir = $(prefix)/etc
-datadir = $(datarootdir)
-datarootdir = $(prefix)/share
-libexecdir = $(exec_prefix)/libexec
-sbindir = $(exec_prefix)/sbin
-bindir = $(exec_prefix)/bin
-archdir = $(rubyarchdir)
-
-
-CC_WRAPPER = 
-CC = clang -fdeclspec
-CXX = clang++ -fdeclspec
-LIBRUBY = $(LIBRUBY_A)
-LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
-LIBRUBYARG_SHARED = 
-LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static -framework Security -framework Foundation $(MAINLIBS)
-empty =
-OUTFLAG = -o $(empty)
-COUTFLAG = -o $(empty)
-CSRCFLAG = $(empty)
-
-RUBY_EXTCONF_H = extconf.h
-cflags   = $(optflags) $(debugflags) $(warnflags)
-cxxflags = 
-optflags = -O3
-debugflags = -ggdb3
-warnflags = -Wall -Wextra -Wdeprecated-declarations -Wdivision-by-zero -Wimplicit-function-declaration -Wimplicit-int -Wmisleading-indentation -Wpointer-arith -Wshorten-64-to-32 -Wwrite-strings -Wmissing-noreturn -Wno-constant-logical-operand -Wno-long-long -Wno-missing-field-initializers -Wno-overlength-strings -Wno-parentheses-equality -Wno-self-assign -Wno-tautological-compare -Wno-unused-parameter -Wno-unused-value -Wunused-variable -Wextra-tokens
-cppflags = 
-CCDLFLAGS = -fno-common
-CFLAGS   = $(CCDLFLAGS) $(cflags)  -pipe -Wall $(ARCH_FLAG)
-INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
-DEFS     = 
-CPPFLAGS = -DRUBY_EXTCONF_H=\"$(RUBY_EXTCONF_H)\"  -I/opt/local/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT $(DEFS) $(cppflags)
-CXXFLAGS = $(CCDLFLAGS)  $(ARCH_FLAG)
-ldflags  = -L. -fstack-protector-strong -L/opt/local/lib
-dldflags = -Wl,-undefined,dynamic_lookup -Wl,-multiply_defined,suppress -L/opt/local/lib 
-ARCH_FLAG = 
-DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG)
-LDSHARED = $(CC) -dynamic -bundle
-LDSHAREDXX = $(CXX) -dynamic -bundle
-AR = ar
-EXEEXT = 
-
-RUBY_INSTALL_NAME = $(RUBY_BASE_NAME)
-RUBY_SO_NAME = ruby.3.0
-RUBYW_INSTALL_NAME = 
-RUBY_VERSION_NAME = $(RUBY_BASE_NAME)-$(ruby_version)
-RUBYW_BASE_NAME = rubyw
-RUBY_BASE_NAME = ruby
-
-arch = x86_64-darwin20
-sitearch = $(arch)
-ruby_version = 3.0.0
-ruby = $(bindir)/$(RUBY_BASE_NAME)
-RUBY = $(ruby)
-ruby_headers = $(hdrdir)/ruby.h $(hdrdir)/ruby/backward.h $(hdrdir)/ruby/ruby.h $(hdrdir)/ruby/defines.h $(hdrdir)/ruby/missing.h $(hdrdir)/ruby/intern.h $(hdrdir)/ruby/st.h $(hdrdir)/ruby/subst.h $(arch_hdrdir)/ruby/config.h $(RUBY_EXTCONF_H)
-
-RM = rm -f
-RM_RF = $(RUBY) -run -e rm -- -rf
-RMDIRS = rmdir -p
-MAKEDIRS = /opt/local/bin/gmkdir -p
-INSTALL = /usr/bin/install -c
-INSTALL_PROG = $(INSTALL) -m 0755
-INSTALL_DATA = $(INSTALL) -m 644
-COPY = cp
-TOUCH = exit >
-
-#### End of system configuration section. ####
-
-preload = 
-libpath = . $(libdir) /opt/local/lib
-LIBPATH =  -L. -L$(libdir) -L/opt/local/lib
-DEFFILE = 
-
-CLEANFILES = mkmf.log
-DISTCLEANFILES = 
-DISTCLEANDIRS = 
-
-extout = 
-extout_prefix = 
-target_prefix = /event
-LOCAL_LIBS = 
-LIBS =    
-ORIG_SRCS = event.c
-SRCS = $(ORIG_SRCS) event.c backend.c kqueue.c
-OBJS = event.o backend.o kqueue.o
-HDRS = $(srcdir)/event.h $(srcdir)/extconf.h
-LOCAL_HDRS = 
-TARGET = event
-TARGET_NAME = event
-TARGET_ENTRY = Init_$(TARGET_NAME)
-DLLIB = $(TARGET).bundle
-EXTSTATIC = 
-STATIC_LIB = 
-
-TIMESTAMP_DIR = .
-BINDIR        = $(bindir)
-RUBYCOMMONDIR = $(sitedir)$(target_prefix)
-RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
-RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
-HDRDIR        = $(rubyhdrdir)/ruby$(target_prefix)
-ARCHHDRDIR    = $(rubyhdrdir)/$(arch)/ruby$(target_prefix)
-TARGET_SO_DIR =
-TARGET_SO     = $(TARGET_SO_DIR)$(DLLIB)
-CLEANLIBS     = $(TARGET_SO) 
-CLEANOBJS     = *.o  *.bak
-
-all:    $(DLLIB)
-static: $(STATIC_LIB)
-.PHONY: all install static install-so install-rb
-.PHONY: clean clean-so clean-static clean-rb
-
-clean-static::
-clean-rb-default::
-clean-rb::
-clean-so::
-clean: clean-so clean-static clean-rb-default clean-rb
-		-$(Q)$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES) .*.time
-
-distclean-rb-default::
-distclean-rb::
-distclean-so::
-distclean-static::
-distclean: clean distclean-so distclean-static distclean-rb-default distclean-rb
-		-$(Q)$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
-		-$(Q)$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
-		-$(Q)$(RMDIRS) $(DISTCLEANDIRS) 2> /dev/null || true
-
-realclean: distclean
-install: install-so install-rb
-
-install-so: $(DLLIB) $(TIMESTAMP_DIR)/.sitearchdir.-.event.time
-	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
-clean-static::
-	-$(Q)$(RM) $(STATIC_LIB)
-install-rb: pre-install-rb do-install-rb install-rb-default
-install-rb-default: pre-install-rb-default do-install-rb-default
-pre-install-rb: Makefile
-pre-install-rb-default: Makefile
-do-install-rb:
-do-install-rb-default:
-pre-install-rb-default:
-	@$(NULLCMD)
-$(TIMESTAMP_DIR)/.sitearchdir.-.event.time:
-	$(Q) $(MAKEDIRS) $(@D) $(RUBYARCHDIR)
-	$(Q) $(TOUCH) $@
-
-site-install: site-install-so site-install-rb
-site-install-so: install-so
-site-install-rb: install-rb
-
-.SUFFIXES: .c .m .cc .mm .cxx .cpp .o .S
-
-.cc.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
-
-.cc.S:
-	$(ECHO) translating $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
-
-.mm.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
-
-.mm.S:
-	$(ECHO) translating $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
-
-.cxx.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
-
-.cxx.S:
-	$(ECHO) translating $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
-
-.cpp.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
-
-.cpp.S:
-	$(ECHO) translating $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
-
-.c.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
-
-.c.S:
-	$(ECHO) translating $(<)
-	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
-
-.m.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
-
-.m.S:
-	$(ECHO) translating $(<)
-	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
-
-$(TARGET_SO): $(OBJS) Makefile
-	$(ECHO) linking shared-object event/$(DLLIB)
-	-$(Q)$(RM) $(@)
-	$(Q) $(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
-	$(Q) $(POSTLINK)
-
-
-
-$(OBJS): $(HDRS) $(ruby_headers)