bertrpc 0.4.1 → 0.4.2

data/History.txt

@@ -1,3 +1,7 @@
+= 0.4.2 / 2009-11-27
+  * Major changes
+    * Switch to using raw socket timeouts over buffered io (Linux only)
+
 = 0.4.1 / 2009-11-26
   * Major changes
     * Backport timeout option

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/bertrpc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bertrpc}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Preston-Werner"]
-  s.date = %q{2009-11-26}
+  s.date = %q{2009-11-28}
   s.email = %q{tom@mojombo.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -26,7 +26,6 @@ Gem::Specification.new do |s|
      "bertrpc.gemspec",
      "lib/bertrpc.rb",
      "lib/bertrpc/action.rb",
-     "lib/bertrpc/buffered_io.rb",
      "lib/bertrpc/encodes.rb",
      "lib/bertrpc/errors.rb",
      "lib/bertrpc/mod.rb",

data/lib/bertrpc/action.rb

@@ -44,7 +44,7 @@ module BERTRPC
       bert_response
     rescue Errno::ECONNREFUSED
       raise ConnectionError.new("Unable to connect to #{@svc.host}:#{@svc.port}")
-    rescue Timeout::Error
+    rescue Errno::EAGAIN
       raise ReadTimeoutError.new(@svc.host, @svc.port, @svc.timeout)
     end
 
@@ -57,9 +57,18 @@ module BERTRPC
     #   +port+ Integer port of the target TCP server
     #   +timeout+ Optional Integer (in seconds) of the read timeout
     def connect_to(host, port, timeout = nil)
-      io = BufferedIO.new(TCPSocket.new(host, port))
-      io.read_timeout = timeout
-      io
+      sock = TCPSocket.new(host, port)
+      sock.setsockopt Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1
+
+      if timeout
+        secs = Integer(timeout)
+        usecs = Integer((timeout - secs) * 1_000_000)
+        optval = [secs, usecs].pack("l_2")
+        sock.setsockopt Socket::SOL_SOCKET, Socket::SO_RCVTIMEO, optval
+        sock.setsockopt Socket::SOL_SOCKET, Socket::SO_SNDTIMEO, optval
+      end
+
+      sock
     end
   end
 end

data/lib/bertrpc.rb

@@ -8,4 +8,3 @@ require 'bertrpc/mod'
 require 'bertrpc/encodes'
 require 'bertrpc/action'
 require 'bertrpc/errors'
-require 'bertrpc/buffered_io'

data/test/action_test.rb

@@ -94,7 +94,7 @@ class ActionTest < Test::Unit::TestCase
         io = stub()
         io.expects(:write).with("\000\000\000\003")
         io.expects(:write).with("foo")
-        io.expects(:read).with(4).raises(Timeout::Error)
+        io.expects(:read).with(4).raises(Errno::EAGAIN)
         @call.expects(:connect_to).returns(io)
         begin
           @call.transaction("foo")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bertrpc
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-26 00:00:00 -08:00
+date: 2009-11-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,7 +52,6 @@ files:
 - bertrpc.gemspec
 - lib/bertrpc.rb
 - lib/bertrpc/action.rb
-- lib/bertrpc/buffered_io.rb
 - lib/bertrpc/encodes.rb
 - lib/bertrpc/errors.rb
 - lib/bertrpc/mod.rb

data/lib/bertrpc/buffered_io.rb

@@ -1,28 +0,0 @@
-module BERTRPC
-  # Taken with love from memcache-client.
-  #
-  # See http://is.gd/4CWRA for the code and
-  # http://is.gd/4CYde for the discussion.
-  class BufferedIO < Net::BufferedIO # :nodoc:
-    BUFSIZE = 1024 * 16
-
-    if RUBY_VERSION < '1.9.1'
-      def rbuf_fill
-        begin
-          @rbuf << @io.read_nonblock(BUFSIZE)
-        rescue Errno::EWOULDBLOCK
-          retry unless @read_timeout
-          if IO.select([@io], nil, nil, @read_timeout)
-            retry
-          else
-            raise Timeout::Error, 'IO timeout'
-          end
-        end
-      end
-    end
-
-    def setsockopt(*args)
-      @io.setsockopt(*args)
-    end
-  end
-end