polyphony 0.45.5 → 0.46.0

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

@@ -3,6 +3,7 @@
 ID ID_fiber_trace;
 ID ID_ivar_auto_watcher;
 ID ID_ivar_mailbox;
+ID ID_ivar_result;
 ID ID_ivar_waiting_fibers;
 
 VALUE SYM_dead;
@@ -11,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;
@@ -22,7 +23,7 @@ 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);
 
-  TEST_RESUME_EXCEPTION(ret);
+  RAISE_IF_EXCEPTION(ret);
   RB_GC_GUARD(ret);
   return ret;
 }
@@ -41,8 +42,12 @@ inline VALUE Fiber_auto_watcher(VALUE self) {
 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");
+    INSPECT("Fiber with no thread", fiber);
+    TRACE_CALLER();
+    TRACE_C_STACK();
+    exit(-1);
+    rb_raise(rb_eRuntimeError, "No thread set for fiber");
+    // rb_warn("No thread set for fiber");
     return;
   }
 
@@ -52,8 +57,9 @@ void Fiber_make_runnable(VALUE fiber, VALUE 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");
+    INSPECT("Fiber with no thread", fiber);
+    rb_raise(rb_eRuntimeError, "No thread set for fiber");
+    // rb_warn("No thread set for fiber");
     return;
   }
 
@@ -88,7 +94,7 @@ VALUE Fiber_await(VALUE self) {
   // @running set to nil
   if (rb_ivar_get(self, ID_ivar_running) == Qfalse) {
     result = rb_ivar_get(self, ID_ivar_result);
-    TEST_RESUME_EXCEPTION(result);
+    RAISE_IF_EXCEPTION(result);
     return result;
   }
 
@@ -103,7 +109,7 @@ VALUE Fiber_await(VALUE self) {
   result = Thread_switch_fiber(rb_thread_current());
 
   rb_hash_delete(waiting_fibers, fiber);
-  TEST_RESUME_EXCEPTION(result);
+  RAISE_IF_EXCEPTION(result);
   RB_GC_GUARD(result);
   return result;
 }
@@ -158,22 +164,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_ivar_mailbox         = rb_intern("@mailbox");
-  ID_ivar_waiting_fibers  = rb_intern("@waiting_fibers");
+  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,7 +9,7 @@ ID ID_each;
 ID ID_inspect;
 ID ID_invoke;
 ID ID_new;
-ID ID_ivar_result;
+ID ID_ivar_io;
 ID ID_ivar_runnable;
 ID ID_ivar_running;
 ID ID_ivar_thread;
@@ -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,8 +61,8 @@ void Init_Polyphony() {
   ID_each           = rb_intern("each");
   ID_inspect        = rb_intern("inspect");
   ID_invoke         = rb_intern("invoke");
-  ID_ivar_result    = rb_intern("@result");
-  ID_ivar_runnable  = rb_intern("runnable");
+  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");

data/ext/polyphony/polyphony.h

@@ -1,29 +1,33 @@
 #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__); }
 
 #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); }
 
 extern backend_interface_t backend_interface;
 #define __BACKEND__ (backend_interface)
@@ -41,7 +45,7 @@ extern ID ID_fiber_trace;
 extern ID ID_inspect;
 extern ID ID_invoke;
 extern ID ID_ivar_backend;
-extern ID ID_ivar_result;
+extern ID ID_ivar_io;
 extern ID ID_ivar_runnable;
 extern ID ID_ivar_running;
 extern ID ID_ivar_thread;
@@ -53,8 +57,8 @@ 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;

data/ext/polyphony/polyphony_ext.c

@@ -2,23 +2,29 @@
 
 void Init_Fiber();
 void Init_Polyphony();
-void Init_LibevBackend();
+void Init_Backend();
 void Init_Queue();
 void Init_Event();
 void Init_Runqueue();
 void Init_Thread();
 void Init_Tracing();
 
-void Init_polyphony_ext() {
-  ev_set_allocator(xrealloc);
+#ifdef POLYPHONY_PLAYGROUND
+extern void playground();
+#endif
 
+void Init_polyphony_ext() {
   Init_Polyphony();
 
-  Init_LibevBackend();
+  Init_Backend();
   Init_Queue();
   Init_Event();
   Init_Runqueue();
   Init_Fiber();
   Init_Thread();
   Init_Tracing();
+
+  #ifdef POLYPHONY_PLAYGROUND
+  playground();
+  #endif
 }

data/ext/polyphony/queue.c

@@ -89,7 +89,7 @@ VALUE Queue_shift(VALUE self) {
     VALUE switchpoint_result = __BACKEND__.wait_event(backend, Qnil);
     ring_buffer_delete(&queue->shift_queue, fiber);
 
-    TEST_RESUME_EXCEPTION(switchpoint_result);
+    RAISE_IF_EXCEPTION(switchpoint_result);
     RB_GC_GUARD(switchpoint_result);
 
     if (queue->values.count > 0)

data/ext/polyphony/thread.c

@@ -4,6 +4,7 @@ ID ID_deactivate_all_watchers_post_fork;
 ID ID_ivar_backend;
 ID ID_ivar_join_wait_queue;
 ID ID_ivar_main_fiber;
+ID ID_ivar_result;
 ID ID_ivar_terminated;
 ID ID_ivar_runqueue;
 ID ID_stop;
@@ -125,7 +126,7 @@ VALUE Thread_reset_fiber_scheduling(VALUE self) {
   return self;
 }
 
-VALUE Thread_fiber_break_out_of_ev_loop(VALUE self, VALUE fiber, VALUE resume_obj) {
+VALUE Thread_fiber_schedule_and_wakeup(VALUE self, VALUE fiber, VALUE resume_obj) {
   VALUE backend = rb_ivar_get(self, ID_ivar_backend);
   if (fiber != Qnil) {
     Thread_schedule_fiber_with_priority(self, fiber, resume_obj);
@@ -148,7 +149,7 @@ void Init_Thread() {
   rb_define_method(rb_cThread, "setup_fiber_scheduling", Thread_setup_fiber_scheduling, 0);
   rb_define_method(rb_cThread, "reset_fiber_scheduling", Thread_reset_fiber_scheduling, 0);
   rb_define_method(rb_cThread, "fiber_scheduling_stats", Thread_fiber_scheduling_stats, 0);
-  rb_define_method(rb_cThread, "break_out_of_ev_loop", Thread_fiber_break_out_of_ev_loop, 2);
+  rb_define_method(rb_cThread, "schedule_and_wakeup", Thread_fiber_schedule_and_wakeup, 2);
 
   rb_define_method(rb_cThread, "schedule_fiber", Thread_schedule_fiber, 2);
   rb_define_method(rb_cThread, "schedule_fiber_with_priority",
@@ -157,13 +158,14 @@ void Init_Thread() {
 
   rb_define_method(rb_cThread, "debug!", Thread_debug, 0);
 
-  ID_deactivate_all_watchers_post_fork = rb_intern("deactivate_all_watchers_post_fork");
-  ID_ivar_backend               = rb_intern("@backend");
-  ID_ivar_join_wait_queue     = rb_intern("@join_wait_queue");
-  ID_ivar_main_fiber          = rb_intern("@main_fiber");
-  ID_ivar_runqueue            = rb_intern("@runqueue");
-  ID_ivar_terminated          = rb_intern("@terminated");
-  ID_stop                     = rb_intern("stop");
+  ID_deactivate_all_watchers_post_fork  = rb_intern("deactivate_all_watchers_post_fork");
+  ID_ivar_backend                       = rb_intern("@backend");
+  ID_ivar_join_wait_queue               = rb_intern("@join_wait_queue");
+  ID_ivar_main_fiber                    = rb_intern("@main_fiber");
+  ID_ivar_result                        = rb_intern("@result");
+  ID_ivar_terminated                    = rb_intern("@terminated");
+  ID_ivar_runqueue                      = rb_intern("@runqueue");
+  ID_stop                               = rb_intern("stop");
 
   SYM_scheduled_fibers = ID2SYM(rb_intern("scheduled_fibers"));
   SYM_pending_watchers = ID2SYM(rb_intern("pending_watchers"));