polyphony 0.44.0 → 0.45.5

data/ext/polyphony/polyphony.c

@@ -9,11 +9,10 @@ ID ID_each;
 ID ID_inspect;
 ID ID_invoke;
 ID ID_new;
-ID ID_raise;
+ID ID_ivar_result;
+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;
@@ -22,7 +21,7 @@ ID ID_R;
 ID ID_W;
 ID ID_RW;
 
-agent_interface_t agent_interface;
+backend_interface_t backend_interface;
 
 VALUE Polyphony_snooze(VALUE self) {
   VALUE ret;
@@ -62,12 +61,11 @@ 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_running   = rb_intern("@running");
   ID_ivar_thread    = rb_intern("@thread");
   ID_new            = rb_intern("new");
-  ID_raise          = rb_intern("raise");
-  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

@@ -4,7 +4,8 @@
 #include "ruby.h"
 #include "ruby/io.h"
 #include "libev.h"
-#include "agent.h"
+#include "backend.h"
+#include "runqueue_ring_buffer.h"
 
 // debugging
 #define OBJ_ID(obj) (NUM2LONG(rb_funcall(obj, rb_intern("object_id"), 0)))
@@ -24,13 +25,13 @@
   return RAISE_EXCEPTION(ret); \
 }
 
-
-extern agent_interface_t agent_interface;
-#define __AGENT__ (agent_interface)
+extern backend_interface_t backend_interface;
+#define __BACKEND__ (backend_interface)
 
 extern VALUE mPolyphony;
 extern VALUE cQueue;
 extern VALUE cEvent;
+extern VALUE cRunqueue;
 
 extern ID ID_call;
 extern ID ID_caller;
@@ -39,13 +40,13 @@ extern ID ID_each;
 extern ID ID_fiber_trace;
 extern ID ID_inspect;
 extern ID ID_invoke;
-extern ID ID_ivar_agent;
+extern ID ID_ivar_backend;
+extern ID ID_ivar_result;
+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;
@@ -67,31 +68,30 @@ enum {
   FIBER_STATE_SCHEDULED     = 2
 };
 
-// watcher flags
-enum {
-  // a watcher's active field will be set to this after fork
-  GYRO_WATCHER_POST_FORK = 0xFF
-};
-
 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_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);
 
-VALUE Polyphony_snooze(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);
 
-int io_setstrbuf(VALUE *str, long len);
-void io_set_read_length(VALUE str, long n, int shrinkable);
-VALUE io_enc_str(VALUE str, rb_io_t *fptr);
-
 #endif /* POLYPHONY_H */

data/ext/polyphony/polyphony_ext.c

@@ -2,9 +2,10 @@
 
 void Init_Fiber();
 void Init_Polyphony();
-void Init_LibevAgent();
+void Init_LibevBackend();
 void Init_Queue();
 void Init_Event();
+void Init_Runqueue();
 void Init_Thread();
 void Init_Tracing();
 
@@ -12,12 +13,12 @@ void Init_polyphony_ext() {
   ev_set_allocator(xrealloc);
 
   Init_Polyphony();
-  Init_LibevAgent();
+
+  Init_LibevBackend();
   Init_Queue();
   Init_Event();
-
+  Init_Runqueue();
   Init_Fiber();
   Init_Thread();
-
   Init_Tracing();
 }

data/ext/polyphony/queue.c

@@ -80,17 +80,16 @@ VALUE Queue_shift(VALUE self) {
 
   VALUE fiber = rb_fiber_current();
   VALUE thread = rb_thread_current();
-  VALUE agent = rb_ivar_get(thread, ID_ivar_agent);
+  VALUE backend = rb_ivar_get(thread, ID_ivar_backend);
 
   while (1) {
     ring_buffer_push(&queue->shift_queue, fiber);
     if (queue->values.count > 0) Fiber_make_runnable(fiber, Qnil);
-    
-    VALUE switchpoint_result = __AGENT__.wait_event(agent, Qnil);
+
+    VALUE switchpoint_result = __BACKEND__.wait_event(backend, Qnil);
     ring_buffer_delete(&queue->shift_queue, fiber);
 
-    if (RTEST(rb_obj_is_kind_of(switchpoint_result, rb_eException)))
-      return rb_funcall(rb_mKernel, ID_raise, 1, switchpoint_result);
+    TEST_RESUME_EXCEPTION(switchpoint_result);
     RB_GC_GUARD(switchpoint_result);
 
     if (queue->values.count > 0)
@@ -152,7 +151,7 @@ VALUE Queue_flush_waiters(VALUE self, VALUE value) {
   while(1) {
     VALUE fiber = ring_buffer_shift(&queue->shift_queue);
     if (fiber == Qnil) return self;
-    
+
     Fiber_make_runnable(fiber, value);
   }
 }

data/ext/polyphony/ring_buffer.c

@@ -24,7 +24,6 @@ VALUE ring_buffer_shift(ring_buffer *buffer) {
   value = buffer->entries[buffer->head];
   buffer->head = (buffer->head + 1) % buffer->size;
   buffer->count--;
-  // INSPECT(value);
   return value;
 }
 

data/ext/polyphony/runqueue.c

@@ -0,0 +1,102 @@
+#include "polyphony.h"
+#include "runqueue_ring_buffer.h"
+
+typedef struct queue {
+  runqueue_ring_buffer entries;
+} Runqueue_t;
+
+VALUE cRunqueue = Qnil;
+
+static void Runqueue_mark(void *ptr) {
+  Runqueue_t *runqueue = ptr;
+  runqueue_ring_buffer_mark(&runqueue->entries);
+}
+
+static void Runqueue_free(void *ptr) {
+  Runqueue_t *runqueue = ptr;
+  runqueue_ring_buffer_free(&runqueue->entries);
+  xfree(ptr);
+}
+
+static size_t Runqueue_size(const void *ptr) {
+  return sizeof(Runqueue_t);
+}
+
+static const rb_data_type_t Runqueue_type = {
+  "Runqueue",
+  {Runqueue_mark, Runqueue_free, Runqueue_size,},
+  0, 0, 0
+};
+
+static VALUE Runqueue_allocate(VALUE klass) {
+  Runqueue_t *runqueue;
+
+  runqueue = ALLOC(Runqueue_t);
+  return TypedData_Wrap_Struct(klass, &Runqueue_type, runqueue);
+}
+
+#define GetRunqueue(obj, runqueue) \
+  TypedData_Get_Struct((obj), Runqueue_t, &Runqueue_type, (runqueue))
+
+static VALUE Runqueue_initialize(VALUE self) {
+  Runqueue_t *runqueue;
+  GetRunqueue(self, runqueue);
+
+  runqueue_ring_buffer_init(&runqueue->entries);
+
+  return self;
+}
+
+void Runqueue_push(VALUE self, VALUE fiber, VALUE value, int reschedule) {
+  Runqueue_t *runqueue;
+  GetRunqueue(self, runqueue);
+
+  if (reschedule) runqueue_ring_buffer_delete(&runqueue->entries, fiber);
+  runqueue_ring_buffer_push(&runqueue->entries, fiber, value);
+}
+
+void Runqueue_unshift(VALUE self, VALUE fiber, VALUE value, int reschedule) {
+  Runqueue_t *runqueue;
+  GetRunqueue(self, runqueue);
+  if (reschedule) runqueue_ring_buffer_delete(&runqueue->entries, fiber);
+  runqueue_ring_buffer_unshift(&runqueue->entries, fiber, value);
+}
+
+runqueue_entry Runqueue_shift(VALUE self) {
+  Runqueue_t *runqueue;
+  GetRunqueue(self, runqueue);
+  return runqueue_ring_buffer_shift(&runqueue->entries);
+}
+
+void Runqueue_delete(VALUE self, VALUE fiber) {
+  Runqueue_t *runqueue;
+  GetRunqueue(self, runqueue);
+  runqueue_ring_buffer_delete(&runqueue->entries, fiber);
+}
+
+void Runqueue_clear(VALUE self) {
+  Runqueue_t *runqueue;
+  GetRunqueue(self, runqueue);
+  runqueue_ring_buffer_clear(&runqueue->entries);
+}
+
+long Runqueue_len(VALUE self) {
+  Runqueue_t *runqueue;
+  GetRunqueue(self, runqueue);
+
+  return runqueue->entries.count;
+}
+
+int Runqueue_empty_p(VALUE self) {
+  Runqueue_t *runqueue;
+  GetRunqueue(self, runqueue);
+
+  return (runqueue->entries.count == 0);
+}
+
+void Init_Runqueue() {
+  cRunqueue = rb_define_class_under(mPolyphony, "Runqueue", rb_cData);
+  rb_define_alloc_func(cRunqueue, Runqueue_allocate);
+
+  rb_define_method(cRunqueue, "initialize", Runqueue_initialize, 0);
+}

data/ext/polyphony/runqueue_ring_buffer.c

@@ -0,0 +1,85 @@
+#include "polyphony.h"
+#include "runqueue_ring_buffer.h"
+
+void runqueue_ring_buffer_init(runqueue_ring_buffer *buffer) {
+  buffer->size = 1;
+  buffer->count = 0;
+  buffer->entries = malloc(buffer->size * sizeof(runqueue_entry));
+  buffer->head = 0;
+  buffer->tail = 0;
+}
+
+void runqueue_ring_buffer_free(runqueue_ring_buffer *buffer) {
+  free(buffer->entries);
+}
+
+int runqueue_ring_buffer_empty_p(runqueue_ring_buffer *buffer) {
+  return buffer->count == 0;
+}
+
+static runqueue_entry nil_runqueue_entry = {(Qnil), (Qnil)};
+
+runqueue_entry runqueue_ring_buffer_shift(runqueue_ring_buffer *buffer) {
+  if (buffer->count == 0) return nil_runqueue_entry;
+
+  runqueue_entry value = buffer->entries[buffer->head];
+  buffer->head = (buffer->head + 1) % buffer->size;
+  buffer->count--;
+  return value;
+}
+
+void runqueue_ring_buffer_resize(runqueue_ring_buffer *buffer) {
+  unsigned int old_size = buffer->size;
+  buffer->size = old_size == 1 ? 4 : old_size * 2;
+  buffer->entries = realloc(buffer->entries, buffer->size * sizeof(runqueue_entry));
+  for (unsigned int idx = 0; idx < buffer->head && idx < buffer->tail; idx++)
+    buffer->entries[old_size + idx] = buffer->entries[idx];
+  buffer->tail = buffer->head + buffer->count;
+}
+
+void runqueue_ring_buffer_unshift(runqueue_ring_buffer *buffer, VALUE fiber, VALUE value) {
+  if (buffer->count == buffer->size) runqueue_ring_buffer_resize(buffer);
+
+  buffer->head = (buffer->head - 1) % buffer->size;
+  buffer->entries[buffer->head].fiber = fiber;
+  buffer->entries[buffer->head].value = value;
+  buffer->count++;
+}
+
+void runqueue_ring_buffer_push(runqueue_ring_buffer *buffer, VALUE fiber, VALUE value) {
+  if (buffer->count == buffer->size) runqueue_ring_buffer_resize(buffer);
+
+  buffer->entries[buffer->tail].fiber = fiber;
+  buffer->entries[buffer->tail].value = value;
+  buffer->tail = (buffer->tail + 1) % buffer->size;
+  buffer->count++;
+}
+
+void runqueue_ring_buffer_mark(runqueue_ring_buffer *buffer) {
+  for (unsigned int i = 0; i < buffer->count; i++) {
+    rb_gc_mark(buffer->entries[(buffer->head + i) % buffer->size].fiber);
+    rb_gc_mark(buffer->entries[(buffer->head + i) % buffer->size].value);
+  }
+}
+
+void runqueue_ring_buffer_delete_at(runqueue_ring_buffer *buffer, unsigned int idx) {
+  for (unsigned int idx2 = idx; idx2 != buffer->tail; idx2 = (idx2 + 1) % buffer->size) {
+    buffer->entries[idx2] = buffer->entries[(idx2 + 1) % buffer->size];
+  }
+  buffer->count--;
+  buffer->tail = (buffer->tail - 1) % buffer->size;
+}
+
+void runqueue_ring_buffer_delete(runqueue_ring_buffer *buffer, VALUE fiber) {
+  for (unsigned int i = 0; i < buffer->count; i++) {
+    unsigned int idx = (buffer->head + i) % buffer->size;
+    if (buffer->entries[idx].fiber == fiber) {
+      runqueue_ring_buffer_delete_at(buffer, idx);
+      return;
+    }
+  }
+}
+
+void runqueue_ring_buffer_clear(runqueue_ring_buffer *buffer) {
+  buffer->count = buffer->head = buffer->tail = 0;
+}

data/ext/polyphony/runqueue_ring_buffer.h

@@ -0,0 +1,31 @@
+#ifndef RUNQUEUE_RING_BUFFER_H
+#define RUNQUEUE_RING_BUFFER_H
+
+#include "ruby.h"
+
+typedef struct runqueue_entry {
+  VALUE fiber;
+  VALUE value;
+} runqueue_entry;
+
+typedef struct runqueue_ring_buffer {
+  runqueue_entry *entries;
+  unsigned int size;
+  unsigned int count;
+  unsigned int head;
+  unsigned int tail;
+} runqueue_ring_buffer;
+
+void runqueue_ring_buffer_init(runqueue_ring_buffer *buffer);
+void runqueue_ring_buffer_free(runqueue_ring_buffer *buffer);
+void runqueue_ring_buffer_mark(runqueue_ring_buffer *buffer);
+int runqueue_ring_buffer_empty_p(runqueue_ring_buffer *buffer);
+void runqueue_ring_buffer_clear(runqueue_ring_buffer *buffer);
+
+runqueue_entry runqueue_ring_buffer_shift(runqueue_ring_buffer *buffer);
+void runqueue_ring_buffer_unshift(runqueue_ring_buffer *buffer, VALUE fiber, VALUE value);
+void runqueue_ring_buffer_push(runqueue_ring_buffer *buffer, VALUE fiber, VALUE value);
+
+void runqueue_ring_buffer_delete(runqueue_ring_buffer *buffer, VALUE fiber);
+
+#endif /* RUNQUEUE_RING_BUFFER_H */

data/ext/polyphony/thread.c

@@ -1,183 +1,137 @@
 #include "polyphony.h"
 
 ID ID_deactivate_all_watchers_post_fork;
-ID ID_ivar_agent;
+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_run_queue;
-ID ID_runnable_next;
+ID ID_ivar_runqueue;
 ID ID_stop;
 
 static VALUE Thread_setup_fiber_scheduling(VALUE self) {
-  VALUE queue = rb_funcall(cQueue, ID_new, 0);
-  
+  VALUE runqueue = rb_funcall(cRunqueue, ID_new, 0);
+
   rb_ivar_set(self, ID_ivar_main_fiber, rb_fiber_current());
-  rb_ivar_set(self, ID_run_queue, queue);
+  rb_ivar_set(self, ID_ivar_runqueue, runqueue);
 
   return self;
 }
 
 int Thread_fiber_ref_count(VALUE self) {
-  VALUE agent = rb_ivar_get(self, ID_ivar_agent);
-  return NUM2INT(__AGENT__.ref_count(agent));
+  VALUE backend = rb_ivar_get(self, ID_ivar_backend);
+  return NUM2INT(__BACKEND__.ref_count(backend));
 }
 
 inline void Thread_fiber_reset_ref_count(VALUE self) {
-  VALUE agent = rb_ivar_get(self, ID_ivar_agent);
-  __AGENT__.reset_ref_count(agent);
+  VALUE backend = rb_ivar_get(self, ID_ivar_backend);
+  __BACKEND__.reset_ref_count(backend);
 }
 
 static VALUE SYM_scheduled_fibers;
 static VALUE SYM_pending_watchers;
 
 static VALUE Thread_fiber_scheduling_stats(VALUE self) {
-  VALUE agent = rb_ivar_get(self,ID_ivar_agent);
+  VALUE backend = rb_ivar_get(self,ID_ivar_backend);
   VALUE stats = rb_hash_new();
-  VALUE queue = rb_ivar_get(self, ID_run_queue);
+  VALUE runqueue = rb_ivar_get(self, ID_ivar_runqueue);
   long pending_count;
 
-  long scheduled_count = RARRAY_LEN(queue);
+  long scheduled_count = Runqueue_len(runqueue);
   rb_hash_aset(stats, SYM_scheduled_fibers, INT2NUM(scheduled_count));
 
-  pending_count = __AGENT__.pending_count(agent);
+  pending_count = __BACKEND__.pending_count(backend);
   rb_hash_aset(stats, SYM_pending_watchers, INT2NUM(pending_count));
 
   return stats;
 }
 
-VALUE Thread_schedule_fiber(VALUE self, VALUE fiber, VALUE value) {
-  VALUE queue;
-
-  if (rb_fiber_alive_p(fiber) != Qtrue) return self;
+void schedule_fiber(VALUE self, VALUE fiber, VALUE value, int prioritize) {
+  VALUE runqueue;
+  int already_runnable;
 
-  int already_runnable = rb_ivar_get(fiber, ID_runnable) != Qnil;
-
-  if (already_runnable) {
-    VALUE current_runnable_value = rb_ivar_get(fiber, ID_runnable_value);
-
-    // If the fiber is already runnable and the runnable value is an exception,
-    // we don't update the value, in order to prevent a race condition where
-    // exceptions will be lost (see issue #33)
-    if (TEST_EXCEPTION(current_runnable_value)) return self;
-  }
+  if (rb_fiber_alive_p(fiber) != Qtrue) return;
+  already_runnable = rb_ivar_get(fiber, ID_ivar_runnable) != Qnil;
 
-  rb_ivar_set(fiber, ID_runnable_value, value);
   COND_TRACE(3, SYM_fiber_schedule, fiber, value);
-
+  runqueue = rb_ivar_get(self, ID_ivar_runqueue);
+  (prioritize ? Runqueue_unshift : Runqueue_push)(runqueue, fiber, value, already_runnable);
   if (!already_runnable) {
-    queue = rb_ivar_get(self, ID_run_queue);
-    Queue_push(queue, fiber);
-    rb_ivar_set(fiber, ID_runnable, Qtrue);
-
+    rb_ivar_set(fiber, ID_ivar_runnable, Qtrue);
     if (rb_thread_current() != self) {
       // If the fiber scheduling is done across threads, we need to make sure the
       // target thread is woken up in case it is in the middle of running its
       // event selector. Otherwise it's gonna be stuck waiting for an event to
       // happen, not knowing that it there's already a fiber ready to run in its
       // run queue.
-      VALUE agent = rb_ivar_get(self,ID_ivar_agent);
-      __AGENT__.wakeup(agent);
+      VALUE backend = rb_ivar_get(self,ID_ivar_backend);
+      __BACKEND__.wakeup(backend);
     }
   }
+}
+
+VALUE Thread_schedule_fiber(VALUE self, VALUE fiber, VALUE value) {
+  schedule_fiber(self, fiber, value, 0);
   return self;
 }
 
 VALUE Thread_schedule_fiber_with_priority(VALUE self, VALUE fiber, VALUE value) {
-  VALUE queue;
-
-  if (rb_fiber_alive_p(fiber) != Qtrue) return self;
-
-  COND_TRACE(3, SYM_fiber_schedule, fiber, value);
-  rb_ivar_set(fiber, ID_runnable_value, value);
-
-  queue = rb_ivar_get(self, ID_run_queue);
-
-  // if fiber is already scheduled, remove it from the run queue
-  if (rb_ivar_get(fiber, ID_runnable) != Qnil) {
-    Queue_delete(queue, fiber);
-  } else {
-    rb_ivar_set(fiber, ID_runnable, Qtrue);
-  }
-
-  // the fiber is given priority by putting it at the front of the run queue
-  Queue_unshift(queue, fiber);
-
-  if (rb_thread_current() != self) {
-    // if the fiber scheduling is done across threads, we need to make sure the
-    // target thread is woken up in case it is in the middle of running its
-    // event loop. Otherwise it's gonna be stuck waiting for an event to
-    // happen, not knowing that it there's already a fiber ready to run in its
-    // run queue.
-    VALUE agent = rb_ivar_get(self, ID_ivar_agent);
-    __AGENT__.wakeup(agent);
-  }
+  schedule_fiber(self, fiber, value, 1);
   return self;
 }
 
 VALUE Thread_switch_fiber(VALUE self) {
   VALUE current_fiber = rb_fiber_current();
-  VALUE queue = rb_ivar_get(self, ID_run_queue);
-  VALUE next_fiber;
-  VALUE value;
-  VALUE agent = rb_ivar_get(self, ID_ivar_agent);
+  VALUE runqueue = rb_ivar_get(self, ID_ivar_runqueue);
+  runqueue_entry next;
+  VALUE backend = rb_ivar_get(self, ID_ivar_backend);
   int ref_count;
-  int agent_was_polled = 0;
+  int backend_was_polled = 0;
 
   if (__tracing_enabled__ && (rb_ivar_get(current_fiber, ID_ivar_running) != Qfalse))
     TRACE(2, SYM_fiber_switchpoint, current_fiber);
 
-  ref_count = __AGENT__.ref_count(agent);
+  ref_count = __BACKEND__.ref_count(backend);
   while (1) {
-    next_fiber = Queue_shift_no_wait(queue);
-    if (next_fiber != Qnil) {
-      if (agent_was_polled == 0 && ref_count > 0) {
-        // this mechanism prevents event starvation in case the run queue never
-        // empties
-        __AGENT__.poll(agent, Qtrue, current_fiber, queue);
+    next = Runqueue_shift(runqueue);
+    if (next.fiber != Qnil) {
+      if (backend_was_polled == 0 && ref_count > 0) {
+        // this prevents event starvation in case the run queue never empties
+        __BACKEND__.poll(backend, Qtrue, current_fiber, runqueue);
       }
       break;
     }
     if (ref_count == 0) break;
 
-    __AGENT__.poll(agent, Qnil, current_fiber, queue);
-    agent_was_polled = 1;
+    __BACKEND__.poll(backend, Qnil, current_fiber, runqueue);
+    backend_was_polled = 1;
   }
 
-  if (next_fiber == Qnil) return Qnil;
+  if (next.fiber == Qnil) return Qnil;
 
   // run next fiber
-  value = rb_ivar_get(next_fiber, ID_runnable_value);
-  COND_TRACE(3, SYM_fiber_run, next_fiber, value);
-
-  rb_ivar_set(next_fiber, ID_runnable, Qnil);
-  RB_GC_GUARD(next_fiber);
-  RB_GC_GUARD(value);
-  return (next_fiber == current_fiber) ? 
-    value : rb_funcall(next_fiber, ID_transfer, 1, value);
-}
+  COND_TRACE(3, SYM_fiber_run, next.fiber, next.value);
 
-VALUE Thread_run_queue_trace(VALUE self) {
-  VALUE queue = rb_ivar_get(self, ID_run_queue);
-  Queue_trace(queue);
-  return self;
+  rb_ivar_set(next.fiber, ID_ivar_runnable, Qnil);
+  RB_GC_GUARD(next.fiber);
+  RB_GC_GUARD(next.value);
+  return (next.fiber == current_fiber) ?
+    next.value : rb_funcall(next.fiber, ID_transfer, 1, next.value);
 }
 
 VALUE Thread_reset_fiber_scheduling(VALUE self) {
-  VALUE queue = rb_ivar_get(self, ID_run_queue);
-  Queue_clear(queue);
+  VALUE queue = rb_ivar_get(self, ID_ivar_runqueue);
+  Runqueue_clear(queue);
   Thread_fiber_reset_ref_count(self);
   return self;
 }
 
 VALUE Thread_fiber_break_out_of_ev_loop(VALUE self, VALUE fiber, VALUE resume_obj) {
-  VALUE agent = rb_ivar_get(self, ID_ivar_agent);
+  VALUE backend = rb_ivar_get(self, ID_ivar_backend);
   if (fiber != Qnil) {
     Thread_schedule_fiber_with_priority(self, fiber, resume_obj);
   }
 
-  if (__AGENT__.wakeup(agent) == Qnil) {
+  if (__BACKEND__.wakeup(backend) == Qnil) {
     // we're not inside the ev_loop, so we just do a switchpoint
     Thread_switch_fiber(self);
   }
@@ -200,18 +154,15 @@ void Init_Thread() {
   rb_define_method(rb_cThread, "schedule_fiber_with_priority",
     Thread_schedule_fiber_with_priority, 2);
   rb_define_method(rb_cThread, "switch_fiber", Thread_switch_fiber, 0);
-  rb_define_method(rb_cThread, "run_queue_trace", Thread_run_queue_trace, 0);
 
   rb_define_method(rb_cThread, "debug!", Thread_debug, 0);
 
   ID_deactivate_all_watchers_post_fork = rb_intern("deactivate_all_watchers_post_fork");
-  ID_ivar_agent               = rb_intern("@agent");
+  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_runqueue            = rb_intern("@runqueue");
   ID_ivar_terminated          = rb_intern("@terminated");
-  ID_run_queue                = rb_intern("run_queue");
-  ID_runnable_next            = rb_intern("runnable_next");
   ID_stop                     = rb_intern("stop");
 
   SYM_scheduled_fibers = ID2SYM(rb_intern("scheduled_fibers"));