event 0.1.2 → 0.4.0

data/ext/event/backend/uring.h

@@ -25,3 +25,4 @@
 #define EVENT_BACKEND_URING
 
 void Init_Event_Backend_URing(VALUE Event_Backend);
+VALUE Event_Backend_URing_select(VALUE self, VALUE duration);

data/ext/event/extconf.h

@@ -0,0 +1,5 @@
+#ifndef EXTCONF_H
+#define EXTCONF_H
+#define HAVE_LIBURING_H 1
+#define HAVE_SYS_EPOLL_H 1
+#endif

data/ext/event/extconf.rb

@@ -28,6 +28,8 @@ extension_name = 'event'
 # The destination
 dir_config(extension_name)
 
+$CFLAGS << " -Wall"
+
 $srcs = ["event.c"]
 $VPATH << "$(srcdir)/backend"
 

data/ext/event/mkmf.log

@@ -0,0 +1,84 @@
+have_library: checking for -luring... -------------------- yes
+
+"gcc -o conftest -I/home/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0/x86_64-linux -I/home/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0/ruby/backward -I/home/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0 -I.    -O3 -ggdb3 -Wall -Wextra -Wdeprecated-declarations -Wduplicated-cond -Wimplicit-function-declaration -Wimplicit-int -Wmisleading-indentation -Wpointer-arith -Wwrite-strings -Wimplicit-fallthrough=0 -Wmissing-noreturn -Wno-cast-function-type -Wno-constant-logical-operand -Wno-long-long -Wno-missing-field-initializers -Wno-overlength-strings -Wno-packed-bitfield-compat -Wno-parentheses-equality -Wno-self-assign -Wno-tautological-compare -Wno-unused-parameter -Wno-unused-value -Wsuggest-attribute=format -Wsuggest-attribute=noreturn -Wunused-variable -Wall conftest.c  -L. -L/home/samuel/.rubies/ruby-3.0.1/lib -Wl,-rpath,/home/samuel/.rubies/ruby-3.0.1/lib -L. -fstack-protector-strong -rdynamic -Wl,-export-dynamic     -Wl,-rpath,/home/samuel/.rubies/ruby-3.0.1/lib -L/home/samuel/.rubies/ruby-3.0.1/lib -lruby-static -lz -lpthread -lrt -lrt -lgmp -ldl -lcrypt -lm   -lm   -lc"
+checked program was:
+/* begin */
+1: #include "ruby.h"
+2: 
+3: int main(int argc, char **argv)
+4: {
+5:   return !!argv[argc];
+6: }
+/* end */
+
+"gcc -o conftest -I/home/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0/x86_64-linux -I/home/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0/ruby/backward -I/home/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0 -I.    -O3 -ggdb3 -Wall -Wextra -Wdeprecated-declarations -Wduplicated-cond -Wimplicit-function-declaration -Wimplicit-int -Wmisleading-indentation -Wpointer-arith -Wwrite-strings -Wimplicit-fallthrough=0 -Wmissing-noreturn -Wno-cast-function-type -Wno-constant-logical-operand -Wno-long-long -Wno-missing-field-initializers -Wno-overlength-strings -Wno-packed-bitfield-compat -Wno-parentheses-equality -Wno-self-assign -Wno-tautological-compare -Wno-unused-parameter -Wno-unused-value -Wsuggest-attribute=format -Wsuggest-attribute=noreturn -Wunused-variable -Wall conftest.c  -L. -L/home/samuel/.rubies/ruby-3.0.1/lib -Wl,-rpath,/home/samuel/.rubies/ruby-3.0.1/lib -L. -fstack-protector-strong -rdynamic -Wl,-export-dynamic     -Wl,-rpath,/home/samuel/.rubies/ruby-3.0.1/lib -L/home/samuel/.rubies/ruby-3.0.1/lib -lruby-static -lz -lpthread -lrt -lrt -lgmp -ldl -lcrypt -lm  -luring  -lm   -lc"
+checked program was:
+/* begin */
+ 1: #include "ruby.h"
+ 2: 
+ 3: /*top*/
+ 4: extern int t(void);
+ 5: int main(int argc, char **argv)
+ 6: {
+ 7:   if (argc > 1000000) {
+ 8:     int (* volatile tp)(void)=(int (*)(void))&t;
+ 9:     printf("%d", (*tp)());
+10:   }
+11: 
+12:   return !!argv[argc];
+13: }
+14: 
+15: int t(void) { ; return 0; }
+/* end */
+
+--------------------
+
+have_header: checking for liburing.h... -------------------- yes
+
+"gcc -E -I/home/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0/x86_64-linux -I/home/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0/ruby/backward -I/home/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0 -I.    -O3 -ggdb3 -Wall -Wextra -Wdeprecated-declarations -Wduplicated-cond -Wimplicit-function-declaration -Wimplicit-int -Wmisleading-indentation -Wpointer-arith -Wwrite-strings -Wimplicit-fallthrough=0 -Wmissing-noreturn -Wno-cast-function-type -Wno-constant-logical-operand -Wno-long-long -Wno-missing-field-initializers -Wno-overlength-strings -Wno-packed-bitfield-compat -Wno-parentheses-equality -Wno-self-assign -Wno-tautological-compare -Wno-unused-parameter -Wno-unused-value -Wsuggest-attribute=format -Wsuggest-attribute=noreturn -Wunused-variable -Wall  conftest.c -o conftest.i"
+checked program was:
+/* begin */
+1: #include "ruby.h"
+2: 
+3: #include <liburing.h>
+/* end */
+
+--------------------
+
+have_header: checking for sys/epoll.h... -------------------- yes
+
+"gcc -E -I/home/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0/x86_64-linux -I/home/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0/ruby/backward -I/home/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0 -I.    -O3 -ggdb3 -Wall -Wextra -Wdeprecated-declarations -Wduplicated-cond -Wimplicit-function-declaration -Wimplicit-int -Wmisleading-indentation -Wpointer-arith -Wwrite-strings -Wimplicit-fallthrough=0 -Wmissing-noreturn -Wno-cast-function-type -Wno-constant-logical-operand -Wno-long-long -Wno-missing-field-initializers -Wno-overlength-strings -Wno-packed-bitfield-compat -Wno-parentheses-equality -Wno-self-assign -Wno-tautological-compare -Wno-unused-parameter -Wno-unused-value -Wsuggest-attribute=format -Wsuggest-attribute=noreturn -Wunused-variable -Wall  conftest.c -o conftest.i"
+checked program was:
+/* begin */
+1: #include "ruby.h"
+2: 
+3: #include <sys/epoll.h>
+/* end */
+
+--------------------
+
+have_header: checking for sys/event.h... -------------------- no
+
+"gcc -E -I/home/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0/x86_64-linux -I/home/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0/ruby/backward -I/home/samuel/.rubies/ruby-3.0.1/include/ruby-3.0.0 -I.    -O3 -ggdb3 -Wall -Wextra -Wdeprecated-declarations -Wduplicated-cond -Wimplicit-function-declaration -Wimplicit-int -Wmisleading-indentation -Wpointer-arith -Wwrite-strings -Wimplicit-fallthrough=0 -Wmissing-noreturn -Wno-cast-function-type -Wno-constant-logical-operand -Wno-long-long -Wno-missing-field-initializers -Wno-overlength-strings -Wno-packed-bitfield-compat -Wno-parentheses-equality -Wno-self-assign -Wno-tautological-compare -Wno-unused-parameter -Wno-unused-value -Wsuggest-attribute=format -Wsuggest-attribute=noreturn -Wunused-variable -Wall  conftest.c -o conftest.i"
+conftest.c:3:10: fatal error: sys/event.h: No such file or directory
+    3 | #include <sys/event.h>
+      |          ^~~~~~~~~~~~~
+compilation terminated.
+checked program was:
+/* begin */
+1: #include "ruby.h"
+2: 
+3: #include <sys/event.h>
+/* end */
+
+--------------------
+
+extconf.h is:
+/* begin */
+1: #ifndef EXTCONF_H
+2: #define EXTCONF_H
+3: #define HAVE_LIBURING_H 1
+4: #define HAVE_SYS_EPOLL_H 1
+5: #endif
+/* end */
+

data/lib/event.rb

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

data/lib/event/backend.rb

@@ -0,0 +1,49 @@
+# 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 'backend/select'
+
+module Event
+	module Backend
+		def self.default(env = ENV)
+			if backend = env['EVENT_BACKEND']&.to_sym
+				if Event::Backend.const_defined?(backend)
+					return Event::Backend.const_get(backend)
+				else
+					warn "Could not find EVENT_BACKEND=#{backend}!"
+				end
+			end
+			
+			if self.const_defined?(:URing)
+				return Event::Backend::URing
+			elsif self.const_defined?(:KQueue)
+				return Event::Backend::KQueue
+			elsif self.const_defined?(:EPoll)
+				return Event::Backend::EPoll
+			else
+				return Event::Backend::Select
+			end
+		end
+		
+		def self.new(...)
+			default.new(...)
+		end
+	end
+end

data/lib/event/backend/select.rb

@@ -28,35 +28,48 @@ module Event
 				@writable = {}
 			end
 			
+			def close
+				@loop = nil
+				@readable = nil
+				@writable = nil
+			end
+			
 			def io_wait(fiber, io, events)
+				remove_readable = remove_writable = false
+				
 				if (events & READABLE) > 0 or (events & PRIORITY) > 0
 					@readable[io] = fiber
+					remove_readable = true
 				end
 				
 				if (events & WRITABLE) > 0
 					@writable[io] = fiber
+					remove_writable = true
 				end
 				
 				@loop.transfer
+			ensure
+				@readable.delete(io) if remove_readable
+				@writable.delete(io) if remove_writable
 			end
 			
 			def select(duration = nil)
-				readable, writable, _ = IO.select(@readable.keys, @writable.keys, nil, duration)
+				readable, writable, _ = ::IO.select(@readable.keys, @writable.keys, nil, duration)
 				
-				ready = {}
+				ready = Hash.new(0)
 				
 				readable&.each do |io|
 					fiber = @readable.delete(io)
-					ready[fiber] = true
+					ready[fiber] |= READABLE
 				end
 				
 				writable&.each do |io|
 					fiber = @writable.delete(io)
-					ready[fiber] = true
+					ready[fiber] |= WRITABLE
 				end
 				
-				ready.each_key do |fiber|
-					fiber.transfer
+				ready.each do |fiber, events|
+					fiber.transfer(events)
 				end
 			end
 		end

data/lib/event/debug/selector.rb

@@ -31,6 +31,15 @@ module Event
 				@priority = {}
 			end
 			
+			def close
+				if @selector.nil?
+					raise "Selector already closed!"
+				end
+				
+				@selector.close
+				@selector = nil
+			end
+			
 			def io_wait(fiber, io, events)
 				register_readable(fiber, io, events)
 			end

data/lib/event/version.rb

@@ -1,3 +1,3 @@
 module Event
-	VERSION = "0.1.2"
+	VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: event
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-26 00:00:00.000000000 Z
+date: 2021-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bake
@@ -73,16 +73,25 @@ extensions:
 - ext/event/extconf.rb
 extra_rdoc_files: []
 files:
+- ext/event/Makefile
+- 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/uring.c
 - ext/event/backend/uring.h
+- ext/event/epoll.o
 - ext/event/event.c
 - ext/event/event.h
+- ext/event/event.o
+- ext/event/event.so
+- ext/event/extconf.h
 - ext/event/extconf.rb
+- ext/event/mkmf.log
+- ext/event/uring.o
 - lib/event.rb
+- lib/event/backend.rb
 - lib/event/backend/select.rb
 - lib/event/debug/selector.rb
 - lib/event/selector.rb
@@ -106,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: An event loop.