event 0.2.3 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a363339a1d384ea4d844450be2ff46cbc091bc0aca240e869491bf6a5d61300
-  data.tar.gz: b1b3c431481f4499bf6605010392283acfb6f54a59aed232f25217d2cce4a221
+  metadata.gz: db1ee17a5921d3aa6c3ff4314099a1879d4c7ff76f43c3001f6f7872501d1f4c
+  data.tar.gz: 3fda0f1769bfc7b489425b9b432d6225772011c8bbaaa34f0dfd5193c8ed940a
 SHA512:
-  metadata.gz: 3321631a8be1353038cdc9c63a2b6b17f02ea66924b11f5fb9126f9db1072ea4ee59141858f26e8879e1b52fe265471a2552afcab56cddd84b1e28d1611235d9
-  data.tar.gz: 7196977bd770153c5be35d16701e32a635c84cf53edf2880b4c5f095b8644825c7dcd1254a4da8f72655fb48e3ac3ec529d2ae2496691fb9ead30bb595cae357
+  metadata.gz: 768501ac864f0436b95050721b14cbf4ce0ba6a3b79d2f0d8e244523477f55fd71f82ae3e7ab088c94aa40a6d0200acc4138caff472c95426a01fa784a50911c
+  data.tar.gz: f876ffe91ed99aa0e013ddaed5e2c4e6a72724891cc3bdceae9cb3bb1b30909716c92b8d551d23a171870b2e548dec32455de028bf5ea60964969d4aed919a9a

data/ext/event/Makefile

@@ -139,8 +139,8 @@ target_prefix = /event
 LOCAL_LIBS = 
 LIBS =    
 ORIG_SRCS = event.c
-SRCS = $(ORIG_SRCS) event.c kqueue.c
-OBJS = event.o kqueue.o
+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

data/ext/event/backend/backend.c

@@ -0,0 +1,39 @@
+// 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"
+
+static ID id_transfer, id_alive_p;
+
+void Init_Event_Backend(VALUE Event_Backend) {
+	id_transfer = rb_intern("transfer");
+	id_alive_p = rb_intern("alive?");
+}
+
+VALUE
+Event_Backend_resume_safe(VALUE fiber, VALUE result) {
+	VALUE alive = rb_funcall(fiber, id_alive_p, 0);
+	
+	if (RTEST(alive)) {
+		return rb_funcall(fiber, id_transfer, 1, result);
+	} else {
+		return Qnil;
+	}
+}

data/ext/event/backend/backend.h

@@ -18,6 +18,9 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#include <ruby.h>
+#include <ruby/thread.h>
+
 enum Event {
 	READABLE = 1,
 	PRIORITY = 2,
@@ -26,4 +29,8 @@ enum Event {
 	HANGUP = 16
 };
 
-#include <ruby/thread.h>
+void
+Init_Event_Backend();
+
+VALUE
+Event_Backend_resume_safe(VALUE fiber, VALUE argument);

data/ext/event/backend/epoll.c

@@ -41,13 +41,19 @@ void Event_Backend_EPoll_Type_mark(void *_data)
 	rb_gc_mark(data->loop);
 }
 
+static
+void close_internal(struct Event_Backend_EPoll *data) {
+	if (data->descriptor >= 0) {
+		close(data->descriptor);
+		data->descriptor = -1;
+	}
+}
+
 void Event_Backend_EPoll_Type_free(void *_data)
 {
 	struct Event_Backend_EPoll *data = _data;
 	
-	if (data->descriptor >= 0) {
-		close(data->descriptor);
-	}
+	close_internal(data);
 	
 	free(data);
 }
@@ -96,6 +102,15 @@ VALUE Event_Backend_EPoll_initialize(VALUE self, VALUE loop) {
 	return self;
 }
 
+VALUE Event_Backend_EPoll_close(VALUE self) {
+	struct Event_Backend_EPoll *data = NULL;
+	TypedData_Get_Struct(self, struct Event_Backend_EPoll, &Event_Backend_EPoll_Type, data);
+	
+	close_internal(data);
+	
+	return Qnil;
+}
+
 static inline
 uint32_t epoll_flags_from_events(int events) {
 	uint32_t flags = 0;
@@ -257,13 +272,13 @@ VALUE Event_Backend_EPoll_select(VALUE self, VALUE duration) {
 		.timeout = 0
 	};
 	
-	select_internal_without_gvl(&arguments);
+	select_internal_with_gvl(&arguments);
 	
 	if (arguments.count == 0) {
 		arguments.timeout = make_timeout(duration);
 		
 		if (arguments.timeout != 0) {
-			select_internal_with_gvl(&arguments);
+			select_internal_without_gvl(&arguments);
 		}
 	}
 	
@@ -273,7 +288,7 @@ VALUE Event_Backend_EPoll_select(VALUE self, VALUE duration) {
 		
 		// fprintf(stderr, "-> fiber=%p descriptor=%d\n", (void*)fiber, events[i].data.fd);
 		
-		rb_funcall(fiber, id_transfer, 1, result);
+		Event_Backend_resume_safe(fiber, result);
 	}
 	
 	return INT2NUM(arguments.count);
@@ -287,6 +302,7 @@ void Init_Event_Backend_EPoll(VALUE Event_Backend) {
 	
 	rb_define_alloc_func(Event_Backend_EPoll, Event_Backend_EPoll_allocate);
 	rb_define_method(Event_Backend_EPoll, "initialize", Event_Backend_EPoll_initialize, 1);
+	rb_define_method(Event_Backend_EPoll, "close", Event_Backend_EPoll_close, 0);
 	
 	rb_define_method(Event_Backend_EPoll, "io_wait", Event_Backend_EPoll_io_wait, 3);
 	rb_define_method(Event_Backend_EPoll, "select", Event_Backend_EPoll_select, 1);

data/ext/event/backend/kqueue.c

@@ -41,13 +41,19 @@ void Event_Backend_KQueue_Type_mark(void *_data)
 	rb_gc_mark(data->loop);
 }
 
+static
+void close_internal(struct Event_Backend_KQueue *data) {
+	if (data->descriptor >= 0) {
+		close(data->descriptor);
+		data->descriptor = -1;
+	}
+}
+
 void Event_Backend_KQueue_Type_free(void *_data)
 {
 	struct Event_Backend_KQueue *data = _data;
 	
-	if (data->descriptor >= 0) {
-		close(data->descriptor);
-	}
+	close_internal(data);
 	
 	free(data);
 }
@@ -97,6 +103,15 @@ VALUE Event_Backend_KQueue_initialize(VALUE self, VALUE loop) {
 	return self;
 }
 
+VALUE Event_Backend_KQueue_close(VALUE self) {
+	struct Event_Backend_KQueue *data = NULL;
+	TypedData_Get_Struct(self, struct Event_Backend_KQueue, &Event_Backend_KQueue_Type, data);
+	
+	close_internal(data);
+	
+	return Qnil;
+}
+
 static
 int io_add_filters(int descriptor, int ident, int events, VALUE fiber) {
 	int count = 0;
@@ -310,7 +325,8 @@ VALUE Event_Backend_KQueue_select(VALUE self, VALUE duration) {
 	for (int i = 0; i < arguments.count; i += 1) {
 		VALUE fiber = (VALUE)arguments.events[i].udata;
 		VALUE result = INT2NUM(arguments.events[i].filter);
-		rb_funcall(fiber, id_transfer, 1, result);
+		
+		Event_Backend_resume_safe(fiber, result);
 	}
 	
 	return INT2NUM(arguments.count);
@@ -324,6 +340,7 @@ void Init_Event_Backend_KQueue(VALUE Event_Backend) {
 	
 	rb_define_alloc_func(Event_Backend_KQueue, Event_Backend_KQueue_allocate);
 	rb_define_method(Event_Backend_KQueue, "initialize", Event_Backend_KQueue_initialize, 1);
+	rb_define_method(Event_Backend_KQueue, "close", Event_Backend_KQueue_close, 0);
 	
 	rb_define_method(Event_Backend_KQueue, "io_wait", Event_Backend_KQueue_io_wait, 3);
 	rb_define_method(Event_Backend_KQueue, "select", Event_Backend_KQueue_select, 1);

data/ext/event/backend/uring.c

@@ -28,8 +28,8 @@
 static VALUE Event_Backend_URing = Qnil;
 static ID id_fileno, id_transfer;
 
-enum {URING_ENTRIES = 64};
-enum {URING_MAX_EVENTS = 64};
+enum {URING_ENTRIES = 128};
+enum {URING_MAX_EVENTS = 128};
 
 struct Event_Backend_URing {
 	VALUE loop;
@@ -42,14 +42,19 @@ void Event_Backend_URing_Type_mark(void *_data)
 	rb_gc_mark(data->loop);
 }
 
-void Event_Backend_URing_Type_free(void *_data)
-{
-	struct Event_Backend_URing *data = _data;
-	
+static
+void close_internal(struct Event_Backend_URing *data) {
 	if (data->ring.ring_fd >= 0) {
 		io_uring_queue_exit(&data->ring);
 		data->ring.ring_fd = -1;
 	}
+}
+
+void Event_Backend_URing_Type_free(void *_data)
+{
+	struct Event_Backend_URing *data = _data;
+	
+	close_internal(data);
 	
 	free(data);
 }
@@ -97,6 +102,15 @@ VALUE Event_Backend_URing_initialize(VALUE self, VALUE loop) {
 	return self;
 }
 
+VALUE Event_Backend_URing_close(VALUE self) {
+	struct Event_Backend_URing *data = NULL;
+	TypedData_Get_Struct(self, struct Event_Backend_URing, &Event_Backend_URing_Type, data);
+	
+	close_internal(data);
+	
+	return Qnil;
+}
+
 static inline
 short poll_flags_from_events(int events) {
 	short flags = 0;
@@ -128,12 +142,22 @@ struct io_wait_arguments {
 	short flags;
 };
 
+struct io_uring_sqe * io_get_sqe(struct Event_Backend_URing *data) {
+	struct io_uring_sqe *sqe = io_uring_get_sqe(&data->ring);
+	
+	while (sqe == NULL) {
+		sqe = io_uring_get_sqe(&data->ring);
+	}
+	
+	return sqe;
+}
+
 static
 VALUE io_wait_rescue(VALUE _arguments, VALUE exception) {
 	struct io_wait_arguments *arguments = (struct io_wait_arguments *)_arguments;
 	struct Event_Backend_URing *data = arguments->data;
 	
-	struct io_uring_sqe *sqe = Event_Backend_URing_io_uring_get_sqe(data);
+	struct io_uring_sqe *sqe = io_get_sqe(data);
 	
 	// fprintf(stderr, "poll_remove(%p, %p)\n", sqe, (void*)arguments->fiber);
 	
@@ -157,25 +181,14 @@ VALUE io_wait_transfer(VALUE _arguments) {
 	return INT2NUM(events_from_poll_flags(flags));
 };
 
-struct io_uring_sqe *Event_Backend_URing_io_uring_get_sqe(struct Event_Backend_URing *data) {
-	struct io_uring_sqe *sqe = NULL;
-
-	while (true) {
-		sqe = io_uring_get_sqe(&data->ring);
-		if (sqe != NULL) {
-			return sqe;
-		}
-		// The sqe is full, we need to poll before submitting more events.
-		Event_Backend_URing_select(self, INT2NUM(0));
-	}
-}
-
 VALUE Event_Backend_URing_io_wait(VALUE self, VALUE fiber, VALUE io, VALUE events) {
 	struct Event_Backend_URing *data = NULL;
 	TypedData_Get_Struct(self, struct Event_Backend_URing, &Event_Backend_URing_Type, data);
 	
 	int descriptor = NUM2INT(rb_funcall(io, id_fileno, 0));
-	struct io_uring_sqe *sqe = Event_Backend_URing_io_uring_get_sqe(data);
+	struct io_uring_sqe *sqe = io_get_sqe(data);
+	
+	if (!sqe) return INT2NUM(0);
 	
 	short flags = poll_flags_from_events(NUM2INT(events));
 	
@@ -224,7 +237,7 @@ VALUE Event_Backend_URing_io_read(VALUE self, VALUE fiber, VALUE io, VALUE buffe
 	resize_to_capacity(buffer, NUM2SIZET(offset), NUM2SIZET(length));
 	
 	int descriptor = NUM2INT(rb_funcall(io, id_fileno, 0));
-	struct io_uring_sqe *sqe = Event_Backend_URing_io_uring_get_sqe(data);
+	struct io_uring_sqe *sqe = io_get_sqe(data);
 	
 	struct iovec iovecs[1];
 	iovecs[0].iov_base = RSTRING_PTR(buffer) + NUM2SIZET(offset);
@@ -256,7 +269,7 @@ VALUE Event_Backend_URing_io_write(VALUE self, VALUE fiber, VALUE io, VALUE buff
 	}
 	
 	int descriptor = NUM2INT(rb_funcall(io, id_fileno, 0));
-	struct io_uring_sqe *sqe = Event_Backend_URing_io_uring_get_sqe(data);
+	struct io_uring_sqe *sqe = io_get_sqe(data);
 	
 	struct iovec iovecs[1];
 	iovecs[0].iov_base = RSTRING_PTR(buffer) + NUM2SIZET(offset);
@@ -384,7 +397,7 @@ VALUE Event_Backend_URing_select(VALUE self, VALUE duration) {
 		
 		io_uring_cqe_seen(&data->ring, cqes[i]);
 		
-		rb_funcall(fiber, id_transfer, 1, result);
+		Event_Backend_resume_safe(fiber, result);
 	}
 	
 	return INT2NUM(result);
@@ -398,6 +411,7 @@ void Init_Event_Backend_URing(VALUE Event_Backend) {
 	
 	rb_define_alloc_func(Event_Backend_URing, Event_Backend_URing_allocate);
 	rb_define_method(Event_Backend_URing, "initialize", Event_Backend_URing_initialize, 1);
+	rb_define_method(Event_Backend_URing, "close", Event_Backend_URing_close, 0);
 	
 	rb_define_method(Event_Backend_URing, "io_wait", Event_Backend_URing_io_wait, 3);
 	rb_define_method(Event_Backend_URing, "select", Event_Backend_URing_select, 1);

data/ext/event/event.c

@@ -19,6 +19,7 @@
 // THE SOFTWARE.
 
 #include "event.h"
+#include "backend/backend.h"
 
 VALUE Event = Qnil;
 VALUE Event_Backend = Qnil;
@@ -32,6 +33,8 @@ void Init_event()
 	Event = rb_define_module("Event");
 	Event_Backend = rb_define_module_under(Event, "Backend");
 	
+	Init_Event_Backend(Event_Backend);
+	
 	#ifdef EVENT_BACKEND_URING
 	Init_Event_Backend_URing(Event_Backend);
 	#endif

data/ext/event/extconf.rb

@@ -30,7 +30,7 @@ dir_config(extension_name)
 
 $CFLAGS << " -Wall"
 
-$srcs = ["event.c"]
+$srcs = ["event.c", "backend/backend.c"]
 $VPATH << "$(srcdir)/backend"
 
 if have_library('uring') and have_header('liburing.h')

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,6 +28,12 @@ module Event
 				@writable = {}
 			end
 			
+			def close
+				@loop = nil
+				@readable = nil
+				@writable = nil
+			end
+			
 			def io_wait(fiber, io, events)
 				remove_readable = remove_writable = false
 				
@@ -42,7 +48,6 @@ module Event
 				end
 				
 				@loop.transfer
-				
 			ensure
 				@readable.delete(io) if remove_readable
 				@writable.delete(io) if remove_writable
@@ -64,7 +69,7 @@ module Event
 				end
 				
 				ready.each do |fiber, events|
-					fiber.transfer(events)
+					fiber.transfer(events) if fiber.alive?
 				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.2.3"
+	VERSION = "0.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: event
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.4.3
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-03 00:00:00.000000000 Z
+date: 2021-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bake
@@ -74,6 +74,8 @@ 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
@@ -90,6 +92,7 @@ files:
 - ext/event/kqueue.o
 - ext/event/mkmf.log
 - lib/event.rb
+- lib/event/backend.rb
 - lib/event/backend/select.rb
 - lib/event/debug/selector.rb
 - lib/event/selector.rb
@@ -113,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: An event loop.