io-event 1.2.2 → 1.3.3

data/ext/io/event/selector/list.h

@@ -0,0 +1,88 @@
+// Released under the MIT License.
+// Copyright, 2023, by Samuel Williams.
+
+#include <stdio.h>
+#include <assert.h>
+
+struct IO_Event_List_Type {
+};
+
+struct IO_Event_List {
+	struct IO_Event_List *head, *tail;
+	struct IO_Event_List_Type *type;
+};
+
+inline static void IO_Event_List_initialize(struct IO_Event_List *list)
+{
+	list->head = list->tail = list;
+	list->type = 0;
+}
+
+inline static void IO_Event_List_clear(struct IO_Event_List *list)
+{
+	list->head = list->tail = NULL;
+	list->type = 0;
+}
+
+// Append an item to the end of the list.
+inline static void IO_Event_List_append(struct IO_Event_List *list, struct IO_Event_List *node)
+{
+	assert(node->head == NULL);
+	assert(node->tail == NULL);
+	
+	struct IO_Event_List *head = list->head;
+	node->tail = list;
+	node->head = head;
+	list->head = node;
+	head->tail = node;
+}
+
+inline static void IO_Event_List_prepend(struct IO_Event_List *list, struct IO_Event_List *node)
+{
+	assert(node->head == NULL);
+	assert(node->tail == NULL);
+	
+	struct IO_Event_List *tail = list->tail;
+	node->head = list;
+	node->tail = tail;
+	list->tail = node;
+	tail->head = node;
+}
+
+// Pop an item from the list.
+inline static void IO_Event_List_pop(struct IO_Event_List *node)
+{
+	assert(node->head != NULL);
+	assert(node->tail != NULL);
+	
+	struct IO_Event_List *head = node->head;
+	struct IO_Event_List *tail = node->tail;
+	
+	head->tail = tail;
+	tail->head = head;
+	node->head = node->tail = NULL;
+}
+
+inline static void IO_Event_List_free(struct IO_Event_List *node)
+{
+	if (node->head && node->tail) {
+		IO_Event_List_pop(node);
+	}
+}
+
+inline static int IO_Event_List_empty(struct IO_Event_List *list)
+{
+	return list->head == list->tail;
+}
+
+inline static void IO_Event_List_immutable_each(struct IO_Event_List *list, void (*callback)(struct IO_Event_List *node))
+{
+	struct IO_Event_List *node = list->tail;
+	
+	while (node != list) {
+		if (node->type)
+			callback(node);
+		
+		node = node->tail;
+	}
+}

data/ext/io/event/selector/selector.c

@@ -25,10 +25,6 @@ static const int DEBUG = 0;
 
 static ID id_transfer, id_alive_p;
 
-#ifndef HAVE_RB_PROCESS_STATUS_WAIT
-static VALUE process_wnohang;
-#endif
-
 VALUE IO_Event_Selector_fiber_transfer(VALUE fiber, int argc, VALUE *argv) {
 	// TODO Consider introducing something like `rb_fiber_scheduler_transfer(...)`.
 #ifdef HAVE__RB_FIBER_TRANSFER
@@ -76,9 +72,9 @@ int IO_Event_Selector_io_descriptor(VALUE io) {
 static ID id_wait;
 static VALUE rb_Process_Status = Qnil;
 
-VALUE IO_Event_Selector_process_status_wait(rb_pid_t pid)
+VALUE IO_Event_Selector_process_status_wait(rb_pid_t pid, int flags)
 {
-	return rb_funcall(rb_Process_Status, id_wait, 2, PIDT2NUM(pid), process_wnohang);
+	return rb_funcall(rb_Process_Status, id_wait, 2, PIDT2NUM(pid), INT2NUM(flags | WNOHANG));
 }
 #endif
 
@@ -157,7 +153,6 @@ void Init_IO_Event_Selector(VALUE IO_Event_Selector) {
 	
 #ifndef HAVE_RB_PROCESS_STATUS_WAIT
 	id_wait = rb_intern("wait");
-	process_wnohang = rb_const_get(rb_mProcess, rb_intern("WNOHANG"));
 	rb_Process_Status = rb_const_get_at(rb_mProcess, rb_intern("Status"));
 	rb_gc_register_mark_object(rb_Process_Status);
 #endif
@@ -174,23 +169,23 @@ struct wait_and_transfer_arguments {
 };
 
 static void queue_pop(struct IO_Event_Selector *backend, struct IO_Event_Selector_Queue *waiting) {
-	if (waiting->behind) {
-		waiting->behind->infront = waiting->infront;
+	if (waiting->head) {
+		waiting->head->tail = waiting->tail;
 	} else {
-		backend->waiting = waiting->infront;
+		backend->waiting = waiting->tail;
 	}
 	
-	if (waiting->infront) {
-		waiting->infront->behind = waiting->behind;
+	if (waiting->tail) {
+		waiting->tail->head = waiting->head;
 	} else {
-		backend->ready = waiting->behind;
+		backend->ready = waiting->head;
 	}
 }
 
 static void queue_push(struct IO_Event_Selector *backend, struct IO_Event_Selector_Queue *waiting) {
 	if (backend->waiting) {
-		backend->waiting->behind = waiting;
-		waiting->infront = backend->waiting;
+		backend->waiting->head = waiting;
+		waiting->tail = backend->waiting;
 	} else {
 		backend->ready = waiting;
 	}
@@ -221,8 +216,8 @@ VALUE IO_Event_Selector_resume(struct IO_Event_Selector *backend, int argc, VALU
 	rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
 	
 	struct IO_Event_Selector_Queue waiting = {
-		.behind = NULL,
-		.infront = NULL,
+		.head = NULL,
+		.tail = NULL,
 		.flags = IO_EVENT_SELECTOR_QUEUE_FIBER,
 		.fiber = rb_fiber_current()
 	};
@@ -254,8 +249,8 @@ VALUE IO_Event_Selector_raise(struct IO_Event_Selector *backend, int argc, VALUE
 	rb_check_arity(argc, 2, UNLIMITED_ARGUMENTS);
 	
 	struct IO_Event_Selector_Queue waiting = {
-		.behind = NULL,
-		.infront = NULL,
+		.head = NULL,
+		.tail = NULL,
 		.flags = IO_EVENT_SELECTOR_QUEUE_FIBER,
 		.fiber = rb_fiber_current()
 	};
@@ -276,8 +271,8 @@ void IO_Event_Selector_queue_push(struct IO_Event_Selector *backend, VALUE fiber
 {
 	struct IO_Event_Selector_Queue *waiting = malloc(sizeof(struct IO_Event_Selector_Queue));
 	
-	waiting->behind = NULL;
-	waiting->infront = NULL;
+	waiting->head = NULL;
+	waiting->tail = NULL;
 	waiting->flags = IO_EVENT_SELECTOR_QUEUE_INTERNAL;
 	waiting->fiber = fiber;
 	

data/ext/io/event/selector/selector.h

@@ -40,7 +40,10 @@ enum IO_Event {
 	IO_EVENT_PRIORITY = 2,
 	IO_EVENT_WRITABLE = 4,
 	IO_EVENT_ERROR = 8,
-	IO_EVENT_HANGUP = 16
+	IO_EVENT_HANGUP = 16,
+	
+	// Used by kqueue to differentiate between process exit and file descriptor events:
+	IO_EVENT_EXIT = 32,
 };
 
 void Init_IO_Event_Selector(VALUE IO_Event_Selector);
@@ -63,10 +66,11 @@ VALUE IO_Event_Selector_fiber_raise(VALUE fiber, int argc, VALUE *argv);
 int IO_Event_Selector_io_descriptor(VALUE io);
 #endif
 
+// Reap a process without hanging.
 #ifdef HAVE_RB_PROCESS_STATUS_WAIT
-#define IO_Event_Selector_process_status_wait(pid) rb_process_status_wait(pid)
+#define IO_Event_Selector_process_status_wait(pid, flags) rb_process_status_wait(pid, flags | WNOHANG)
 #else
-VALUE IO_Event_Selector_process_status_wait(rb_pid_t pid);
+VALUE IO_Event_Selector_process_status_wait(rb_pid_t pid, int flags);
 #endif
 
 int IO_Event_Selector_nonblock_set(int file_descriptor);
@@ -78,8 +82,8 @@ enum IO_Event_Selector_Queue_Flags {
 };
 
 struct IO_Event_Selector_Queue {
-	struct IO_Event_Selector_Queue *behind;
-	struct IO_Event_Selector_Queue *infront;
+	struct IO_Event_Selector_Queue *head;
+	struct IO_Event_Selector_Queue *tail;
 	
 	enum IO_Event_Selector_Queue_Flags flags;
 	
@@ -106,12 +110,23 @@ void IO_Event_Selector_initialize(struct IO_Event_Selector *backend, VALUE loop)
 
 static inline
 void IO_Event_Selector_mark(struct IO_Event_Selector *backend) {
-	rb_gc_mark(backend->loop);
+	rb_gc_mark_movable(backend->loop);
+	
+	struct IO_Event_Selector_Queue *ready = backend->ready;
+	while (ready) {
+		rb_gc_mark_movable(ready->fiber);
+		ready = ready->head;
+	}
+}
+
+static inline
+void IO_Event_Selector_compact(struct IO_Event_Selector *backend) {
+	backend->loop = rb_gc_location(backend->loop);
 	
 	struct IO_Event_Selector_Queue *ready = backend->ready;
 	while (ready) {
-		rb_gc_mark(ready->fiber);
-		ready = ready->behind;
+		ready->fiber = rb_gc_location(ready->fiber);
+		ready = ready->head;
 	}
 }