polyphony 0.42 → 0.43.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e284cae2a5eb2332bc8671090412bbe0cf7d57dbc163d68ba387f4d9635a8adf
-  data.tar.gz: 58eba5a2607df83c7471b1a6b72cc350aa468e9a562e3d1e8f7451eaae12d068
+  metadata.gz: 9481b252526ebc3f8e0f5a0121eebb68492bc0c1502cfed447da7b0648e6095b
+  data.tar.gz: dfd2d5d0415833f14f9ebe2cc6336e87d0951ce86f07ebcdec0ad892f71fb74c
 SHA512:
-  metadata.gz: 10b7bcf9240ea8f7355c75d025bd6c5e1bd00c86e7985f71440091cc149c629279b16eaf1c863d85de29e278739926b499625c77238db8eb803aa235395771a4
-  data.tar.gz: 9001df441fdc058a3234bca05f6cca55d3a27edcf0b5b0d126a9c371d37bd0ffecc4d13d8f13c614d9b7182630f94d54481035f6d83fb044aebdf3238f83b03a
+  metadata.gz: 652633b1fc27623edb2e87b5657322ba4826ec176e8eb5131a43249e08340f793ba426743be343bfe0fce02fc60b73cb790afef816a4153585d68bdfeaa9c55d
+  data.tar.gz: 946abb7526324cae5f1d6b62e25c8410129b07ca75c82a6b7285d6269ed1911e161a6030a394ef29ba238a80da6f96787dd94fdbd5c05bd2a643379252ce80d0

data/CHANGELOG.md

@@ -1,3 +1,30 @@
+## 0.43.4 2020-07-09
+
+* Reimplement Kernel#trap
+* Dynamically allocate read buffer if length not given (#23)
+* Prevent CPU saturation on infinite sleep (#24)
+
+## 0.43.3 2020-07-08
+
+* Fix behaviour after call to `Process.daemon` (#8)
+* Replace core `Queue` class with `Polyphony::Queue` (#22)
+* Make `ResourcePool` reentrant (#1)
+* Accept `:with_exception` argument in `cancel_after` (#16)
+
+## 0.43.2 2020-07-07
+
+* Fix sending Redis commands with array arguments (#21)
+
+## 0.43.1 2020-06
+
+* Fix compiling C-extension on MacOS (#20)
+
+## 0.43 2020-07-05
+
+* Add IO#read_loop
+* Fix OpenSSL extension
+* More work on docs
+
 ## 0.42 2020-07-03
 
 * Improve documentation

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    polyphony (0.42)
+    polyphony (0.43.4)
 
 GEM
   remote: https://rubygems.org/
@@ -12,7 +12,7 @@ GEM
     ast (2.4.0)
     builder (3.2.4)
     colorator (1.1.0)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     docile (1.3.2)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)

data/README.md

@@ -1,6 +1,5 @@
 # Polyphony - Fine-Grained Concurrency for Ruby
 
-
 [![Gem Version](https://badge.fury.io/rb/polyphony.svg)](http://rubygems.org/gems/polyphony)
 [![Modulation Test](https://github.com/digital-fabric/polyphony/workflows/Tests/badge.svg)](https://github.com/digital-fabric/polyphony/actions?query=workflow%3ATests)
 [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/digital-fabric/polyphony/blob/master/LICENSE)

data/TODO.md

@@ -1,11 +1,10 @@
-## 0.42
+## 0.43 
 
 - Reimplement ResourcePool, Channel, Mutex using LibevQueue
 -- Add `Fiber#schedule_with_priority` method, aliased by `Fiber#wakeup`
 - Implement agent interface is virtual function table
 - Implement proxy agent for plugging in a user-provided agent class
 
-## 0.43 
 - Debugging
   - Eat your own dogfood: need a good tool to check what's going on when some
     test fails

data/docs/_config.yml

@@ -46,13 +46,13 @@ heading_anchors: true
 back_to_top: true
 back_to_top_text: "Back to top"
 
-footer_content: "Copyright &copy; 2018-2020 Sharon Rosner. Distributed by an <a href=\"https://github.com/digital-fabric/polyphony/tree/master/LICENSE.txt\">MIT license.</a>"
+footer_content: "Copyright &copy; 2020 Sharon Rosner. Distributed by an <a href=\"https://github.com/digital-fabric/polyphony/tree/master/LICENSE\">MIT license.</a>"
 
 # Footer "Edit this page on GitHub" link text
 gh_edit_link: true # show or hide edit this page link
 gh_edit_link_text: "Edit this page on GitHub"
 gh_edit_repository: "https://github.com/digital-fabric/polyphony" # the github URL for your repo
-gh_edit_branch: "master" # the branch that your docs is served from
+gh_edit_branch: "master/docs" # the branch that your docs is served from
 gh_edit_view_mode: "tree" # "tree" or "edit" if you want the user to jump into the editor immediately
 
 compress_html:

data/docs/_sass/custom/custom.scss

@@ -0,0 +1,10 @@
+
+h1.logo-title {
+  font-size: 42px !important;
+  font-weight: bold;
+}
+
+h2.logo-title {
+  margin-top: 0.25em;
+  margin-bottom: 1em;
+}

data/docs/getting-started/overview.md

@@ -279,7 +279,7 @@ def chat_user_handler(user_name, connection)
   while command = connection.gets
     case command
     when /^connect (.+)/
-      room&.send [:unsubscribe, message_subscriber]
+      room&.send [:subscribe, message_subscriber]
       room = CHAT_ROOMS[$1]
     when "disconnect"
       room&.send [:unsubscribe, message_subscriber]
@@ -416,28 +416,7 @@ request handler after all request headers have been received. This allows the
 application to better deal with slow client attacks, big file uploads, and also
 to minimize costly memory allocation and GC'ing.
 
-Preliminary benchmarks show the Polyphony web server to be about 3X as fast as
-Puma and 20X as fast as Unicorn. With SSL termination and using HTTP 2, the
-Polyphony web server is about 2X as fast as Falcon.
-
-### HTTP/1
-
-|Server|requests/sec|average latency|max latency|
-|------|-----------:|--------------:|----------:|
-|Puma|
-|Unicorn|
-|Agoo|
-|Polyphony|
-
-### HTTP/2 with SSL Termination
-
-|Server|requests/sec|average latency|max latency|
-|------|-----------:|--------------:|----------:|
-|Falcon|
-|Polyphony|
-
-(*Non-official benchmark with a basic "Hello world" Rack application. The usual
-caveats regarding benchmarks should be applied here.*)
+Benchmarks will be included here at a later time.
 
 ## Integrating Polyphony with other Gems
 
@@ -504,4 +483,4 @@ reach version 1.0. Here are some of the exciting directions we're working on.
 - Support for more core and stdlib APIs
 - More adapters for gems with C-extensions, such as `mysql`, `sqlite3` etc
 - Use `io_uring` agent as alternative to the libev agent 
-- More concurrency constructs for building highly concurrent applications
+- More concurrency constructs for building highly concurrent applications

data/docs/index.md

@@ -6,7 +6,11 @@ permalink: /
 next_title: Installing Polyphony
 ---
 
-# Polyphony - fine-grained concurrency for Ruby
+# Polyphony
+{:.text-center .logo-title}
+
+## Fine-grained concurrency for Ruby
+{:.text-center .logo-title}
 
 Polyphony is a library for building concurrent applications in Ruby. Polyphony
 implements a comprehensive

data/examples/adapters/concurrent-ruby.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony'
+require 'concurrent'
+
+puts "Hello, concurrent-ruby"
+
+# this program should not hang with concurrent-ruby 1.1.6 (see issue #22)

data/examples/adapters/redis_blpop.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony/adapters/redis'
+# require 'redis'
+
+redis = Redis.new(host: ENV['REDISHOST'] || 'localhost')
+
+redis.lpush("queue_key", "omgvalue")
+puts "len: #{redis.llen("queue_key")}"
+result = redis.blpop("queue_key")
+puts result.inspect

data/examples/core/xx-daemon.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony'
+
+Exception.__disable_sanitized_backtrace__ = true
+
+puts "pid: #{Process.pid}"
+
+Process.daemon(true, true)
+
+Polyphony::ThreadPool.process do
+  puts "Hello world from pid #{Process.pid}"
+end

data/examples/performance/mem-usage.rb

@@ -4,47 +4,53 @@ def mem_usage
   `ps -o rss #{$$}`.split.last.to_i
 end
 
-def calculate_fiber_memory_cost(count)
+def calculate_memory_cost(name, count, &block)
+  GC.enable
+  ObjectSpace.garbage_collect
+  sleep 0.5
   GC.disable
   rss0 = mem_usage
-  count.times { Fiber.new { sleep 1 } }
+  count0 = ObjectSpace.count_objects[:TOTAL] - ObjectSpace.count_objects[:FREE]
+  a = []
+  count.times { a << block.call }
   rss1 = mem_usage
-  GC.start
+  count1 = ObjectSpace.count_objects[:TOTAL] - ObjectSpace.count_objects[:FREE]
+  p [count0, count1]
+  # sleep 0.5
   cost = (rss1 - rss0).to_f / count
+  count_delta = (count1 - count0) / count
 
-  puts "fiber memory cost: #{cost}KB"
+  puts "#{name} rss cost: #{cost}KB     object count: #{count_delta}"
 end
 
-calculate_fiber_memory_cost(10000)
-
-def calculate_thread_memory_cost(count)
-  GC.disable
-  rss0 = mem_usage
-  count.times { Thread.new { sleep 1 } }
-  sleep 0.5
-  rss1 = mem_usage
-  sleep 0.5
-  GC.start
-  cost = (rss1 - rss0).to_f / count
+f = Fiber.new { |f| f.transfer }
+f.transfer Fiber.current
 
-  puts "thread memory cost: #{cost}KB"
+calculate_memory_cost('fiber', 10000) do
+  f = Fiber.new { |f| f.transfer :foo }
+  f.transfer Fiber.current
+  f
 end
 
-calculate_thread_memory_cost(500)
+t = Thread.new { sleep 1}
+t.kill
+t.join
+
+calculate_memory_cost('thread', 500) do
+  t = Thread.new { sleep 1 }
+  sleep 0.001
+  t
+end
+(Thread.list - [Thread.current]).each(&:kill).each(&:join)
 
 require 'bundler/setup'
 require 'polyphony'
 
-def calculate_extended_fiber_memory_cost(count)
-  GC.disable
-  rss0 = mem_usage
-  count.times { spin { :foo } }
-  snooze
-  rss1 = mem_usage
-  GC.start
-  cost = (rss1 - rss0).to_f / count
+f = spin { sleep 0.1 }
+f.await
 
-  puts "extended fiber memory cost: #{cost}KB"
+calculate_memory_cost('polyphony fiber', 10000) do
+  f = spin { :foo }
+  f.await
+  f
 end
-
-calculate_extended_fiber_memory_cost(10000)

data/examples/performance/thread-vs-fiber/polyphony_server_read_loop.rb

@@ -13,7 +13,7 @@ def handle_client(socket)
   parser.on_message_complete = proc do |env|
     reqs << Object.new # parser
   end
-  Thread.current.agent.read_loop(socket) do |data|
+  socket.read_loop do |data|
     parser << data
     while (req = reqs.shift)
       handle_request(socket, req)

data/ext/polyphony/libev_agent.c

@@ -1,6 +1,8 @@
+#include <netdb.h>
+#include <sys/socket.h>
+
 #include "polyphony.h"
 #include "../libev/ev.h"
-#include <sys/socket.h>
 
 VALUE cLibevAgent = Qnil;
 VALUE cTCPSocket;
@@ -128,7 +130,7 @@ VALUE LibevAgent_poll(VALUE self, VALUE nowait, VALUE current_fiber, VALUE queue
   GetLibevAgent(self, agent);
 
   if (is_nowait) {
-    int runnable_count = RARRAY_LEN(queue);
+    long runnable_count = RARRAY_LEN(queue);
     agent->run_no_wait_count++;
     if (agent->run_no_wait_count < runnable_count || agent->run_no_wait_count < 10)
       return self;
@@ -234,7 +236,7 @@ struct libev_io {
   VALUE fiber;
 };
 
-static void LibevAgent_io_callback(EV_P_ ev_io *w, int revents)
+void LibevAgent_io_callback(EV_P_ ev_io *w, int revents)
 {
   struct libev_io *watcher = (struct libev_io *)w;
   Fiber_make_runnable(watcher->fiber, Qnil);
@@ -255,11 +257,32 @@ VALUE libev_agent_await(VALUE self) {
   return libev_await(agent);
 }
 
+VALUE libev_io_wait(struct LibevAgent_t *agent, struct libev_io *watcher, rb_io_t *fptr, int flags) {
+  VALUE switchpoint_result;
+
+  if (watcher->fiber == Qnil) {
+    watcher->fiber = rb_fiber_current();
+    ev_io_init(&watcher->io, LibevAgent_io_callback, fptr->fd, flags);
+  }
+  ev_io_start(agent->ev_loop, &watcher->io);
+  switchpoint_result = libev_await(agent);
+  ev_io_stop(agent->ev_loop, &watcher->io);
+
+  RB_GC_GUARD(switchpoint_result);
+  return switchpoint_result;  
+}
+
+VALUE libev_snooze() {
+  Fiber_make_runnable(rb_fiber_current(), Qnil);
+  return Thread_switch_fiber(rb_thread_current());
+}
+
 VALUE LibevAgent_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_eof) {
   struct LibevAgent_t *agent;
   struct libev_io watcher;
   rb_io_t *fptr;
-  int len = NUM2INT(length);
+  long dynamic_len = length == Qnil;
+  long len = dynamic_len ? 4096 : NUM2INT(length);
   int shrinkable = io_setstrbuf(&str, len);
   char *buf = RSTRING_PTR(str);
   long total = 0;
@@ -276,44 +299,35 @@ VALUE LibevAgent_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_eo
   
   OBJ_TAINT(str);
 
-  while (len > 0) {
-    int n = read(fptr->fd, buf, len);
-    if (n == 0)
-      break;
-    if (n > 0) {
-      total = total + n;
-      buf += n;
-      len -= n;
-      if (!read_to_eof || (len == 0)) break;
-    }
-    else {
+  while (1) {
+    ssize_t n = read(fptr->fd, buf, len - total);
+    if (n < 0) {
       int e = errno;
-      if ((e == EWOULDBLOCK || e == EAGAIN)) {
-        if (watcher.fiber == Qnil) {
-          watcher.fiber = rb_fiber_current();
-          ev_io_init(&watcher.io, LibevAgent_io_callback, fptr->fd, EV_READ);
-        }
-        ev_io_start(agent->ev_loop, &watcher.io);
-        switchpoint_result = libev_await(agent);
-        ev_io_stop(agent->ev_loop, &watcher.io);
-        if (TEST_EXCEPTION(switchpoint_result)) {
-          goto error;
-        }
-      }
-      else
-        rb_syserr_fail(e, strerror(e));
-        // rb_syserr_fail_path(e, fptr->pathv);
+      if (e != EWOULDBLOCK && e != EAGAIN) rb_syserr_fail(e, strerror(e));
+      
+      switchpoint_result = libev_io_wait(agent, &watcher, fptr, EV_READ);
+      if (TEST_EXCEPTION(switchpoint_result)) goto error;
     }
-  }
+    else {
+      switchpoint_result = libev_snooze();
+      if (TEST_EXCEPTION(switchpoint_result)) goto error;
 
-  if (watcher.fiber == Qnil) {
-    Fiber_make_runnable(rb_fiber_current(), Qnil);
-    switchpoint_result = Thread_switch_fiber(rb_thread_current());
-    if (TEST_EXCEPTION(switchpoint_result)) {
-      goto error;
+      if (n == 0) break; // EOF
+      total = total + n;
+      if (!read_to_eof) break;
+
+      if (total == len) {
+        if (!dynamic_len) break;
+      
+        rb_str_resize(str, total);
+        rb_str_modify_expand(str, len);
+        buf = RSTRING_PTR(str) + total;
+        shrinkable = 0;
+        len += len;
+      }
+      else buf += n;
     }
   }
-
   if (total == 0) return Qnil;
 
   io_set_read_length(str, total, shrinkable);
@@ -347,8 +361,8 @@ VALUE LibevAgent_read_loop(VALUE self, VALUE io) {
   struct libev_io watcher;
   rb_io_t *fptr;
   VALUE str;
-  int total;
-  int len = 8192;
+  long total;
+  long len = 8192;
   int shrinkable;
   char *buf;
   VALUE switchpoint_result = Qnil;
@@ -366,10 +380,20 @@ VALUE LibevAgent_read_loop(VALUE self, VALUE io) {
   OBJ_TAINT(str);
 
   while (1) {
-    int n = read(fptr->fd, buf, len);
-    if (n == 0)
-      break;
-    if (n > 0) {
+    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(agent, &watcher, fptr, EV_READ);
+      if (TEST_EXCEPTION(switchpoint_result)) goto error;
+    }
+    else {
+      switchpoint_result = libev_snooze();
+      if (TEST_EXCEPTION(switchpoint_result)) goto error;
+
+      if (n == 0) break; // EOF      
+
       total = n;
       YIELD_STR();
       Fiber_make_runnable(rb_fiber_current(), Qnil);
@@ -378,24 +402,6 @@ VALUE LibevAgent_read_loop(VALUE self, VALUE io) {
         goto error;
       }
     }
-    else {
-      int e = errno;
-      if ((e == EWOULDBLOCK || e == EAGAIN)) {
-        if (watcher.fiber == Qnil) {
-          watcher.fiber = rb_fiber_current();
-          ev_io_init(&watcher.io, LibevAgent_io_callback, fptr->fd, EV_READ);
-        }
-        ev_io_start(agent->ev_loop, &watcher.io);
-        switchpoint_result = libev_await(agent);
-        ev_io_stop(agent->ev_loop, &watcher.io);
-        if (TEST_EXCEPTION(switchpoint_result)) {
-          goto error;
-        }
-      }
-      else
-        rb_syserr_fail(e, strerror(e));
-        // rb_syserr_fail_path(e, fptr->pathv);
-    }
   }
 
   RB_GC_GUARD(str);
@@ -414,8 +420,8 @@ VALUE LibevAgent_write(VALUE self, VALUE io, VALUE str) {
   VALUE switchpoint_result = Qnil;
 
   char *buf = StringValuePtr(str);
-  int len = RSTRING_LEN(str);
-  int left = len;
+  long len = RSTRING_LEN(str);
+  long left = len;
 
   VALUE underlying_io = rb_iv_get(io, "@io");
   if (underlying_io != Qnil) io = underlying_io;
@@ -425,37 +431,20 @@ VALUE LibevAgent_write(VALUE self, VALUE io, VALUE str) {
   watcher.fiber = Qnil;
 
   while (left > 0) {
-    int result = write(fptr->fd, buf, left);
-    if (result < 0) {
+    ssize_t n = write(fptr->fd, buf, left);
+    if (n < 0) {
       int e = errno;
-      if (e == EAGAIN) {
-        if (watcher.fiber == Qnil) {
-          watcher.fiber = rb_fiber_current();
-          ev_io_init(&watcher.io, LibevAgent_io_callback, fptr->fd, EV_WRITE);
-        }
-        ev_io_start(agent->ev_loop, &watcher.io);
-        switchpoint_result = libev_await(agent);
-        ev_io_stop(agent->ev_loop, &watcher.io);
-        if (TEST_EXCEPTION(switchpoint_result))
-          goto error;
-      }
-      else {
-        rb_syserr_fail(e, strerror(e));
-        // rb_syserr_fail_path(e, fptr->pathv);
-        
-      }
+      if ((e != EWOULDBLOCK && e != EAGAIN)) rb_syserr_fail(e, strerror(e));
+
+      switchpoint_result = libev_io_wait(agent, &watcher, fptr, EV_WRITE);
+      if (TEST_EXCEPTION(switchpoint_result)) goto error;
     }
     else {
-      buf += result;
-      left -= result;
-    }
-  }
+      switchpoint_result = libev_snooze();
+      if (TEST_EXCEPTION(switchpoint_result)) goto error;
 
-  if (watcher.fiber == Qnil) {
-    Fiber_make_runnable(rb_fiber_current(), Qnil);
-    switchpoint_result = Thread_switch_fiber(rb_thread_current());
-    if (TEST_EXCEPTION(switchpoint_result)) {
-      goto error;
+      buf += n;
+      left -= n;
     }
   }
 
@@ -488,50 +477,39 @@ VALUE LibevAgent_accept(VALUE self, VALUE sock) {
     fd = accept(fptr->fd, &addr, &len);
     if (fd < 0) {
       int e = errno;
-      if (e == EWOULDBLOCK || e == EAGAIN) {
-        if (watcher.fiber == Qnil) {
-          watcher.fiber = rb_fiber_current();
-          ev_io_init(&watcher.io, LibevAgent_io_callback, fptr->fd, EV_READ);
-        }
-        ev_io_start(agent->ev_loop, &watcher.io);
-        switchpoint_result = libev_await(agent);
-        ev_io_stop(agent->ev_loop, &watcher.io);
-
-        TEST_RESUME_EXCEPTION(switchpoint_result);
-        RB_GC_GUARD(watcher.fiber);
-        RB_GC_GUARD(switchpoint_result);
-      }
-      else
-        rb_syserr_fail(e, strerror(e));
-        // rb_syserr_fail_path(e, fptr->pathv);
+      if ((e != EWOULDBLOCK && e != EAGAIN)) rb_syserr_fail(e, strerror(e));
+
+      switchpoint_result = libev_io_wait(agent, &watcher, fptr, EV_READ);
+      if (TEST_EXCEPTION(switchpoint_result)) goto error;
     }
     else {
-      VALUE connection = rb_obj_alloc(cTCPSocket);
+      VALUE socket;
       rb_io_t *fp;
-      MakeOpenFile(connection, fp);
+      switchpoint_result = libev_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);
       fp->fd = fd;
       fp->mode = FMODE_READWRITE | FMODE_DUPLEX;
-      rb_io_ascii8bit_binmode(connection);
+      rb_io_ascii8bit_binmode(socket);
       rb_io_set_nonblock(fp);
       rb_io_synchronized(fp);
       
       // if (rsock_do_not_reverse_lookup) {
 	    //   fp->mode |= FMODE_NOREVLOOKUP;
       // }
-
-      if (watcher.fiber == Qnil) {
-        Fiber_make_runnable(rb_fiber_current(), Qnil);
-        switchpoint_result = Thread_switch_fiber(rb_thread_current());
-        if (TEST_EXCEPTION(switchpoint_result)) {
-          return rb_funcall(rb_mKernel, ID_raise, 1, switchpoint_result);
-        }
-      }
-
-      return connection;
+      return socket;
     }
   }
+  RB_GC_GUARD(switchpoint_result);
   return Qnil;
+error:
+  return rb_funcall(rb_mKernel, ID_raise, 1, switchpoint_result);
 }
 
 VALUE LibevAgent_accept_loop(VALUE self, VALUE sock) {
@@ -542,7 +520,7 @@ VALUE LibevAgent_accept_loop(VALUE self, VALUE sock) {
   struct sockaddr addr;
   socklen_t len = (socklen_t)sizeof addr;
   VALUE switchpoint_result = Qnil;
-  VALUE connection = Qnil;
+  VALUE socket = Qnil;
   VALUE underlying_sock = rb_iv_get(sock, "@io");
   if (underlying_sock != Qnil) sock = underlying_sock;
 
@@ -555,46 +533,82 @@ VALUE LibevAgent_accept_loop(VALUE self, VALUE sock) {
     fd = accept(fptr->fd, &addr, &len);
     if (fd < 0) {
       int e = errno;
-      if (e == EWOULDBLOCK || e == EAGAIN) {
-        if (watcher.fiber == Qnil) {
-          watcher.fiber = rb_fiber_current();
-          ev_io_init(&watcher.io, LibevAgent_io_callback, fptr->fd, EV_READ);
-        }
-        ev_io_start(agent->ev_loop, &watcher.io);
-        switchpoint_result = libev_await(agent);
-        ev_io_stop(agent->ev_loop, &watcher.io);
-
-        TEST_RESUME_EXCEPTION(switchpoint_result);
-      }
-      else
-        rb_syserr_fail(e, strerror(e));
-        // rb_syserr_fail_path(e, fptr->pathv);
+      if ((e != EWOULDBLOCK && e != EAGAIN)) rb_syserr_fail(e, strerror(e));
+
+      switchpoint_result = libev_io_wait(agent, &watcher, fptr, EV_READ);
+      if (TEST_EXCEPTION(switchpoint_result)) goto error;
     }
     else {
       rb_io_t *fp;
-      connection = rb_obj_alloc(cTCPSocket);
-      MakeOpenFile(connection, fp);
+      switchpoint_result = libev_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);
       fp->fd = fd;
       fp->mode = FMODE_READWRITE | FMODE_DUPLEX;
-      rb_io_ascii8bit_binmode(connection);
+      rb_io_ascii8bit_binmode(socket);
       rb_io_set_nonblock(fp);
       rb_io_synchronized(fp);
 
-      rb_yield(connection);
-      connection = Qnil;
-      
-      Fiber_make_runnable(rb_fiber_current(), Qnil);
-      switchpoint_result = Thread_switch_fiber(rb_thread_current());
-      TEST_RESUME_EXCEPTION(switchpoint_result);
+      rb_yield(socket);
+      socket = Qnil;
     }
   }
 
-  RB_GC_GUARD(connection);
+  RB_GC_GUARD(socket);
   RB_GC_GUARD(watcher.fiber);
   RB_GC_GUARD(switchpoint_result);
+  return Qnil;
+error:
+  return rb_funcall(rb_mKernel, ID_raise, 1, switchpoint_result);
 }
 
+// VALUE LibevAgent_connect(VALUE self, VALUE sock, VALUE host, VALUE port) {
+//   struct LibevAgent_t *agent;
+//   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");
+//   if (underlying_sock != Qnil) sock = underlying_sock;
+
+//   GetLibevAgent(self, agent);
+//   GetOpenFile(sock, fptr);
+//   rb_io_set_nonblock(fptr);
+//   watcher.fiber = Qnil;
+
+//   addr.sin_family = AF_INET; 
+//   addr.sin_addr.s_addr = inet_addr(host_buf);
+//   addr.sin_port = htons(NUM2INT(port));   
+
+//   while (1) {
+//     int result = connect(fptr->fd, &addr, sizeof(addr));
+//     if (result < 0) {
+//       int e = errno;
+//       if ((e != EWOULDBLOCK && e != EAGAIN)) rb_syserr_fail(e, strerror(e));
+
+//       switchpoint_result = libev_io_wait(agent, &watcher, fptr, EV_WRITE);
+//       if (TEST_EXCEPTION(switchpoint_result)) goto error;
+//     }
+//     else {
+//       switchpoint_result = libev_snooze();
+//       if (TEST_EXCEPTION(switchpoint_result)) goto error;
+
+//       return sock;
+//     }
+//   }
+//   RB_GC_GUARD(switchpoint_result);
+//   return Qnil;
+// error:
+//   return rb_funcall(rb_mKernel, ID_raise, 1, switchpoint_result);
+// }
+
 VALUE LibevAgent_wait_io(VALUE self, VALUE io, VALUE write) {
   struct LibevAgent_t *agent;
   struct libev_io watcher;
@@ -624,7 +638,7 @@ struct libev_timer {
   VALUE fiber;
 };
 
-static void LibevAgent_timer_callback(EV_P_ ev_timer *w, int revents)
+void LibevAgent_timer_callback(EV_P_ ev_timer *w, int revents)
 {
   struct libev_timer *watcher = (struct libev_timer *)w;
   Fiber_make_runnable(watcher->fiber, Qnil);
@@ -654,7 +668,7 @@ struct libev_child {
   VALUE fiber;
 };
 
-static void LibevAgent_child_callback(EV_P_ ev_child *w, int revents)
+void LibevAgent_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?
@@ -712,6 +726,7 @@ void Init_LibevAgent() {
   rb_define_method(cLibevAgent, "write", LibevAgent_write, 2);
   rb_define_method(cLibevAgent, "accept", LibevAgent_accept, 1);
   rb_define_method(cLibevAgent, "accept_loop", LibevAgent_accept_loop, 1);
+  // rb_define_method(cLibevAgent, "connect", LibevAgent_accept, 3);
   rb_define_method(cLibevAgent, "wait_io", LibevAgent_wait_io, 2);
   rb_define_method(cLibevAgent, "sleep", LibevAgent_sleep, 1);
   rb_define_method(cLibevAgent, "waitpid", LibevAgent_waitpid, 1);