polyphony 0.75 → 0.79

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25015dd770af4d3b375af0625cfe9fe98becb328a0e77abb3101be2580279a7c
-  data.tar.gz: e2227ea3fa7d3ec04f5b580afdc92b9d7aacbab76b9e17dd0b86fb5e4e5b6a6f
+  metadata.gz: 34ed5a7685a8986f1fe5fd6cd714ee049633952746ecb8bced1aee73553c6c99
+  data.tar.gz: 03ded408e8849a921d0cfbbe1a232c5cea83cfbd58710efade4900f6240f511c
 SHA512:
-  metadata.gz: 967f6aa30621aae39dafdb587c28e1c0ec96685fc82972adb19fb50de7adfaaa42ce861c0f941f85ad536e29b459251d22c34a6bd96f8fc89f23dd4c0ecac47a
-  data.tar.gz: b3d6884d859c4eb61ca1d8bc8d1b727a5bf66c6c1af5280896264414bf14654650a1d8bcf3a6b744d235f5dd435e9231a0e047f95a17bfb7ce1642791c347c05
+  metadata.gz: 91fe5a0979c0158315e942bba88f563a47926e78ad3da0ff8e483ee91aff1482af1f2fc3e3aa4cacd49e787531627bfc3295d45439e99d8400b4736b1a749443
+  data.tar.gz: 3c1eaaccec661c4f3e4c07853fbaaaab19222837d5ac25b4098856bd1b1367833cbc35a58602fb9c30ff8e7cd63d04f79206bf07438a1e842eb86871c8036063

data/.github/workflows/test.yml

@@ -19,7 +19,7 @@ jobs:
       POLYPHONY_USE_LIBEV: "1"
 
     steps:
-    - name: Setup OS
+    - name: Setup machine
       uses: actions/checkout@v1
     - name: Setup Ruby
       uses: ruby/setup-ruby@v1

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 0.79 2022-02-19
+
+- Overhaul trace events system (#73)
+
+## 0.78 2022-02-16
+
+- Fix Polyphony::Queue API compatibility (#72)
+
+## 0.77 2022-02-07
+
+- Fix behaviour of signal traps (#71)
+
+## 0.76 2022-02-06
+
+- Comment out `Backend_close` API (#70)
+
 ## 0.75 2022-02-04
 
 - Fix handling of MoveOn on main fiber of forked process

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    polyphony (0.75)
+    polyphony (0.79)
 
 GEM
   remote: https://rubygems.org/

data/examples/core/pingpong.rb

@@ -3,18 +3,21 @@
 require 'bundler/setup'
 require 'polyphony'
 
-pong = spin_loop do
+require 'polyphony/core/debug'
+Polyphony::Trace.start_event_firehose(STDOUT)
+
+pong = spin_loop(:pong) do
   msg, ping = receive
   puts msg
   ping << 'pong'
 end
 
-ping = spin do
-  3.times do
+ping = spin(:ping) do
+  1.times do
     pong << ['ping', Fiber.current]
     msg = receive
     puts msg
   end
 end
 
-ping.await
+ping.await

data/examples/core/trap1.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+pid = Process.pid
+fork do
+  sleep 1
+  Process.kill('SIGINT', pid)
+  # sleep 10
+  # Process.kill(-9, pid)
+end
+
+require 'bundler/setup'
+require 'polyphony'
+
+Thread.backend.trace_proc = proc { |*e| STDOUT.orig_write("#{e.inspect}\n") }
+trap('SIGINT') { STDOUT.orig_write("* recv SIGINT\n") }
+# trap('SIGCHLD') { STDOUT.orig_write("* recv SIGCHLD\n") }
+STDOUT.orig_write("* pre gets\n")
+# STDIN.wait_readable
+s = gets
+p s
+STDOUT.orig_write("* post gets\n")

data/examples/core/trap2.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+pid = Process.pid
+fork do
+  sleep 1
+  Process.kill('SIGINT', pid)
+  # sleep 10
+  # Process.kill(-9, pid)
+end
+
+trap('SIGINT') {}
+p :before
+result = IO.select([STDIN])
+p :after

data/ext/polyphony/backend_common.c

@@ -65,7 +65,7 @@ VALUE backend_base_switch_fiber(VALUE backend, struct Backend_base *base) {
 
   base->switch_count++;
   if (SHOULD_TRACE(base))
-    TRACE(base, 3, SYM_fiber_switchpoint, current_fiber, CALLER());
+    TRACE(base, 3, SYM_block, current_fiber, CALLER());
 
   while (1) {
     next = runqueue_shift(&base->runqueue);
@@ -96,8 +96,6 @@ VALUE backend_base_switch_fiber(VALUE backend, struct Backend_base *base) {
   if (next.fiber == Qnil) return Qnil;
 
   // run next fiber
-  COND_TRACE(base, 3, SYM_fiber_run, next.fiber, next.value);
-
   rb_ivar_set(next.fiber, ID_ivar_runnable, Qnil);
   RB_GC_GUARD(next.fiber);
   RB_GC_GUARD(next.value);
@@ -112,7 +110,7 @@ void backend_base_schedule_fiber(VALUE thread, VALUE backend, struct Backend_bas
   if (rb_fiber_alive_p(fiber) != Qtrue) return;
   already_runnable = rb_ivar_get(fiber, ID_ivar_runnable) != Qnil;
 
-  COND_TRACE(base, 4, SYM_fiber_schedule, fiber, value, prioritize ? Qtrue : Qfalse);
+  COND_TRACE(base, 5, SYM_schedule, fiber, value, prioritize ? Qtrue : Qfalse, CALLER());
 
   runqueue = rb_ivar_get(fiber, ID_ivar_parked) == Qtrue ? &base->parked_runqueue : &base->runqueue;
 
@@ -244,15 +242,24 @@ inline VALUE backend_await(struct Backend_base *backend) {
   VALUE ret;
   backend->pending_count++;
   ret = Thread_switch_fiber(rb_thread_current());
+
+  // run next fiber
+  COND_TRACE(backend, 4, SYM_unblock, rb_fiber_current(), ret, CALLER());
+
   backend->pending_count--;
   RB_GC_GUARD(ret);
   return ret;
 }
 
-inline VALUE backend_snooze() {
+inline VALUE backend_snooze(struct Backend_base *backend) {
   VALUE ret;
-  Fiber_make_runnable(rb_fiber_current(), Qnil);
-  ret = Thread_switch_fiber(rb_thread_current());
+  VALUE fiber = rb_fiber_current();
+  VALUE thread = rb_thread_current();
+  Fiber_make_runnable(fiber, Qnil);
+  ret = Thread_switch_fiber(thread);
+
+  COND_TRACE(backend, 4, SYM_unblock, fiber, ret, CALLER());
+  
   return ret;
 }
 

data/ext/polyphony/backend_common.h

@@ -80,7 +80,7 @@ void fptr_finalize(rb_io_t *fptr);
 
 struct backend_stats backend_get_stats(VALUE self);
 VALUE backend_await(struct Backend_base *backend);
-VALUE backend_snooze();
+VALUE backend_snooze(struct Backend_base *backend);
 
 // macros for doing read loops
 #define READ_LOOP_PREPARE_STR() { \

data/ext/polyphony/backend_io_uring.c

@@ -191,10 +191,14 @@ void io_uring_backend_poll(Backend_t *backend) {
     io_uring_submit(&backend->ring);
   }
 
+wait_cqe:
   backend->base.currently_polling = 1;
   rb_thread_call_without_gvl(io_uring_backend_poll_without_gvl, (void *)&poll_ctx, RUBY_UBF_IO, 0);
   backend->base.currently_polling = 0;
-  if (poll_ctx.result < 0) return;
+  if (poll_ctx.result < 0) {
+    if (poll_ctx.result == -EINTR && runqueue_empty_p(&backend->base.runqueue)) goto wait_cqe;
+    return;
+  }
 
   io_uring_backend_handle_completion(poll_ctx.cqe, backend);
   io_uring_cqe_seen(&backend->ring, poll_ctx.cqe);
@@ -212,12 +216,12 @@ inline VALUE Backend_poll(VALUE self, VALUE blocking) {
     io_uring_submit(&backend->ring);
   }
 
-  COND_TRACE(&backend->base, 2, SYM_fiber_event_poll_enter, rb_fiber_current());
+  COND_TRACE(&backend->base, 2, SYM_enter_poll, rb_fiber_current());
   
   if (is_blocking) io_uring_backend_poll(backend);
   io_uring_backend_handle_ready_cqes(backend);
   
-  COND_TRACE(&backend->base, 2, SYM_fiber_event_poll_leave, rb_fiber_current());
+  COND_TRACE(&backend->base, 2, SYM_leave_poll, rb_fiber_current());
 
   return self;
 }
@@ -1017,39 +1021,39 @@ VALUE Backend_wait_io(VALUE self, VALUE io, VALUE write) {
   return self;
 }
 
-VALUE Backend_close(VALUE self, VALUE io) {
-  Backend_t *backend;
-  rb_io_t *fptr;
-  VALUE underlying_io = rb_ivar_get(io, ID_ivar_io);
-  VALUE resume_value = Qnil;
-  op_context_t *ctx;
-  struct io_uring_sqe *sqe;
-  int result;
-  int completed;
+// VALUE Backend_close(VALUE self, VALUE io) {
+//   Backend_t *backend;
+//   rb_io_t *fptr;
+//   VALUE underlying_io = rb_ivar_get(io, ID_ivar_io);
+//   VALUE resume_value = Qnil;
+//   op_context_t *ctx;
+//   struct io_uring_sqe *sqe;
+//   int result;
+//   int completed;
 
-  if (underlying_io != Qnil) io = underlying_io;
-  GetBackend(self, backend);
-  GetOpenFile(io, fptr);
+//   if (underlying_io != Qnil) io = underlying_io;
+//   GetBackend(self, backend);
+//   GetOpenFile(io, fptr);
 
-  if (fptr->fd < 0) return Qnil;
+//   if (fptr->fd < 0) return Qnil;
 
-  io_unset_nonblock(fptr, io);
+//   io_unset_nonblock(fptr, io);
 
-  ctx = context_store_acquire(&backend->store, OP_CLOSE);
-  sqe = io_uring_get_sqe(&backend->ring);
-  io_uring_prep_close(sqe, fptr->fd);
-  result = io_uring_backend_defer_submit_and_await(backend, sqe, ctx, &resume_value);
-  completed = context_store_release(&backend->store, ctx);
-  RAISE_IF_EXCEPTION(resume_value);
-  if (!completed) return resume_value;
-  RB_GC_GUARD(resume_value);
+//   ctx = context_store_acquire(&backend->store, OP_CLOSE);
+//   sqe = io_uring_get_sqe(&backend->ring);
+//   io_uring_prep_close(sqe, fptr->fd);
+//   result = io_uring_backend_defer_submit_and_await(backend, sqe, ctx, &resume_value);
+//   completed = context_store_release(&backend->store, ctx);
+//   RAISE_IF_EXCEPTION(resume_value);
+//   if (!completed) return resume_value;
+//   RB_GC_GUARD(resume_value);
 
-  if (result < 0) rb_syserr_fail(-result, strerror(-result));
+//   if (result < 0) rb_syserr_fail(-result, strerror(-result));
 
-  fptr_finalize(fptr);
-  // fptr->fd = -1;
-  return io;
-}
+//   fptr_finalize(fptr);
+//   // fptr->fd = -1;
+//   return io;
+// }
 
 inline struct __kernel_timespec double_to_timespec(double duration) {
   double duration_integral;
@@ -1104,7 +1108,7 @@ VALUE Backend_timer_loop(VALUE self, VALUE interval) {
       if (!completed) return resume_value;
     }
     else {
-      resume_value = backend_snooze();
+      resume_value = backend_snooze(&backend->base);
       RAISE_IF_EXCEPTION(resume_value);
     }
 
@@ -1587,6 +1591,22 @@ VALUE Backend_trace_proc_set(VALUE self, VALUE block) {
   return self;
 }
 
+VALUE Backend_snooze(VALUE self) {
+  VALUE ret;
+  VALUE fiber = rb_fiber_current();
+  Backend_t *backend;
+  GetBackend(self, backend);
+
+  Fiber_make_runnable(fiber, Qnil);
+  ret = Thread_switch_fiber(rb_thread_current());
+
+  COND_TRACE(&backend->base, 4, SYM_unblock, rb_fiber_current(), ret, CALLER());
+
+  RAISE_IF_EXCEPTION(ret);
+  RB_GC_GUARD(ret);
+  return ret;
+}
+
 void Backend_park_fiber(VALUE self, VALUE fiber) {
   Backend_t *backend;
   GetBackend(self, backend);
@@ -1640,7 +1660,7 @@ void Init_Backend() {
   rb_define_method(cBackend, "wait_io", Backend_wait_io, 2);
   rb_define_method(cBackend, "waitpid", Backend_waitpid, 1);
   rb_define_method(cBackend, "write", Backend_write_m, -1);
-  rb_define_method(cBackend, "close", Backend_close, 1);
+  // rb_define_method(cBackend, "close", Backend_close, 1);
 
   SYM_io_uring = ID2SYM(rb_intern("io_uring"));
   SYM_send = ID2SYM(rb_intern("send"));

data/ext/polyphony/backend_libev.c

@@ -168,11 +168,16 @@ inline VALUE Backend_poll(VALUE self, VALUE blocking) {
 
   backend->base.poll_count++;
 
-  COND_TRACE(&backend->base, 2, SYM_fiber_event_poll_enter, rb_fiber_current());
+  COND_TRACE(&backend->base, 2, SYM_enter_poll, rb_fiber_current());
+  
+ev_run:
   backend->base.currently_polling = 1;
+  errno = 0;
   ev_run(backend->ev_loop, blocking == Qtrue ? EVRUN_ONCE : EVRUN_NOWAIT);
   backend->base.currently_polling = 0;
-  COND_TRACE(&backend->base, 2, SYM_fiber_event_poll_leave, rb_fiber_current());
+  if (errno == EINTR && runqueue_empty_p(&backend->base.runqueue)) goto ev_run;
+  
+  COND_TRACE(&backend->base, 2, SYM_leave_poll, rb_fiber_current());
 
   return self;
 }
@@ -300,7 +305,7 @@ VALUE Backend_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_eof,
       if (TEST_EXCEPTION(switchpoint_result)) goto error;
     }
     else {
-      switchpoint_result = backend_snooze();
+      switchpoint_result = backend_snooze(&backend->base);
       if (TEST_EXCEPTION(switchpoint_result)) goto error;
 
       if (n == 0) break; // EOF
@@ -370,7 +375,7 @@ VALUE Backend_read_loop(VALUE self, VALUE io, VALUE maxlen) {
       if (TEST_EXCEPTION(switchpoint_result)) goto error;
     }
     else {
-      switchpoint_result = backend_snooze();
+      switchpoint_result = backend_snooze(&backend->base);
 
       if (TEST_EXCEPTION(switchpoint_result)) goto error;
 
@@ -423,7 +428,7 @@ VALUE Backend_feed_loop(VALUE self, VALUE io, VALUE receiver, VALUE method) {
       if (TEST_EXCEPTION(switchpoint_result)) goto error;
     }
     else {
-      switchpoint_result = backend_snooze();
+      switchpoint_result = backend_snooze(&backend->base);
 
       if (TEST_EXCEPTION(switchpoint_result)) goto error;
 
@@ -478,7 +483,7 @@ VALUE Backend_write(VALUE self, VALUE io, VALUE str) {
   }
 
   if (watcher.fiber == Qnil) {
-    switchpoint_result = backend_snooze();
+    switchpoint_result = backend_snooze(&backend->base);
 
     if (TEST_EXCEPTION(switchpoint_result)) goto error;
   }
@@ -553,7 +558,7 @@ VALUE Backend_writev(VALUE self, VALUE io, int argc, VALUE *argv) {
     }
   }
   if (watcher.fiber == Qnil) {
-    switchpoint_result = backend_snooze();
+    switchpoint_result = backend_snooze(&backend->base);
     if (TEST_EXCEPTION(switchpoint_result)) goto error;
   }
 
@@ -606,7 +611,7 @@ VALUE Backend_accept(VALUE self, VALUE server_socket, VALUE socket_class) {
     else {
       VALUE socket;
       rb_io_t *fp;
-      switchpoint_result = backend_snooze();
+      switchpoint_result = backend_snooze(&backend->base);
 
       if (TEST_EXCEPTION(switchpoint_result)) {
         close(fd); // close fd since we're raising an exception
@@ -664,7 +669,7 @@ VALUE Backend_accept_loop(VALUE self, VALUE server_socket, VALUE socket_class) {
     }
     else {
       rb_io_t *fp;
-      switchpoint_result = backend_snooze();
+      switchpoint_result = backend_snooze(&backend->base);
 
       if (TEST_EXCEPTION(switchpoint_result)) {
         close(fd); // close fd since we're raising an exception
@@ -722,7 +727,7 @@ VALUE Backend_connect(VALUE self, VALUE sock, VALUE host, VALUE port) {
     if (TEST_EXCEPTION(switchpoint_result)) goto error;
   }
   else {
-    switchpoint_result = backend_snooze();
+    switchpoint_result = backend_snooze(&backend->base);
 
     if (TEST_EXCEPTION(switchpoint_result)) goto error;
   }
@@ -769,7 +774,7 @@ VALUE Backend_send(VALUE self, VALUE io, VALUE str, VALUE flags) {
   }
 
   if (watcher.fiber == Qnil) {
-    switchpoint_result = backend_snooze();
+    switchpoint_result = backend_snooze(&backend->base);
 
     if (TEST_EXCEPTION(switchpoint_result)) goto error;
   }
@@ -875,7 +880,7 @@ VALUE Backend_splice(VALUE self, VALUE src, VALUE dest, VALUE maxlen) {
   }
 
   if (watcher.ctx.fiber == Qnil) {
-    switchpoint_result = backend_snooze();
+    switchpoint_result = backend_snooze(&backend->base);
     if (TEST_EXCEPTION(switchpoint_result)) goto error;
   }
 
@@ -930,7 +935,7 @@ VALUE Backend_splice_to_eof(VALUE self, VALUE src, VALUE dest, VALUE maxlen) {
   }
 
   if (watcher.ctx.fiber == Qnil) {
-    switchpoint_result = backend_snooze();
+    switchpoint_result = backend_snooze(&backend->base);
     if (TEST_EXCEPTION(switchpoint_result)) goto error;
   }
 
@@ -1004,7 +1009,7 @@ VALUE Backend_splice(VALUE self, VALUE src, VALUE dest, VALUE maxlen) {
   }
 
   if (watcher.fiber == Qnil) {
-    switchpoint_result = backend_snooze();
+    switchpoint_result = backend_snooze(&backend->base);
     if (TEST_EXCEPTION(switchpoint_result)) goto error;
   }
 
@@ -1084,7 +1089,7 @@ VALUE Backend_splice_to_eof(VALUE self, VALUE src, VALUE dest, VALUE maxlen) {
 
 done:
   if (watcher.fiber == Qnil) {
-    switchpoint_result = backend_snooze();
+    switchpoint_result = backend_snooze(&backend->base);
     if (TEST_EXCEPTION(switchpoint_result)) goto error;
   }
 
@@ -1166,7 +1171,7 @@ noreturn VALUE Backend_timer_loop(VALUE self, VALUE interval) {
       RAISE_IF_EXCEPTION(resume_value);
     }
     else {
-      resume_value = backend_snooze();
+      resume_value = backend_snooze(&backend->base);
       RAISE_IF_EXCEPTION(resume_value);
     }
 
@@ -1525,7 +1530,7 @@ VALUE Backend_splice_chunks(VALUE self, VALUE src, VALUE dest, VALUE prefix, VAL
   }
 
   if (watcher.ctx.fiber == Qnil) {
-    result = backend_snooze();
+    result = backend_snooze(&backend->base);
     if (TEST_EXCEPTION(result)) goto error;
   }
   RB_GC_GUARD(str);
@@ -1559,6 +1564,22 @@ VALUE Backend_trace_proc_set(VALUE self, VALUE block) {
   return self;
 }
 
+VALUE Backend_snooze(VALUE self) {
+  VALUE ret;
+  VALUE fiber = rb_fiber_current();
+  Backend_t *backend;
+  GetBackend(self, backend);
+
+  Fiber_make_runnable(fiber, Qnil);
+  ret = Thread_switch_fiber(rb_thread_current());
+
+  COND_TRACE(&backend->base, 4, SYM_unblock, rb_fiber_current(), ret, CALLER());
+
+  RAISE_IF_EXCEPTION(ret);
+  RB_GC_GUARD(ret);
+  return ret;
+}
+
 void Backend_park_fiber(VALUE self, VALUE fiber) {
   Backend_t *backend;
   GetBackend(self, backend);

data/ext/polyphony/fiber.c

@@ -10,13 +10,13 @@ VALUE SYM_running;
 VALUE SYM_runnable;
 VALUE SYM_waiting;
 
-VALUE SYM_fiber_create;
-VALUE SYM_fiber_event_poll_enter;
-VALUE SYM_fiber_event_poll_leave;
-VALUE SYM_fiber_run;
-VALUE SYM_fiber_schedule;
-VALUE SYM_fiber_switchpoint;
-VALUE SYM_fiber_terminate;
+VALUE SYM_spin;
+VALUE SYM_enter_poll;
+VALUE SYM_leave_poll;
+VALUE SYM_unblock;
+VALUE SYM_schedule;
+VALUE SYM_block;
+VALUE SYM_terminate;
 
 static VALUE Fiber_safe_transfer(int argc, VALUE *argv, VALUE self) {
   VALUE arg = (argc == 0) ? Qnil : argv[0];
@@ -97,7 +97,7 @@ VALUE Fiber_receive(VALUE self) {
     mailbox = rb_funcall(cQueue, ID_new, 0);
     rb_ivar_set(self, ID_ivar_mailbox, mailbox);
   }
-  return Queue_shift(mailbox);
+  return Queue_shift(0, 0, mailbox);
 }
 
 VALUE Fiber_mailbox(VALUE self) {
@@ -157,24 +157,24 @@ void Init_Fiber() {
   rb_global_variable(&SYM_runnable);
   rb_global_variable(&SYM_waiting);
 
-  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_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_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);
-  rb_global_variable(&SYM_fiber_terminate);
+  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_spin                = ID2SYM(rb_intern("spin"));
+  SYM_enter_poll          = ID2SYM(rb_intern("enter_poll"));
+  SYM_leave_poll          = ID2SYM(rb_intern("leave_poll"));
+  SYM_unblock             = ID2SYM(rb_intern("unblock"));
+  SYM_schedule            = ID2SYM(rb_intern("schedule"));
+  SYM_block               = ID2SYM(rb_intern("block"));
+  SYM_terminate           = ID2SYM(rb_intern("terminate"));
+
+  rb_global_variable(&SYM_spin);
+  rb_global_variable(&SYM_enter_poll);
+  rb_global_variable(&SYM_leave_poll);
+  rb_global_variable(&SYM_unblock);
+  rb_global_variable(&SYM_schedule);
+  rb_global_variable(&SYM_block);
+  rb_global_variable(&SYM_terminate);
 }

data/ext/polyphony/polyphony.c

@@ -27,14 +27,7 @@ ID ID_W;
 ID ID_RW;
 
 VALUE Polyphony_snooze(VALUE self) {
-  VALUE ret;
-  VALUE fiber = rb_fiber_current();
-
-  Fiber_make_runnable(fiber, Qnil);
-  ret = Thread_switch_fiber(rb_thread_current());
-  RAISE_IF_EXCEPTION(ret);
-  RB_GC_GUARD(ret);
-  return ret;
+  return Backend_snooze(BACKEND());
 }
 
 static VALUE Polyphony_suspend(VALUE self) {
@@ -125,9 +118,9 @@ VALUE Polyphony_backend_write(int argc, VALUE *argv, VALUE self) {
   return Backend_write_m(argc, argv, BACKEND());
 }
 
-VALUE Polyphony_backend_close(VALUE self, VALUE io) {
-  return Backend_close(BACKEND(), io);
-}
+// VALUE Polyphony_backend_close(VALUE self, VALUE io) {
+//   return Backend_close(BACKEND(), io);
+// }
 
 void Init_Polyphony() {
   mPolyphony = rb_define_module("Polyphony");
@@ -153,7 +146,7 @@ void Init_Polyphony() {
   rb_define_singleton_method(mPolyphony, "backend_wait_io", Polyphony_backend_wait_io, 2);
   rb_define_singleton_method(mPolyphony, "backend_waitpid", Polyphony_backend_waitpid, 1);
   rb_define_singleton_method(mPolyphony, "backend_write", Polyphony_backend_write, -1);
-  rb_define_singleton_method(mPolyphony, "backend_close", Polyphony_backend_close, 1);
+  // rb_define_singleton_method(mPolyphony, "backend_close", Polyphony_backend_close, 1);
   rb_define_singleton_method(mPolyphony, "backend_verify_blocking_mode", Backend_verify_blocking_mode, 2);
 
   rb_define_global_function("snooze", Polyphony_snooze, 0);

data/ext/polyphony/polyphony.h

@@ -61,20 +61,20 @@ extern ID ID_switch_fiber;
 extern ID ID_to_s;
 extern ID ID_transfer;
 
-extern VALUE SYM_fiber_create;
-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;
-extern VALUE SYM_fiber_terminate;
+extern VALUE SYM_spin;
+extern VALUE SYM_enter_poll;
+extern VALUE SYM_leave_poll;
+extern VALUE SYM_unblock;
+extern VALUE SYM_schedule;
+extern VALUE SYM_block;
+extern VALUE SYM_terminate;
 
 VALUE Fiber_auto_watcher(VALUE self);
 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(int argc,VALUE *argv, VALUE self);
 VALUE Queue_shift_all(VALUE self);
 
 void Runqueue_push(VALUE self, VALUE fiber, VALUE value, int reschedule);
@@ -114,18 +114,21 @@ VALUE Backend_wait_event(VALUE self, VALUE raise);
 VALUE Backend_wait_io(VALUE self, VALUE io, VALUE write);
 VALUE Backend_waitpid(VALUE self, VALUE pid);
 VALUE Backend_write_m(int argc, VALUE *argv, VALUE self);
-VALUE Backend_close(VALUE self, VALUE io);
+// VALUE Backend_close(VALUE self, VALUE io);
 
 VALUE Backend_poll(VALUE self, VALUE blocking);
 VALUE Backend_wait_event(VALUE self, VALUE raise_on_exception);
 VALUE Backend_wakeup(VALUE self);
 VALUE Backend_run_idle_tasks(VALUE self);
 VALUE Backend_switch_fiber(VALUE self);
+
 void Backend_schedule_fiber(VALUE thread, VALUE self, VALUE fiber, VALUE value, int prioritize);
 void Backend_unschedule_fiber(VALUE self, VALUE fiber);
 void Backend_park_fiber(VALUE self, VALUE fiber);
 void Backend_unpark_fiber(VALUE self, VALUE fiber);
 
+VALUE Backend_snooze(VALUE self);
+
 void Thread_schedule_fiber(VALUE thread, VALUE fiber, VALUE value);
 void Thread_schedule_fiber_with_priority(VALUE thread, VALUE fiber, VALUE value);
 VALUE Thread_switch_fiber(VALUE thread);