polyphony 0.45.1 → 0.46.1

data/ext/polyphony/event.c

@@ -69,7 +69,7 @@ VALUE Event_await(VALUE self) {
   VALUE switchpoint_result = __BACKEND__.wait_event(backend, Qnil);
   event->waiting_fiber = Qnil;
 
-  TEST_RESUME_EXCEPTION(switchpoint_result);
+  RAISE_IF_EXCEPTION(switchpoint_result);
   RB_GC_GUARD(backend);
   RB_GC_GUARD(switchpoint_result);
 

data/ext/polyphony/extconf.rb

@@ -1,20 +1,38 @@
 # frozen_string_literal: true
 
-require "rubygems"
+require 'rubygems'
+require 'mkmf'
 
-require "mkmf"
+use_liburing = false
+force_use_libev = ENV['POLYPHONY_USE_LIBEV'] != nil
 
-have_header("unistd.h")
+if !force_use_libev && RUBY_PLATFORM =~ /linux/ && `uname -sr` =~ /Linux 5\.([\d+])/
+  kernel_minor_version = $1.gsub('.', '').to_i
+  use_liburing = kernel_minor_version >= 6
+end
 
-$defs << "-DEV_USE_LINUXAIO"     if have_header("linux/aio_abi.h")
-$defs << "-DEV_USE_SELECT"       if have_header("sys/select.h")
-$defs << "-DEV_USE_POLL"         if have_type("port_event_t", "poll.h")
-$defs << "-DEV_USE_EPOLL"        if have_header("sys/epoll.h")
-$defs << "-DEV_USE_KQUEUE"       if have_header("sys/event.h") && have_header("sys/queue.h")
-$defs << "-DEV_USE_PORT"         if have_type("port_event_t", "port.h")
-$defs << "-DHAVE_SYS_RESOURCE_H" if have_header("sys/resource.h")
+if use_liburing
+  $defs << "-DPOLYPHONY_BACKEND_LIBURING"
+  $CFLAGS << " -Wno-pointer-arith"
+else
+  $defs << "-DPOLYPHONY_BACKEND_LIBEV"
+  $defs << '-DEV_USE_LINUXAIO'     if have_header('linux/aio_abi.h')
+  $defs << '-DEV_USE_SELECT'       if have_header('sys/select.h')
+  $defs << '-DEV_USE_POLL'         if have_type('port_event_t', 'poll.h')
+  $defs << '-DEV_USE_EPOLL'        if have_header('sys/epoll.h')
+  $defs << '-DEV_USE_KQUEUE'       if have_header('sys/event.h') && have_header('sys/queue.h')
+  $defs << '-DEV_USE_PORT'         if have_type('port_event_t', 'port.h')
+  $defs << '-DHAVE_SYS_RESOURCE_H' if have_header('sys/resource.h')  
+  $CFLAGS << " -Wno-comment"
+  $CFLAGS << " -Wno-unused-result"
+  $CFLAGS << " -Wno-dangling-else"
+  $CFLAGS << " -Wno-parentheses"
+end
 
-CONFIG["optflags"] << " -fno-strict-aliasing" unless RUBY_PLATFORM =~ /mswin/
+$defs << '-DPOLYPHONY_PLAYGROUND' if ENV['POLYPHONY_PLAYGROUND']
 
-dir_config "polyphony_ext"
-create_makefile "polyphony_ext"
+CONFIG['optflags'] << ' -fno-strict-aliasing' unless RUBY_PLATFORM =~ /mswin/
+
+
+dir_config 'polyphony_ext'
+create_makefile 'polyphony_ext'

data/ext/polyphony/fiber.c

@@ -2,12 +2,9 @@
 
 ID ID_fiber_trace;
 ID ID_ivar_auto_watcher;
-ID ID_trace_ev_loop_enter;
-ID ID_trace_ev_loop_leave;
-ID ID_trace_run;
-ID ID_trace_runnable;
-ID ID_trace_terminate;
-ID ID_trace_wait;
+ID ID_ivar_mailbox;
+ID ID_ivar_result;
+ID ID_ivar_waiting_fibers;
 
 VALUE SYM_dead;
 VALUE SYM_running;
@@ -15,8 +12,8 @@ VALUE SYM_runnable;
 VALUE SYM_waiting;
 
 VALUE SYM_fiber_create;
-VALUE SYM_fiber_ev_loop_enter;
-VALUE SYM_fiber_ev_loop_leave;
+VALUE SYM_fiber_event_poll_enter;
+VALUE SYM_fiber_event_poll_leave;
 VALUE SYM_fiber_run;
 VALUE SYM_fiber_schedule;
 VALUE SYM_fiber_switchpoint;
@@ -24,9 +21,9 @@ VALUE SYM_fiber_terminate;
 
 static VALUE Fiber_safe_transfer(int argc, VALUE *argv, VALUE self) {
   VALUE arg = (argc == 0) ? Qnil : argv[0];
-  VALUE ret = rb_funcall(self, ID_transfer, 1, arg);
+  VALUE ret = FIBER_TRANSFER(self, arg);
 
-  TEST_RESUME_EXCEPTION(ret);
+  RAISE_IF_EXCEPTION(ret);
   RB_GC_GUARD(ret);
   return ret;
 }
@@ -42,38 +39,117 @@ inline VALUE Fiber_auto_watcher(VALUE self) {
   return watcher;
 }
 
+void Fiber_make_runnable(VALUE fiber, VALUE value) {
+  VALUE thread = rb_ivar_get(fiber, ID_ivar_thread);
+  if (thread == Qnil) {
+    rb_raise(rb_eRuntimeError, "No thread set for fiber");
+    // rb_warn("No thread set for fiber");
+    return;
+  }
+
+  Thread_schedule_fiber(thread, fiber, value);
+}
+
+void Fiber_make_runnable_with_priority(VALUE fiber, VALUE value) {
+  VALUE thread = rb_ivar_get(fiber, ID_ivar_thread);
+  if (thread == Qnil) {
+    rb_raise(rb_eRuntimeError, "No thread set for fiber");
+    // rb_warn("No thread set for fiber");
+    return;
+  }
+
+  Thread_schedule_fiber_with_priority(thread, fiber, value);
+}
+
 static VALUE Fiber_schedule(int argc, VALUE *argv, VALUE self) {
   VALUE value = (argc == 0) ? Qnil : argv[0];
   Fiber_make_runnable(self, value);
   return self;
 }
 
+static VALUE Fiber_schedule_with_priority(int argc, VALUE *argv, VALUE self) {
+  VALUE value = (argc == 0) ? Qnil : argv[0];
+  Fiber_make_runnable_with_priority(self, value);
+  return self;
+}
+
 static VALUE Fiber_state(VALUE self) {
   if (!rb_fiber_alive_p(self) || (rb_ivar_get(self, ID_ivar_running) == Qfalse))
     return SYM_dead;
   if (rb_fiber_current() == self) return SYM_running;
-  if (rb_ivar_get(self, ID_runnable) != Qnil) return SYM_runnable;
+  if (rb_ivar_get(self, ID_ivar_runnable) != Qnil) return SYM_runnable;
 
   return SYM_waiting;
 }
 
-void Fiber_make_runnable(VALUE fiber, VALUE value) {
-  VALUE thread = rb_ivar_get(fiber, ID_ivar_thread);
-  if (thread != Qnil) {
-    Thread_schedule_fiber(thread, fiber, value);
+VALUE Fiber_await(VALUE self) {
+  VALUE result;
+
+  // we compare with false, since a fiber that has not yet started will have
+  // @running set to nil
+  if (rb_ivar_get(self, ID_ivar_running) == Qfalse) {
+    result = rb_ivar_get(self, ID_ivar_result);
+    RAISE_IF_EXCEPTION(result);
+    return result;
+  }
+
+  VALUE fiber = rb_fiber_current();
+  VALUE waiting_fibers = rb_ivar_get(self, ID_ivar_waiting_fibers);
+  if (waiting_fibers == Qnil) {
+    waiting_fibers = rb_hash_new();
+    rb_ivar_set(self, ID_ivar_waiting_fibers, waiting_fibers);
+  }
+  rb_hash_aset(waiting_fibers, fiber, Qtrue);
+
+  result = Thread_switch_fiber(rb_thread_current());
+
+  rb_hash_delete(waiting_fibers, fiber);
+  RAISE_IF_EXCEPTION(result);
+  RB_GC_GUARD(result);
+  return result;
+}
+
+VALUE Fiber_send(VALUE self, VALUE value) {
+  VALUE mailbox = rb_ivar_get(self, ID_ivar_mailbox);
+  if (mailbox == Qnil) {
+    mailbox = rb_funcall(cQueue, ID_new, 0);
+    rb_ivar_set(self, ID_ivar_mailbox, mailbox);
   }
-  else {
-    rb_warn("No thread set for fiber (fiber, value, caller):");
+  Queue_push(mailbox, value);
+  return self;
+}
+
+VALUE Fiber_receive(VALUE self) {
+  VALUE mailbox = rb_ivar_get(self, ID_ivar_mailbox);
+  if (mailbox == Qnil) {
+    mailbox = rb_funcall(cQueue, ID_new, 0);
+    rb_ivar_set(self, ID_ivar_mailbox, mailbox);
   }
+  return Queue_shift(mailbox);  
+}
+
+VALUE Fiber_receive_all_pending(VALUE self) {
+  VALUE mailbox = rb_ivar_get(self, ID_ivar_mailbox);
+  return (mailbox == Qnil) ? rb_ary_new() : Queue_shift_all(mailbox);
 }
 
 void Init_Fiber() {
   VALUE cFiber = rb_const_get(rb_cObject, rb_intern("Fiber"));
   rb_define_method(cFiber, "safe_transfer", Fiber_safe_transfer, -1);
   rb_define_method(cFiber, "schedule", Fiber_schedule, -1);
+  rb_define_method(cFiber, "schedule_with_priority", Fiber_schedule_with_priority, -1);
   rb_define_method(cFiber, "state", Fiber_state, 0);
   rb_define_method(cFiber, "auto_watcher", Fiber_auto_watcher, 0);
 
+  rb_define_method(cFiber, "await", Fiber_await, 0);
+  rb_define_method(cFiber, "join", Fiber_await, 0);
+
+  rb_define_method(cFiber, "<<", Fiber_send, 1);
+  rb_define_method(cFiber, "send", Fiber_send, 1);
+
+  rb_define_method(cFiber, "receive", Fiber_receive, 0);
+  rb_define_method(cFiber, "receive_all_pending", Fiber_receive_all_pending, 0);
+
   SYM_dead = ID2SYM(rb_intern("dead"));
   SYM_running = ID2SYM(rb_intern("running"));
   SYM_runnable = ID2SYM(rb_intern("runnable"));
@@ -83,20 +159,23 @@ void Init_Fiber() {
   rb_global_variable(&SYM_runnable);
   rb_global_variable(&SYM_waiting);
 
-  ID_fiber_trace          = rb_intern("__fiber_trace__");
-  ID_ivar_auto_watcher    = rb_intern("@auto_watcher");
+  ID_fiber_trace              = rb_intern("__fiber_trace__");
+  ID_ivar_auto_watcher        = rb_intern("@auto_watcher");
+  ID_ivar_mailbox             = rb_intern("@mailbox");
+  ID_ivar_result              = rb_intern("@result");
+  ID_ivar_waiting_fibers      = rb_intern("@waiting_fibers");
 
-  SYM_fiber_create        = ID2SYM(rb_intern("fiber_create"));
-  SYM_fiber_ev_loop_enter = ID2SYM(rb_intern("fiber_ev_loop_enter"));
-  SYM_fiber_ev_loop_leave = ID2SYM(rb_intern("fiber_ev_loop_leave"));
-  SYM_fiber_run           = ID2SYM(rb_intern("fiber_run"));
-  SYM_fiber_schedule      = ID2SYM(rb_intern("fiber_schedule"));
-  SYM_fiber_switchpoint   = ID2SYM(rb_intern("fiber_switchpoint"));
-  SYM_fiber_terminate     = ID2SYM(rb_intern("fiber_terminate"));
+  SYM_fiber_create            = ID2SYM(rb_intern("fiber_create"));
+  SYM_fiber_event_poll_enter  = ID2SYM(rb_intern("fiber_event_poll_enter"));
+  SYM_fiber_event_poll_leave  = ID2SYM(rb_intern("fiber_event_poll_leave"));
+  SYM_fiber_run               = ID2SYM(rb_intern("fiber_run"));
+  SYM_fiber_schedule          = ID2SYM(rb_intern("fiber_schedule"));
+  SYM_fiber_switchpoint       = ID2SYM(rb_intern("fiber_switchpoint"));
+  SYM_fiber_terminate         = ID2SYM(rb_intern("fiber_terminate"));
 
   rb_global_variable(&SYM_fiber_create);
-  rb_global_variable(&SYM_fiber_ev_loop_enter);
-  rb_global_variable(&SYM_fiber_ev_loop_leave);
+  rb_global_variable(&SYM_fiber_event_poll_enter);
+  rb_global_variable(&SYM_fiber_event_poll_leave);
   rb_global_variable(&SYM_fiber_run);
   rb_global_variable(&SYM_fiber_schedule);
   rb_global_variable(&SYM_fiber_switchpoint);

data/ext/polyphony/libev.c

@@ -1,2 +1,6 @@
+#ifdef POLYPHONY_BACKEND_LIBEV
+
 #include "libev.h"
 #include "../libev/ev.c"
+
+#endif // POLYPHONY_BACKEND_LIBEV

data/ext/polyphony/libev.h

@@ -1,4 +1,8 @@
-#define EV_STANDALONE /* keeps ev from requiring config.h */
+#define EV_STANDALONE
+
+#ifdef POLYPHONY_BACKEND_LIBEV
+
+/* keeps ev from requiring config.h */
 
 #ifdef _WIN32
 #define EV_SELECT_IS_WINSOCKET 1
@@ -6,4 +10,6 @@
 #define EV_USE_REALTIME 0
 #endif
 
-#include "../libev/ev.h"
+#include "../libev/ev.h"
+
+#endif // POLYPHONY_BACKEND_LIBEV

data/ext/polyphony/liburing.c

@@ -0,0 +1,8 @@
+#ifdef POLYPHONY_BACKEND_LIBURING
+
+#include "../liburing/queue.c"
+#include "../liburing/register.c"
+#include "../liburing/setup.c"
+#include "../liburing/syscall.c"
+
+#endif // POLYPHONY_BACKEND_LIBURING

data/ext/polyphony/playground.c

@@ -0,0 +1,51 @@
+#ifdef POLYPHONY_PLAYGROUND
+
+#include <netdb.h>
+#include <sys/socket.h>
+#include <sys/uio.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+#include "polyphony.h"
+#include "../liburing/liburing.h"
+#include "ruby/thread.h"
+
+#include <poll.h>
+#include <sys/types.h>
+#include <sys/eventfd.h>
+#include <sys/wait.h>
+#include <time.h>
+#include <stdnoreturn.h>
+
+void print(struct io_uring *ring, const char *str) {
+  struct io_uring_sqe *sqe = io_uring_get_sqe(ring);
+  io_uring_prep_write(sqe, 1, str, strlen(str), -1);
+  io_uring_sqe_set_data(sqe, (void *)42);
+  // io_uring_sqe_set_flags(sqe, IOSQE_ASYNC);
+  io_uring_submit(ring);
+
+  struct io_uring_cqe *cqe;
+  int ret = __io_uring_get_cqe(ring, &cqe, 0, 1, NULL);
+  if (ret != 0) {
+    printf("ret: %d\n", ret);
+    exit(1);
+  }
+  printf("  cqe res: %d\n", cqe->res);
+  io_uring_cqe_seen(ring, cqe);
+}
+
+noreturn void playground() {
+  struct io_uring ring;
+  io_uring_queue_init(1024, &ring, 0);
+
+  for (int i = 0; i < 10; i++) {
+    print(&ring, "hi\n");
+  }
+
+  io_uring_queue_exit(&ring);
+  exit(0);
+}
+
+#endif //POLYPHONY_PLAYGROUND

data/ext/polyphony/polyphony.c

@@ -9,10 +9,10 @@ ID ID_each;
 ID ID_inspect;
 ID ID_invoke;
 ID ID_new;
+ID ID_ivar_io;
+ID ID_ivar_runnable;
 ID ID_ivar_running;
 ID ID_ivar_thread;
-ID ID_runnable;
-ID ID_runnable_value;
 ID ID_size;
 ID ID_signal;
 ID ID_switch_fiber;
@@ -29,7 +29,7 @@ VALUE Polyphony_snooze(VALUE self) {
 
   Fiber_make_runnable(fiber, Qnil);
   ret = Thread_switch_fiber(rb_thread_current());
-  TEST_RESUME_EXCEPTION(ret);
+  RAISE_IF_EXCEPTION(ret);
   RB_GC_GUARD(ret);
   return ret;
 }
@@ -37,7 +37,7 @@ VALUE Polyphony_snooze(VALUE self) {
 static VALUE Polyphony_suspend(VALUE self) {
   VALUE ret = Thread_switch_fiber(rb_thread_current());
 
-  TEST_RESUME_EXCEPTION(ret);
+  RAISE_IF_EXCEPTION(ret);
   RB_GC_GUARD(ret);
   return ret;
 }
@@ -61,11 +61,11 @@ void Init_Polyphony() {
   ID_each           = rb_intern("each");
   ID_inspect        = rb_intern("inspect");
   ID_invoke         = rb_intern("invoke");
+  ID_ivar_io        = rb_intern("@io");
+  ID_ivar_runnable  = rb_intern("@runnable");
   ID_ivar_running   = rb_intern("@running");
   ID_ivar_thread    = rb_intern("@thread");
   ID_new            = rb_intern("new");
-  ID_runnable       = rb_intern("runnable");
-  ID_runnable_value = rb_intern("runnable_value");
   ID_signal         = rb_intern("signal");
   ID_size           = rb_intern("size");
   ID_switch_fiber   = rb_intern("switch_fiber");

data/ext/polyphony/polyphony.h

@@ -1,28 +1,36 @@
 #ifndef POLYPHONY_H
 #define POLYPHONY_H
 
+#include <execinfo.h>
+
 #include "ruby.h"
-#include "ruby/io.h"
-#include "libev.h"
 #include "backend.h"
+#include "runqueue_ring_buffer.h"
 
 // debugging
 #define OBJ_ID(obj) (NUM2LONG(rb_funcall(obj, rb_intern("object_id"), 0)))
-#define INSPECT(str, obj) { printf(str); VALUE s = rb_funcall(obj, rb_intern("inspect"), 0); printf("%s\n", StringValueCStr(s)); }
+#define INSPECT(str, obj) { printf(str); VALUE s = rb_funcall(obj, rb_intern("inspect"), 0); printf(": %s\n", StringValueCStr(s)); }
 #define TRACE_CALLER() { VALUE c = rb_funcall(rb_mKernel, rb_intern("caller"), 0); INSPECT("caller: ", c); }
+#define TRACE_C_STACK() { \
+  void *entries[10]; \
+  size_t size = backtrace(entries, 10); \
+  char **strings = backtrace_symbols(entries, size); \
+  for (unsigned long i = 0; i < size; i++) printf("%s\n", strings[i]); \
+  free(strings); \
+}
 
 // tracing
 #define TRACE(...)  rb_funcall(rb_cObject, ID_fiber_trace, __VA_ARGS__)
-#define COND_TRACE(...) if (__tracing_enabled__) { \
-  TRACE(__VA_ARGS__); \
-}
+#define COND_TRACE(...) if (__tracing_enabled__) { TRACE(__VA_ARGS__); }
 
+// exceptions
 #define TEST_EXCEPTION(ret) (RTEST(rb_obj_is_kind_of(ret, rb_eException)))
-
 #define RAISE_EXCEPTION(e) rb_funcall(e, ID_invoke, 0);
-#define TEST_RESUME_EXCEPTION(ret) if (RTEST(rb_obj_is_kind_of(ret, rb_eException))) { \
-  return RAISE_EXCEPTION(ret); \
-}
+#define RAISE_IF_EXCEPTION(ret) if (RTEST(rb_obj_is_kind_of(ret, rb_eException))) { RAISE_EXCEPTION(ret); }
+#define RAISE_IF_NOT_NIL(ret) if (ret != Qnil) { RAISE_EXCEPTION(ret); }
+
+// Fiber#transfer
+#define FIBER_TRANSFER(fiber, value) rb_funcall(fiber, ID_transfer, 1, value)
 
 extern backend_interface_t backend_interface;
 #define __BACKEND__ (backend_interface)
@@ -30,6 +38,7 @@ extern backend_interface_t backend_interface;
 extern VALUE mPolyphony;
 extern VALUE cQueue;
 extern VALUE cEvent;
+extern VALUE cRunqueue;
 
 extern ID ID_call;
 extern ID ID_caller;
@@ -39,20 +48,20 @@ extern ID ID_fiber_trace;
 extern ID ID_inspect;
 extern ID ID_invoke;
 extern ID ID_ivar_backend;
+extern ID ID_ivar_io;
+extern ID ID_ivar_runnable;
 extern ID ID_ivar_running;
 extern ID ID_ivar_thread;
 extern ID ID_new;
 extern ID ID_raise;
-extern ID ID_runnable;
-extern ID ID_runnable_value;
 extern ID ID_signal;
 extern ID ID_size;
 extern ID ID_switch_fiber;
 extern ID ID_transfer;
 
 extern VALUE SYM_fiber_create;
-extern VALUE SYM_fiber_ev_loop_enter;
-extern VALUE SYM_fiber_ev_loop_leave;
+extern VALUE SYM_fiber_event_poll_enter;
+extern VALUE SYM_fiber_event_poll_leave;
 extern VALUE SYM_fiber_run;
 extern VALUE SYM_fiber_schedule;
 extern VALUE SYM_fiber_switchpoint;
@@ -72,13 +81,24 @@ void Fiber_make_runnable(VALUE fiber, VALUE value);
 VALUE Queue_push(VALUE self, VALUE value);
 VALUE Queue_unshift(VALUE self, VALUE value);
 VALUE Queue_shift(VALUE self);
+VALUE Queue_shift_all(VALUE self);
 VALUE Queue_shift_no_wait(VALUE self);
 VALUE Queue_clear(VALUE self);
 VALUE Queue_delete(VALUE self, VALUE value);
 long Queue_len(VALUE self);
 void Queue_trace(VALUE self);
 
+
+void Runqueue_push(VALUE self, VALUE fiber, VALUE value, int reschedule);
+void Runqueue_unshift(VALUE self, VALUE fiber, VALUE value, int reschedule);
+runqueue_entry Runqueue_shift(VALUE self);
+void Runqueue_delete(VALUE self, VALUE fiber);
+void Runqueue_clear(VALUE self);
+long Runqueue_len(VALUE self);
+int Runqueue_empty_p(VALUE self);
+
 VALUE Thread_schedule_fiber(VALUE thread, VALUE fiber, VALUE value);
+VALUE Thread_schedule_fiber_with_priority(VALUE thread, VALUE fiber, VALUE value);
 VALUE Thread_switch_fiber(VALUE thread);
 
 #endif /* POLYPHONY_H */