From a5ff497e57bc6e8793c38bdd94ea9f1cfefd17fd Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Sun, 26 Dec 2010 23:54:49 +0000
Subject: revactor: split out tee_socket and use autoload

Some applications never need TeeSocket, and we don't have
to worry about thread-safety with Revactor.
---
 lib/rainbows/revactor.rb | 44 +-------------------------------------------
 1 file changed, 1 insertion(+), 43 deletions(-)

(limited to 'lib/rainbows/revactor.rb')

diff --git a/lib/rainbows/revactor.rb b/lib/rainbows/revactor.rb
index 1e4d3b2..d996243 100644
--- a/lib/rainbows/revactor.rb
+++ b/lib/rainbows/revactor.rb
@@ -24,6 +24,7 @@ module Rainbows::Revactor
   RD_ARGS = {}
 
   autoload :Proxy, 'rainbows/revactor/proxy'
+  autoload :TeeSocket, 'rainbows/revactor/tee_socket'
 
   include Rainbows::Base
   LOCALHOST = Kgio::LOCALHOST
@@ -146,48 +147,5 @@ module Rainbows::Revactor
       end
     end
   end
-
-  # Revactor Sockets do not implement readpartial, so we emulate just
-  # enough to avoid mucking with TeeInput internals.  Fortunately
-  # this code is not heavily used so we can usually avoid the overhead
-  # of adding a userspace buffer.
-  class TeeSocket
-    def initialize(socket)
-      # IO::Buffer is used internally by Rev which Revactor is based on
-      # so we'll always have it available
-      @socket, @rbuf = socket, IO::Buffer.new
-    end
-
-    def leftover
-      @rbuf.read
-    end
-
-    # Revactor socket reads always return an unspecified amount,
-    # sometimes too much
-    def kgio_read(length, dst = "")
-      return dst.replace("") if length == 0
-
-      # always check and return from the userspace buffer first
-      @rbuf.size > 0 and return dst.replace(@rbuf.read(length))
-
-      # read off the socket since there was nothing in rbuf
-      tmp = @socket.read
-
-      # we didn't read too much, good, just return it straight back
-      # to avoid needlessly wasting memory bandwidth
-      tmp.size <= length and return dst.replace(tmp)
-
-      # ugh, read returned too much
-      @rbuf << tmp[length, tmp.size]
-      dst.replace(tmp[0, length])
-      rescue EOFError
-    end
-
-    # just proxy any remaining methods TeeInput may use
-    def close
-      @socket.close
-    end
-  end
-
   # :startdoc:
 end
-- 
cgit v1.2.3-24-ge0c7