polyphony 0.45.0 → 0.46.0

data/ext/polyphony/backend_io_uring_context.c

@@ -0,0 +1,73 @@
+#include <stdlib.h>
+#include "ruby.h"
+#include "polyphony.h"
+#include "backend_io_uring_context.h"
+
+const char *op_type_to_str(enum op_type type) {
+  switch (type) {
+  case OP_READ: return "READ";
+  case OP_WRITEV: return "WRITEV";
+  case OP_WRITE: return "WRITE";
+  case OP_RECV: return "RECV";
+  case OP_SEND: return "SEND";
+  case OP_TIMEOUT: return "TIMEOUT";
+  case OP_POLL: return "POLL";
+  case OP_ACCEPT: return "ACCEPT";
+  case OP_CONNECT: return "CONNECT";
+  default: return "";
+  };
+}
+
+void context_store_initialize(op_context_store_t *store) {
+  store->last_id = 0;
+  store->available = NULL;
+  store->taken = NULL;
+}
+
+inline op_context_t *context_store_acquire(op_context_store_t *store, enum op_type type) {
+  op_context_t *ctx = store->available;
+  if (ctx) {
+    if (ctx->next) ctx->next->prev = NULL;
+    store->available = ctx->next;
+  }
+  else {
+    ctx = malloc(sizeof(op_context_t));
+  }
+  ctx->id = (++store->last_id);
+  
+  ctx->prev = NULL;
+  ctx->next = store->taken;
+  if (store->taken) store->taken->prev = ctx;
+  store->taken = ctx;
+
+  ctx->type = type;
+  ctx->fiber = rb_fiber_current();
+  ctx->completed = 0;
+  ctx->result = 0;
+
+  return ctx;
+}
+
+inline void context_store_release(op_context_store_t *store, op_context_t *ctx) {
+  if (ctx->next) ctx->next->prev = ctx->prev;
+  if (ctx->prev) ctx->prev->next = ctx->next;
+  if (store->taken == ctx) store->taken = ctx->next;
+
+  ctx->prev = NULL;
+  ctx->next = store->available;
+  if (ctx->next) ctx->next->prev = ctx;
+  store->available = ctx;
+}
+
+void context_store_free(op_context_store_t *store) {
+  while (store->available) {
+    op_context_t *next = store->available->next;
+    free(store->available);
+    store->available = next;
+  }
+  while (store->taken) {
+    op_context_t *next = store->taken->next;
+    free(store->taken);
+    store->taken = next;
+  }
+}

data/ext/polyphony/backend_io_uring_context.h

@@ -0,0 +1,52 @@
+#ifndef BACKEND_IO_URING_CONTEXT_H
+#define BACKEND_IO_URING_CONTEXT_H
+
+#include "ruby.h"
+
+enum op_type {
+  OP_NONE,
+  OP_READ,
+  OP_WRITEV,
+  OP_WRITE,
+  OP_RECV,
+  OP_SEND,
+  OP_TIMEOUT,
+  OP_POLL,
+  OP_ACCEPT,
+  OP_CONNECT
+};
+
+typedef struct op_context {
+  struct op_context *prev;
+  struct op_context *next;
+  enum op_type      type: 16;
+  int               completed : 16;
+  int               id;
+  int               result;
+  VALUE             fiber;
+} op_context_t;
+
+typedef struct op_context_store {
+  int           last_id;
+  op_context_t *available;
+  op_context_t *taken;
+} op_context_store_t;
+
+const char *op_type_to_str(enum op_type type);
+
+void context_store_initialize(op_context_store_t *store);
+op_context_t *context_store_acquire(op_context_store_t *store, enum op_type type);
+void context_store_release(op_context_store_t *store, op_context_t *ctx);
+void context_store_free(op_context_store_t *store);
+
+#define OP_CONTEXT_ACQUIRE(store, op_type) context_store_acquire(store, op_type)
+#define OP_CONTEXT_RELEASE(store, ctx) { \
+  if (ctx->completed) {\
+    context_store_release(store, ctx); \
+  } \
+  else { \
+    ctx->completed = 1; \
+  } \
+}
+
+#endif /* BACKEND_IO_URING_CONTEXT_H */

data/ext/polyphony/{libev_backend.c → backend_libev.c}

@@ -1,3 +1,5 @@
+#ifdef POLYPHONY_BACKEND_LIBEV
+
 #include <netdb.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
@@ -8,47 +10,73 @@
 
 #include "polyphony.h"
 #include "../libev/ev.h"
+#include "ruby/io.h"
 
 VALUE cTCPSocket;
+VALUE SYM_libev;
+
+ID ID_ivar_is_nonblocking;
+
+// Since we need to ensure that fd's are non-blocking before every I/O
+// operation, here we improve upon Ruby's rb_io_set_nonblock by caching the
+// "nonblock" state in an instance variable. Calling rb_ivar_get on every read
+// is still much cheaper than doing a fcntl syscall on every read! Preliminary
+// benchmarks (with a "hello world" HTTP server) show throughput is improved
+// by 10-13%.
+inline void io_set_nonblock(rb_io_t *fptr, VALUE io) {
+  VALUE is_nonblocking = rb_ivar_get(io, ID_ivar_is_nonblocking);
+  if (is_nonblocking == Qtrue) return;
+
+  rb_ivar_set(io, ID_ivar_is_nonblocking, Qtrue);
+
+#ifdef _WIN32
+  rb_w32_set_nonblock(fptr->fd);
+#elif defined(F_GETFL)
+  int oflags = fcntl(fptr->fd, F_GETFL);
+  if ((oflags == -1) && (oflags & O_NONBLOCK)) return;
+  oflags |= O_NONBLOCK;
+  fcntl(fptr->fd, F_SETFL, oflags);
+#endif
+}
 
-typedef struct LibevBackend_t {
+typedef struct Backend_t {
   struct ev_loop *ev_loop;
   struct ev_async break_async;
   int running;
   int ref_count;
   int run_no_wait_count;
-} LibevBackend_t;
+} Backend_t;
 
-static size_t LibevBackend_size(const void *ptr) {
-  return sizeof(LibevBackend_t);
+static size_t Backend_size(const void *ptr) {
+  return sizeof(Backend_t);
 }
 
-static const rb_data_type_t LibevBackend_type = {
-    "Libev",
-    {0, 0, LibevBackend_size,},
+static const rb_data_type_t Backend_type = {
+    "LibevBackend",
+    {0, 0, Backend_size,},
     0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
-static VALUE LibevBackend_allocate(VALUE klass) {
-  LibevBackend_t *backend = ALLOC(LibevBackend_t);
-  
-  return TypedData_Wrap_Struct(klass, &LibevBackend_type, backend);
+static VALUE Backend_allocate(VALUE klass) {
+  Backend_t *backend = ALLOC(Backend_t);
+
+  return TypedData_Wrap_Struct(klass, &Backend_type, backend);
 }
 
-#define GetLibevBackend(obj, backend) \
-  TypedData_Get_Struct((obj), LibevBackend_t, &LibevBackend_type, (backend))
+#define GetBackend(obj, backend) \
+  TypedData_Get_Struct((obj), Backend_t, &Backend_type, (backend))
 
 void break_async_callback(struct ev_loop *ev_loop, struct ev_async *ev_async, int revents) {
   // This callback does nothing, the break async is used solely for breaking out
   // of a *blocking* event loop (waking it up) in a thread-safe, signal-safe manner
 }
 
-static VALUE LibevBackend_initialize(VALUE self) {
-  LibevBackend_t *backend;
+static VALUE Backend_initialize(VALUE self) {
+  Backend_t *backend;
   VALUE thread = rb_thread_current();
   int is_main_thread = (thread == rb_thread_main());
 
-  GetLibevBackend(self, backend);
+  GetBackend(self, backend);
   backend->ev_loop = is_main_thread ? EV_DEFAULT : ev_loop_new(EVFLAG_NOSIGMASK);
 
   ev_async_init(&backend->break_async, break_async_callback);
@@ -62,9 +90,9 @@ static VALUE LibevBackend_initialize(VALUE self) {
   return Qnil;
 }
 
-VALUE LibevBackend_finalize(VALUE self) {
-  LibevBackend_t *backend;
-  GetLibevBackend(self, backend);
+VALUE Backend_finalize(VALUE self) {
+  Backend_t *backend;
+  GetBackend(self, backend);
 
    ev_async_stop(backend->ev_loop, &backend->break_async);
 
@@ -73,9 +101,9 @@ VALUE LibevBackend_finalize(VALUE self) {
   return self;
 }
 
-VALUE LibevBackend_post_fork(VALUE self) {
-  LibevBackend_t *backend;
-  GetLibevBackend(self, backend);
+VALUE Backend_post_fork(VALUE self) {
+  Backend_t *backend;
+  GetBackend(self, backend);
 
   // After fork there may be some watchers still active left over from the
   // parent, so we destroy the loop, even if it's the default one, then use the
@@ -88,70 +116,71 @@ VALUE LibevBackend_post_fork(VALUE self) {
   return self;
 }
 
-VALUE LibevBackend_ref(VALUE self) {
-  LibevBackend_t *backend;
-  GetLibevBackend(self, backend);
+VALUE Backend_ref(VALUE self) {
+  Backend_t *backend;
+  GetBackend(self, backend);
 
   backend->ref_count++;
-  return self;  
+  return self;
 }
 
-VALUE LibevBackend_unref(VALUE self) {
-  LibevBackend_t *backend;
-  GetLibevBackend(self, backend);
+VALUE Backend_unref(VALUE self) {
+  Backend_t *backend;
+  GetBackend(self, backend);
 
   backend->ref_count--;
-  return self;  
+  return self;
 }
 
-int LibevBackend_ref_count(VALUE self) {
-  LibevBackend_t *backend;
-  GetLibevBackend(self, backend);
+int Backend_ref_count(VALUE self) {
+  Backend_t *backend;
+  GetBackend(self, backend);
 
   return backend->ref_count;
 }
 
-void LibevBackend_reset_ref_count(VALUE self) {
-  LibevBackend_t *backend;
-  GetLibevBackend(self, backend);
+void Backend_reset_ref_count(VALUE self) {
+  Backend_t *backend;
+  GetBackend(self, backend);
 
   backend->ref_count = 0;
 }
 
-VALUE LibevBackend_pending_count(VALUE self) {
+VALUE Backend_pending_count(VALUE self) {
   int count;
-  LibevBackend_t *backend;
-  GetLibevBackend(self, backend);
+  Backend_t *backend;
+  GetBackend(self, backend);
   count = ev_pending_count(backend->ev_loop);
   return INT2NUM(count);
 }
 
-VALUE LibevBackend_poll(VALUE self, VALUE nowait, VALUE current_fiber, VALUE queue) {
+VALUE Backend_poll(VALUE self, VALUE nowait, VALUE current_fiber, VALUE runqueue) {
   int is_nowait = nowait == Qtrue;
-  LibevBackend_t *backend;
-  GetLibevBackend(self, backend);
+  Backend_t *backend;
+  GetBackend(self, backend);
 
   if (is_nowait) {
-    long runnable_count = Queue_len(queue);
     backend->run_no_wait_count++;
-    if (backend->run_no_wait_count < runnable_count || backend->run_no_wait_count < 10)
-      return self;
+    if (backend->run_no_wait_count < 10) return self;
+
+    long runnable_count = Runqueue_len(runqueue);
+    if (backend->run_no_wait_count < runnable_count) return self;
   }
 
   backend->run_no_wait_count = 0;
-  
-  COND_TRACE(2, SYM_fiber_ev_loop_enter, current_fiber);
+
+  COND_TRACE(2, SYM_fiber_event_poll_enter, current_fiber);
   backend->running = 1;
   ev_run(backend->ev_loop, is_nowait ? EVRUN_NOWAIT : EVRUN_ONCE);
   backend->running = 0;
-  COND_TRACE(2, SYM_fiber_ev_loop_leave, current_fiber);
+  COND_TRACE(2, SYM_fiber_event_poll_leave, current_fiber);
 
   return self;
 }
 
-VALUE LibevBackend_wakeup(VALUE self) {
-  LibevBackend_t *backend;
-  GetLibevBackend(self, backend);
+VALUE Backend_wakeup(VALUE self) {
+  Backend_t *backend;
+  GetBackend(self, backend);
 
   if (backend->running) {
     // Since the loop will run until at least one event has occurred, we signal
@@ -166,146 +195,51 @@ VALUE LibevBackend_wakeup(VALUE self) {
   return Qnil;
 }
 
-#include "polyphony.h"
 #include "../libev/ev.h"
 
-//////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////
-// the following is copied verbatim from the Ruby source code (io.c)
-struct io_internal_read_struct {
-    int fd;
-    int nonblock;
-    void *buf;
-    size_t capa;
-};
-
-#define StringValue(v) rb_string_value(&(v))
-
-int io_setstrbuf(VALUE *str, long len) {
-  #ifdef _WIN32
-    len = (len + 1) & ~1L;	/* round up for wide char */
-  #endif
-  if (NIL_P(*str)) {
-    *str = rb_str_new(0, len);
-    return 1;
-  }
-  else {
-    VALUE s = StringValue(*str);
-    long clen = RSTRING_LEN(s);
-    if (clen >= len) {
-      rb_str_modify(s);
-      return 0;
-    }
-    len -= clen;
-  }
-  rb_str_modify_expand(*str, len);
-  return 0;
-}
-
-#define MAX_REALLOC_GAP 4096
-static void io_shrink_read_string(VALUE str, long n) {
-  if (rb_str_capacity(str) - n > MAX_REALLOC_GAP) {
-    rb_str_resize(str, n);
-  }
-}
-
-void io_set_read_length(VALUE str, long n, int shrinkable) {
-  if (RSTRING_LEN(str) != n) {
-    rb_str_modify(str);
-    rb_str_set_len(str, n);
-    if (shrinkable) io_shrink_read_string(str, n);
-  }
-}
-
-static rb_encoding* io_read_encoding(rb_io_t *fptr) {
-    if (fptr->encs.enc) {
-	return fptr->encs.enc;
-    }
-    return rb_default_external_encoding();
-}
-
-VALUE io_enc_str(VALUE str, rb_io_t *fptr) {
-    OBJ_TAINT(str);
-    rb_enc_associate(str, io_read_encoding(fptr));
-    return str;
-}
-
-//////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////
+#include "backend_common.h"
 
 struct libev_io {
   struct ev_io io;
   VALUE fiber;
 };
 
-void LibevBackend_io_callback(EV_P_ ev_io *w, int revents)
+void Backend_io_callback(EV_P_ ev_io *w, int revents)
 {
   struct libev_io *watcher = (struct libev_io *)w;
   Fiber_make_runnable(watcher->fiber, Qnil);
 }
 
-inline VALUE libev_await(LibevBackend_t *backend) {
-  VALUE ret;
-  backend->ref_count++;
-  ret = Thread_switch_fiber(rb_thread_current());
-  backend->ref_count--;
-  RB_GC_GUARD(ret);
-  return ret;
-}
-
-VALUE libev_backend_await(VALUE self) {
-  LibevBackend_t *backend;
-  GetLibevBackend(self, backend);
-  return libev_await(backend);
-}
-
-VALUE libev_io_wait(LibevBackend_t *backend, struct libev_io *watcher, rb_io_t *fptr, int flags) {
+VALUE libev_wait_fd_with_watcher(Backend_t *backend, int fd, struct libev_io *watcher, int events) {
   VALUE switchpoint_result;
 
   if (watcher->fiber == Qnil) {
     watcher->fiber = rb_fiber_current();
-    ev_io_init(&watcher->io, LibevBackend_io_callback, fptr->fd, flags);
+    ev_io_init(&watcher->io, Backend_io_callback, fd, events);
   }
   ev_io_start(backend->ev_loop, &watcher->io);
-  switchpoint_result = libev_await(backend);
-  ev_io_stop(backend->ev_loop, &watcher->io);
 
+  switchpoint_result = backend_await(backend);
+
+  ev_io_stop(backend->ev_loop, &watcher->io);
   RB_GC_GUARD(switchpoint_result);
-  return switchpoint_result;  
+  return switchpoint_result;
 }
 
-VALUE libev_snooze() {
-  Fiber_make_runnable(rb_fiber_current(), Qnil);
-  return Thread_switch_fiber(rb_thread_current());
-}
+VALUE libev_wait_fd(Backend_t *backend, int fd, int events, int raise_exception) {
+  struct libev_io watcher;
+  VALUE switchpoint_result = Qnil;
+  watcher.fiber = Qnil;
 
-ID ID_ivar_is_nonblocking;
+  switchpoint_result = libev_wait_fd_with_watcher(backend, fd, &watcher, events);
 
-// Since we need to ensure that fd's are non-blocking before every I/O
-// operation, here we improve upon Ruby's rb_io_set_nonblock by caching the
-// "nonblock" state in an instance variable. Calling rb_ivar_get on every read
-// is still much cheaper than doing a fcntl syscall on every read! Preliminary
-// benchmarks (with a "hello world" HTTP server) show throughput is improved
-// by 10-13%.
-inline void io_set_nonblock(rb_io_t *fptr, VALUE io) {
-#ifdef _WIN32
-  return rb_w32_set_nonblock(fptr->fd);
-#elif defined(F_GETFL)
-  VALUE is_nonblocking = rb_ivar_get(io, ID_ivar_is_nonblocking);
-  if (is_nonblocking == Qnil) {
-    rb_ivar_set(io, ID_ivar_is_nonblocking, Qtrue);
-    int oflags = fcntl(fptr->fd, F_GETFL);
-    if (oflags == -1) return;
-    if (oflags & O_NONBLOCK) return;
-    oflags |= O_NONBLOCK;
-    fcntl(fptr->fd, F_SETFL, oflags);
-  }
-#endif
-  return;
+  if (raise_exception) RAISE_IF_EXCEPTION(switchpoint_result);
+  RB_GC_GUARD(switchpoint_result);
+  return switchpoint_result;
 }
 
-VALUE LibevBackend_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_eof) {
-  LibevBackend_t *backend;
+VALUE Backend_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_eof) {
+  Backend_t *backend;
   struct libev_io watcher;
   rb_io_t *fptr;
   long dynamic_len = length == Qnil;
@@ -315,37 +249,30 @@ VALUE LibevBackend_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_
   long total = 0;
   VALUE switchpoint_result = Qnil;
   int read_to_eof = RTEST(to_eof);
-  VALUE underlying_io = rb_iv_get(io, "@io");
+  VALUE underlying_io = rb_ivar_get(io, ID_ivar_io);
 
-  GetLibevBackend(self, backend);
+  GetBackend(self, backend);
   if (underlying_io != Qnil) io = underlying_io;
   GetOpenFile(io, fptr);
   rb_io_check_byte_readable(fptr);
   io_set_nonblock(fptr, io);
+  rectify_io_file_pos(fptr);
   watcher.fiber = Qnil;
-  
   OBJ_TAINT(str);
 
-  // Apparently after reopening a closed file, the file position is not reset,
-  // which causes the read to fail. Fortunately we can use fptr->rbuf.len to
-  // find out if that's the case.
-  // See: https://github.com/digital-fabric/polyphony/issues/30
-  if (fptr->rbuf.len > 0) {
-    lseek(fptr->fd, -fptr->rbuf.len, SEEK_CUR);
-    fptr->rbuf.len = 0;
-  }
-
   while (1) {
     ssize_t n = read(fptr->fd, buf, len - total);
     if (n < 0) {
       int e = errno;
       if (e != EWOULDBLOCK && e != EAGAIN) rb_syserr_fail(e, strerror(e));
-      
-      switchpoint_result = libev_io_wait(backend, &watcher, fptr, EV_READ);
+
+      switchpoint_result = libev_wait_fd_with_watcher(backend, fptr->fd, &watcher, EV_READ);
+
       if (TEST_EXCEPTION(switchpoint_result)) goto error;
     }
     else {
-      switchpoint_result = libev_snooze();
+      switchpoint_result = backend_snooze();
+
       if (TEST_EXCEPTION(switchpoint_result)) goto error;
 
       if (n == 0) break; // EOF
@@ -354,7 +281,7 @@ VALUE LibevBackend_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_
 
       if (total == len) {
         if (!dynamic_len) break;
-      
+
         rb_str_resize(str, total);
         rb_str_modify_expand(str, len);
         buf = RSTRING_PTR(str) + total;
@@ -364,11 +291,12 @@ VALUE LibevBackend_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_
       else buf += n;
     }
   }
-  if (total == 0) return Qnil;
 
   io_set_read_length(str, total, shrinkable);
   io_enc_str(str, fptr);
-  
+
+  if (total == 0) return Qnil;
+
   RB_GC_GUARD(watcher.fiber);
   RB_GC_GUARD(switchpoint_result);
 
@@ -377,24 +305,12 @@ error:
   return RAISE_EXCEPTION(switchpoint_result);
 }
 
-VALUE LibevBackend_read_loop(VALUE self, VALUE io) {
-
-  #define PREPARE_STR() { \
-    str = Qnil; \
-    shrinkable = io_setstrbuf(&str, len); \
-    buf = RSTRING_PTR(str); \
-    total = 0; \
-    OBJ_TAINT(str); \
-  }
-
-  #define YIELD_STR() { \
-    io_set_read_length(str, total, shrinkable); \
-    io_enc_str(str, fptr); \
-    rb_yield(str); \
-    PREPARE_STR(); \
-  }
+VALUE Backend_recv(VALUE self, VALUE io, VALUE str, VALUE length) {
+  return Backend_read(self, io, str, length, Qnil);
+}
 
-  LibevBackend_t *backend;
+VALUE Backend_read_loop(VALUE self, VALUE io) {
+  Backend_t *backend;
   struct libev_io watcher;
   rb_io_t *fptr;
   VALUE str;
@@ -403,48 +319,35 @@ VALUE LibevBackend_read_loop(VALUE self, VALUE io) {
   int shrinkable;
   char *buf;
   VALUE switchpoint_result = Qnil;
-  VALUE underlying_io = rb_iv_get(io, "@io");
+  VALUE underlying_io = rb_ivar_get(io, ID_ivar_io);
 
-  PREPARE_STR();
+  READ_LOOP_PREPARE_STR();
 
-  GetLibevBackend(self, backend);
+  GetBackend(self, backend);
   if (underlying_io != Qnil) io = underlying_io;
   GetOpenFile(io, fptr);
   rb_io_check_byte_readable(fptr);
   io_set_nonblock(fptr, io);
+  rectify_io_file_pos(fptr);
   watcher.fiber = Qnil;
 
-  // Apparently after reopening a closed file, the file position is not reset,
-  // which causes the read to fail. Fortunately we can use fptr->rbuf.len to
-  // find out if that's the case.
-  // See: https://github.com/digital-fabric/polyphony/issues/30
-  if (fptr->rbuf.len > 0) {
-    lseek(fptr->fd, -fptr->rbuf.len, SEEK_CUR);
-    fptr->rbuf.len = 0;
-  }
-
   while (1) {
     ssize_t n = read(fptr->fd, buf, len);
     if (n < 0) {
       int e = errno;
       if ((e != EWOULDBLOCK && e != EAGAIN)) rb_syserr_fail(e, strerror(e));
 
-      switchpoint_result = libev_io_wait(backend, &watcher, fptr, EV_READ);
+      switchpoint_result = libev_wait_fd_with_watcher(backend, fptr->fd, &watcher, EV_READ);
       if (TEST_EXCEPTION(switchpoint_result)) goto error;
     }
     else {
-      switchpoint_result = libev_snooze();
-      if (TEST_EXCEPTION(switchpoint_result)) goto error;
+      switchpoint_result = backend_snooze();
 
-      if (n == 0) break; // EOF      
+      if (TEST_EXCEPTION(switchpoint_result)) goto error;
 
+      if (n == 0) break; // EOF
       total = n;
-      YIELD_STR();
-      Fiber_make_runnable(rb_fiber_current(), Qnil);
-      switchpoint_result = Thread_switch_fiber(rb_thread_current());
-      if (TEST_EXCEPTION(switchpoint_result)) {
-        goto error;
-      }
+      READ_LOOP_YIELD_STR();
     }
   }
 
@@ -457,8 +360,8 @@ error:
   return RAISE_EXCEPTION(switchpoint_result);
 }
 
-VALUE LibevBackend_write(VALUE self, VALUE io, VALUE str) {
-  LibevBackend_t *backend;
+VALUE Backend_write(VALUE self, VALUE io, VALUE str) {
+  Backend_t *backend;
   struct libev_io watcher;
   rb_io_t *fptr;
   VALUE switchpoint_result = Qnil;
@@ -467,11 +370,12 @@ VALUE LibevBackend_write(VALUE self, VALUE io, VALUE str) {
   long len = RSTRING_LEN(str);
   long left = len;
 
-  underlying_io = rb_iv_get(io, "@io");
+  underlying_io = rb_ivar_get(io, ID_ivar_io);
   if (underlying_io != Qnil) io = underlying_io;
-  GetLibevBackend(self, backend);
+  GetBackend(self, backend);
   io = rb_io_get_write_io(io);
   GetOpenFile(io, fptr);
+  io_set_nonblock(fptr, io);
   watcher.fiber = Qnil;
 
   while (left > 0) {
@@ -479,7 +383,9 @@ VALUE LibevBackend_write(VALUE self, VALUE io, VALUE str) {
     if (n < 0) {
       int e = errno;
       if ((e != EWOULDBLOCK && e != EAGAIN)) rb_syserr_fail(e, strerror(e));
-      switchpoint_result = libev_io_wait(backend, &watcher, fptr, EV_WRITE);
+
+      switchpoint_result = libev_wait_fd_with_watcher(backend, fptr->fd, &watcher, EV_WRITE);
+
       if (TEST_EXCEPTION(switchpoint_result)) goto error;
     }
     else {
@@ -489,7 +395,8 @@ VALUE LibevBackend_write(VALUE self, VALUE io, VALUE str) {
   }
 
   if (watcher.fiber == Qnil) {
-    switchpoint_result = libev_snooze();
+    switchpoint_result = backend_snooze();
+
     if (TEST_EXCEPTION(switchpoint_result)) goto error;
   }
 
@@ -501,8 +408,8 @@ error:
   return RAISE_EXCEPTION(switchpoint_result);
 }
 
-VALUE LibevBackend_writev(VALUE self, VALUE io, int argc, VALUE *argv) {
-  LibevBackend_t *backend;
+VALUE Backend_writev(VALUE self, VALUE io, int argc, VALUE *argv) {
+  Backend_t *backend;
   struct libev_io watcher;
   rb_io_t *fptr;
   VALUE switchpoint_result = Qnil;
@@ -513,11 +420,12 @@ VALUE LibevBackend_writev(VALUE self, VALUE io, int argc, VALUE *argv) {
   struct iovec *iov_ptr = 0;
   int iov_count = argc;
 
-  underlying_io = rb_iv_get(io, "@io");
+  underlying_io = rb_ivar_get(io, ID_ivar_io);
   if (underlying_io != Qnil) io = underlying_io;
-  GetLibevBackend(self, backend);
+  GetBackend(self, backend);
   io = rb_io_get_write_io(io);
   GetOpenFile(io, fptr);
+  io_set_nonblock(fptr, io);
   watcher.fiber = Qnil;
 
   iov = malloc(iov_count * sizeof(struct iovec));
@@ -533,9 +441,13 @@ VALUE LibevBackend_writev(VALUE self, VALUE io, int argc, VALUE *argv) {
     ssize_t n = writev(fptr->fd, iov_ptr, iov_count);
     if (n < 0) {
       int e = errno;
-      if ((e != EWOULDBLOCK && e != EAGAIN)) rb_syserr_fail(e, strerror(e));
+      if ((e != EWOULDBLOCK && e != EAGAIN)) {
+        free(iov);
+        rb_syserr_fail(e, strerror(e));
+      }
+
+      switchpoint_result = libev_wait_fd_with_watcher(backend, fptr->fd, &watcher, EV_WRITE);
 
-      switchpoint_result = libev_io_wait(backend, &watcher, fptr, EV_WRITE);
       if (TEST_EXCEPTION(switchpoint_result)) goto error;
     }
     else {
@@ -557,7 +469,7 @@ VALUE LibevBackend_writev(VALUE self, VALUE io, int argc, VALUE *argv) {
     }
   }
   if (watcher.fiber == Qnil) {
-    switchpoint_result = libev_snooze();
+    switchpoint_result = backend_snooze();
     if (TEST_EXCEPTION(switchpoint_result)) goto error;
   }
 
@@ -571,30 +483,28 @@ error:
   return RAISE_EXCEPTION(switchpoint_result);
 }
 
-VALUE LibevBackend_write_m(int argc, VALUE *argv, VALUE self) {
+VALUE Backend_write_m(int argc, VALUE *argv, VALUE self) {
   if (argc < 2)
     // TODO: raise ArgumentError
     rb_raise(rb_eRuntimeError, "(wrong number of arguments (expected 2 or more))");
-  
+
   return (argc == 2) ?
-    LibevBackend_write(self, argv[0], argv[1]) :
-    LibevBackend_writev(self, argv[0], argc - 1, argv + 1);                    
+    Backend_write(self, argv[0], argv[1]) :
+    Backend_writev(self, argv[0], argc - 1, argv + 1);
 }
 
-///////////////////////////////////////////////////////////////////////////
-
-VALUE LibevBackend_accept(VALUE self, VALUE sock) {
-  LibevBackend_t *backend;
+VALUE Backend_accept(VALUE self, VALUE sock) {
+  Backend_t *backend;
   struct libev_io watcher;
   rb_io_t *fptr;
   int fd;
   struct sockaddr addr;
   socklen_t len = (socklen_t)sizeof addr;
   VALUE switchpoint_result = Qnil;
-  VALUE underlying_sock = rb_iv_get(sock, "@io");
+  VALUE underlying_sock = rb_ivar_get(sock, ID_ivar_io);
   if (underlying_sock != Qnil) sock = underlying_sock;
 
-  GetLibevBackend(self, backend);
+  GetBackend(self, backend);
   GetOpenFile(sock, fptr);
   io_set_nonblock(fptr, sock);
   watcher.fiber = Qnil;
@@ -604,13 +514,15 @@ VALUE LibevBackend_accept(VALUE self, VALUE sock) {
       int e = errno;
       if ((e != EWOULDBLOCK && e != EAGAIN)) rb_syserr_fail(e, strerror(e));
 
-      switchpoint_result = libev_io_wait(backend, &watcher, fptr, EV_READ);
+      switchpoint_result = libev_wait_fd_with_watcher(backend, fptr->fd, &watcher, EV_READ);
+
       if (TEST_EXCEPTION(switchpoint_result)) goto error;
     }
     else {
       VALUE socket;
       rb_io_t *fp;
-      switchpoint_result = libev_snooze();
+      switchpoint_result = backend_snooze();
+
       if (TEST_EXCEPTION(switchpoint_result)) {
         close(fd); // close fd since we're raising an exception
         goto error;
@@ -624,7 +536,7 @@ VALUE LibevBackend_accept(VALUE self, VALUE sock) {
       rb_io_ascii8bit_binmode(socket);
       io_set_nonblock(fp, socket);
       rb_io_synchronized(fp);
-      
+
       // if (rsock_do_not_reverse_lookup) {
 	    //   fp->mode |= FMODE_NOREVLOOKUP;
       // }
@@ -637,8 +549,8 @@ error:
   return RAISE_EXCEPTION(switchpoint_result);
 }
 
-VALUE LibevBackend_accept_loop(VALUE self, VALUE sock) {
-  LibevBackend_t *backend;
+VALUE Backend_accept_loop(VALUE self, VALUE sock) {
+  Backend_t *backend;
   struct libev_io watcher;
   rb_io_t *fptr;
   int fd;
@@ -646,10 +558,10 @@ VALUE LibevBackend_accept_loop(VALUE self, VALUE sock) {
   socklen_t len = (socklen_t)sizeof addr;
   VALUE switchpoint_result = Qnil;
   VALUE socket = Qnil;
-  VALUE underlying_sock = rb_iv_get(sock, "@io");
+  VALUE underlying_sock = rb_ivar_get(sock, ID_ivar_io);
   if (underlying_sock != Qnil) sock = underlying_sock;
 
-  GetLibevBackend(self, backend);
+  GetBackend(self, backend);
   GetOpenFile(sock, fptr);
   io_set_nonblock(fptr, sock);
   watcher.fiber = Qnil;
@@ -660,17 +572,19 @@ VALUE LibevBackend_accept_loop(VALUE self, VALUE sock) {
       int e = errno;
       if ((e != EWOULDBLOCK && e != EAGAIN)) rb_syserr_fail(e, strerror(e));
 
-      switchpoint_result = libev_io_wait(backend, &watcher, fptr, EV_READ);
+      switchpoint_result = libev_wait_fd_with_watcher(backend, fptr->fd, &watcher, EV_READ);
+
       if (TEST_EXCEPTION(switchpoint_result)) goto error;
     }
     else {
       rb_io_t *fp;
-      switchpoint_result = libev_snooze();
+      switchpoint_result = backend_snooze();
+
       if (TEST_EXCEPTION(switchpoint_result)) {
         close(fd); // close fd since we're raising an exception
         goto error;
       }
-    
+
       socket = rb_obj_alloc(cTCPSocket);
       MakeOpenFile(socket, fp);
       rb_update_max_fd(fd);
@@ -693,22 +607,22 @@ error:
   return RAISE_EXCEPTION(switchpoint_result);
 }
 
-VALUE LibevBackend_connect(VALUE self, VALUE sock, VALUE host, VALUE port) {
-  LibevBackend_t *backend;
+VALUE Backend_connect(VALUE self, VALUE sock, VALUE host, VALUE port) {
+  Backend_t *backend;
   struct libev_io watcher;
   rb_io_t *fptr;
   struct sockaddr_in addr;
   char *host_buf = StringValueCStr(host);
   VALUE switchpoint_result = Qnil;
-  VALUE underlying_sock = rb_iv_get(sock, "@io");
+  VALUE underlying_sock = rb_ivar_get(sock, ID_ivar_io);
   if (underlying_sock != Qnil) sock = underlying_sock;
 
-  GetLibevBackend(self, backend);
+  GetBackend(self, backend);
   GetOpenFile(sock, fptr);
   io_set_nonblock(fptr, sock);
   watcher.fiber = Qnil;
 
-  addr.sin_family = AF_INET; 
+  addr.sin_family = AF_INET;
   addr.sin_addr.s_addr = inet_addr(host_buf);
   addr.sin_port = htons(NUM2INT(port));
 
@@ -716,11 +630,14 @@ VALUE LibevBackend_connect(VALUE self, VALUE sock, VALUE host, VALUE port) {
   if (result < 0) {
     int e = errno;
     if (e != EINPROGRESS) rb_syserr_fail(e, strerror(e));
-    switchpoint_result = libev_io_wait(backend, &watcher, fptr, EV_WRITE);
+
+    switchpoint_result = libev_wait_fd_with_watcher(backend, fptr->fd, &watcher, EV_WRITE);
+
     if (TEST_EXCEPTION(switchpoint_result)) goto error;
   }
   else {
-    switchpoint_result = libev_snooze();
+    switchpoint_result = backend_snooze();
+
     if (TEST_EXCEPTION(switchpoint_result)) goto error;
   }
   RB_GC_GUARD(switchpoint_result);
@@ -729,30 +646,15 @@ error:
   return RAISE_EXCEPTION(switchpoint_result);
 }
 
-VALUE libev_wait_fd(LibevBackend_t *backend, int fd, int events, int raise_exception) {
-  struct libev_io watcher;
-  VALUE switchpoint_result = Qnil;
-  
-  watcher.fiber = rb_fiber_current();
-  ev_io_init(&watcher.io, LibevBackend_io_callback, fd, events);
-  ev_io_start(backend->ev_loop, &watcher.io);
-  switchpoint_result = libev_await(backend);
-  ev_io_stop(backend->ev_loop, &watcher.io);
-  
-  if (raise_exception) TEST_RESUME_EXCEPTION(switchpoint_result);
-  RB_GC_GUARD(switchpoint_result);
-  return switchpoint_result;
-}
-
-VALUE LibevBackend_wait_io(VALUE self, VALUE io, VALUE write) {
-  LibevBackend_t *backend;
+VALUE Backend_wait_io(VALUE self, VALUE io, VALUE write) {
+  Backend_t *backend;
   rb_io_t *fptr;
   int events = RTEST(write) ? EV_WRITE : EV_READ;
-  VALUE underlying_io = rb_iv_get(io, "@io");
+  VALUE underlying_io = rb_ivar_get(io, ID_ivar_io);
   if (underlying_io != Qnil) io = underlying_io;
-  GetLibevBackend(self, backend);
+  GetBackend(self, backend);
   GetOpenFile(io, fptr);
-  
+
   return libev_wait_fd(backend, fptr->fd, events, 1);
 }
 
@@ -761,27 +663,26 @@ struct libev_timer {
   VALUE fiber;
 };
 
-void LibevBackend_timer_callback(EV_P_ ev_timer *w, int revents)
+void Backend_timer_callback(EV_P_ ev_timer *w, int revents)
 {
   struct libev_timer *watcher = (struct libev_timer *)w;
   Fiber_make_runnable(watcher->fiber, Qnil);
 }
 
-VALUE LibevBackend_sleep(VALUE self, VALUE duration) {
-  LibevBackend_t *backend;
+VALUE Backend_sleep(VALUE self, VALUE duration) {
+  Backend_t *backend;
   struct libev_timer watcher;
   VALUE switchpoint_result = Qnil;
 
-  GetLibevBackend(self, backend);
+  GetBackend(self, backend);
   watcher.fiber = rb_fiber_current();
-  ev_timer_init(&watcher.timer, LibevBackend_timer_callback, NUM2DBL(duration), 0.);
+  ev_timer_init(&watcher.timer, Backend_timer_callback, NUM2DBL(duration), 0.);
   ev_timer_start(backend->ev_loop, &watcher.timer);
 
-  switchpoint_result = libev_await(backend);
+  switchpoint_result = backend_await(backend);
 
   ev_timer_stop(backend->ev_loop, &watcher.timer);
-
-  TEST_RESUME_EXCEPTION(switchpoint_result);
+  RAISE_IF_EXCEPTION(switchpoint_result);
   RB_GC_GUARD(watcher.fiber);
   RB_GC_GUARD(switchpoint_result);
   return switchpoint_result;
@@ -792,97 +693,106 @@ struct libev_child {
   VALUE fiber;
 };
 
-void LibevBackend_child_callback(EV_P_ ev_child *w, int revents)
+void Backend_child_callback(EV_P_ ev_child *w, int revents)
 {
   struct libev_child *watcher = (struct libev_child *)w;
-  int exit_status = w->rstatus >> 8; // weird, why should we do this?
+  int exit_status = WEXITSTATUS(w->rstatus);
   VALUE status;
 
   status = rb_ary_new_from_args(2, INT2NUM(w->rpid), INT2NUM(exit_status));
   Fiber_make_runnable(watcher->fiber, status);
 }
 
-VALUE LibevBackend_waitpid(VALUE self, VALUE pid) {
-  LibevBackend_t *backend;
+VALUE Backend_waitpid(VALUE self, VALUE pid) {
+  Backend_t *backend;
   struct libev_child watcher;
   VALUE switchpoint_result = Qnil;
-  GetLibevBackend(self, backend);
+  GetBackend(self, backend);
 
   watcher.fiber = rb_fiber_current();
-  ev_child_init(&watcher.child, LibevBackend_child_callback, NUM2INT(pid), 0);
+  ev_child_init(&watcher.child, Backend_child_callback, NUM2INT(pid), 0);
   ev_child_start(backend->ev_loop, &watcher.child);
-  
-  switchpoint_result = libev_await(backend);
-  ev_child_stop(backend->ev_loop, &watcher.child);
 
-  TEST_RESUME_EXCEPTION(switchpoint_result);
+  switchpoint_result = backend_await(backend);
+
+  ev_child_stop(backend->ev_loop, &watcher.child);
+  RAISE_IF_EXCEPTION(switchpoint_result);
   RB_GC_GUARD(watcher.fiber);
   RB_GC_GUARD(switchpoint_result);
   return switchpoint_result;
 }
 
-struct ev_loop *LibevBackend_ev_loop(VALUE self) {
-  LibevBackend_t *backend;
-  GetLibevBackend(self, backend);
-  return backend->ev_loop;
-}
+void Backend_async_callback(EV_P_ ev_async *w, int revents) { }
 
-void LibevBackend_async_callback(EV_P_ ev_async *w, int revents) { }
-
-VALUE LibevBackend_wait_event(VALUE self, VALUE raise) {
-  LibevBackend_t *backend;
+VALUE Backend_wait_event(VALUE self, VALUE raise) {
+  Backend_t *backend;
   VALUE switchpoint_result = Qnil;
-  GetLibevBackend(self, backend);
+  GetBackend(self, backend);
 
   struct ev_async async;
 
-  ev_async_init(&async, LibevBackend_async_callback);
+  ev_async_init(&async, Backend_async_callback);
   ev_async_start(backend->ev_loop, &async);
-  switchpoint_result = libev_await(backend);
-  ev_async_stop(backend->ev_loop, &async);
 
-  if (RTEST(raise)) TEST_RESUME_EXCEPTION(switchpoint_result);
+  switchpoint_result = backend_await(backend);
+
+  ev_async_stop(backend->ev_loop, &async);
+  if (RTEST(raise)) RAISE_IF_EXCEPTION(switchpoint_result);
   RB_GC_GUARD(switchpoint_result);
   return switchpoint_result;
 }
 
-void Init_LibevBackend() {
+VALUE Backend_kind(VALUE self) {
+  return SYM_libev;
+}
+
+void Init_Backend() {
+  ev_set_allocator(xrealloc);
+
   rb_require("socket");
   cTCPSocket = rb_const_get(rb_cObject, rb_intern("TCPSocket"));
 
   VALUE cBackend = rb_define_class_under(mPolyphony, "Backend", rb_cData);
-  rb_define_alloc_func(cBackend, LibevBackend_allocate);
-
-  rb_define_method(cBackend, "initialize", LibevBackend_initialize, 0);
-  rb_define_method(cBackend, "finalize", LibevBackend_finalize, 0);
-  rb_define_method(cBackend, "post_fork", LibevBackend_post_fork, 0);
-  rb_define_method(cBackend, "pending_count", LibevBackend_pending_count, 0);
-
-  rb_define_method(cBackend, "ref", LibevBackend_ref, 0);
-  rb_define_method(cBackend, "unref", LibevBackend_unref, 0);
-
-  rb_define_method(cBackend, "poll", LibevBackend_poll, 3);
-  rb_define_method(cBackend, "break", LibevBackend_wakeup, 0);
-
-  rb_define_method(cBackend, "read", LibevBackend_read, 4);
-  rb_define_method(cBackend, "read_loop", LibevBackend_read_loop, 1);
-  rb_define_method(cBackend, "write", LibevBackend_write_m, -1);
-  rb_define_method(cBackend, "accept", LibevBackend_accept, 1);
-  rb_define_method(cBackend, "accept_loop", LibevBackend_accept_loop, 1);
-  rb_define_method(cBackend, "connect", LibevBackend_connect, 3);
-  rb_define_method(cBackend, "wait_io", LibevBackend_wait_io, 2);
-  rb_define_method(cBackend, "sleep", LibevBackend_sleep, 1);
-  rb_define_method(cBackend, "waitpid", LibevBackend_waitpid, 1);
-  rb_define_method(cBackend, "wait_event", LibevBackend_wait_event, 1);
+  rb_define_alloc_func(cBackend, Backend_allocate);
+
+  rb_define_method(cBackend, "initialize", Backend_initialize, 0);
+  rb_define_method(cBackend, "finalize", Backend_finalize, 0);
+  rb_define_method(cBackend, "post_fork", Backend_post_fork, 0);
+  rb_define_method(cBackend, "pending_count", Backend_pending_count, 0);
+
+  rb_define_method(cBackend, "ref", Backend_ref, 0);
+  rb_define_method(cBackend, "unref", Backend_unref, 0);
+
+  rb_define_method(cBackend, "poll", Backend_poll, 3);
+  rb_define_method(cBackend, "break", Backend_wakeup, 0);
+
+  rb_define_method(cBackend, "read", Backend_read, 4);
+  rb_define_method(cBackend, "read_loop", Backend_read_loop, 1);
+  rb_define_method(cBackend, "write", Backend_write_m, -1);
+  rb_define_method(cBackend, "accept", Backend_accept, 1);
+  rb_define_method(cBackend, "accept_loop", Backend_accept_loop, 1);
+  rb_define_method(cBackend, "connect", Backend_connect, 3);
+  rb_define_method(cBackend, "recv", Backend_recv, 3);
+  rb_define_method(cBackend, "recv_loop", Backend_read_loop, 1);
+  rb_define_method(cBackend, "send", Backend_write, 2);
+  rb_define_method(cBackend, "wait_io", Backend_wait_io, 2);
+  rb_define_method(cBackend, "sleep", Backend_sleep, 1);
+  rb_define_method(cBackend, "waitpid", Backend_waitpid, 1);
+  rb_define_method(cBackend, "wait_event", Backend_wait_event, 1);
+
+  rb_define_method(cBackend, "kind", Backend_kind, 0);
 
   ID_ivar_is_nonblocking = rb_intern("@is_nonblocking");
+  SYM_libev = ID2SYM(rb_intern("libev"));
 
-  __BACKEND__.pending_count   = LibevBackend_pending_count;
-  __BACKEND__.poll            = LibevBackend_poll;
-  __BACKEND__.ref             = LibevBackend_ref;
-  __BACKEND__.ref_count       = LibevBackend_ref_count;
-  __BACKEND__.reset_ref_count = LibevBackend_reset_ref_count;
-  __BACKEND__.unref           = LibevBackend_unref;
-  __BACKEND__.wait_event      = LibevBackend_wait_event;
-  __BACKEND__.wakeup          = LibevBackend_wakeup;
+  __BACKEND__.pending_count   = Backend_pending_count;
+  __BACKEND__.poll            = Backend_poll;
+  __BACKEND__.ref             = Backend_ref;
+  __BACKEND__.ref_count       = Backend_ref_count;
+  __BACKEND__.reset_ref_count = Backend_reset_ref_count;
+  __BACKEND__.unref           = Backend_unref;
+  __BACKEND__.wait_event      = Backend_wait_event;
+  __BACKEND__.wakeup          = Backend_wakeup;
 }
+
+#endif // POLYPHONY_BACKEND_LIBEV