From 52ad3f270e758e5bfdfe965cbecbd20d5048062f Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Wed, 16 Dec 2009 02:16:23 -0800
Subject: fiber/io: split out wait_readable and wait_writable methods

This makes them easier to override in subclasses.
---
 lib/rainbows/fiber/io.rb | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/lib/rainbows/fiber/io.rb b/lib/rainbows/fiber/io.rb
index 5c51cb9..339ac0a 100644
--- a/lib/rainbows/fiber/io.rb
+++ b/lib/rainbows/fiber/io.rb
@@ -22,14 +22,24 @@ module Rainbows
         to_io.close
       end
 
+      def wait_readable
+        RD[self] = false
+        ::Fiber.yield
+        RD.delete(self)
+      end
+
+      def wait_writable
+        WR[self] = false
+        ::Fiber.yield
+        WR.delete(self)
+      end
+
       def write(buf)
         begin
           (w = to_io.write_nonblock(buf)) == buf.size and return
           buf = buf[w..-1]
         rescue Errno::EAGAIN
-          WR[self] = false
-          ::Fiber.yield
-          WR.delete(self)
+          wait_writable
           retry
         end while true
       end
@@ -41,10 +51,8 @@ module Rainbows
           to_io.read_nonblock(16384)
         rescue Errno::EAGAIN
           return if expire && expire < Time.now
-          RD[self] = false
           expire ||= Time.now + G.kato
-          ::Fiber.yield
-          RD.delete(self)
+          wait_readable
           retry
         end
       end
@@ -53,9 +61,7 @@ module Rainbows
         begin
           to_io.read_nonblock(length, buf)
         rescue Errno::EAGAIN
-          RD[self] = false
-          ::Fiber.yield
-          RD.delete(self)
+          wait_readable
           retry
         end
       end
-- 
cgit v1.2.3-24-ge0c7