kosmonaut 0.2.3 → 0.2.4

data/ChangeLog

@@ -1,3 +1,7 @@
+2012-01-20  Krzysztof Kowalik  <chris@nu7hat.ch>
+
+	* lib/kosmonaut/*.rb: optimized sockets thanks to using raw system timeouts
+
 2012-01-20  Krzysztof Kowalik  <chris@nu7hat.ch>
 
 	* test/test_kosmonaut_worker.rb: shortened test time

data/lib/kosmonaut/client.rb

@@ -1,16 +1,10 @@
 require 'json'
-require 'uri'
-require 'socket'
-require 'securerandom'
-require 'timeout'
 require 'thread'
 
 module Kosmonaut
   class Client < Socket
-    include Kosmonaut
-
     # Maximum number of seconds to wait for the request to being processed.
-    REQUEST_TIMEOUT = 5
+    REQUEST_TIMEOUT = 5.0
 
     # Public: The Client constructor. Pre-configures the client instance. See
     # also the Kosmonaut::Socket#initialize for the details.
@@ -73,21 +67,19 @@ module Kosmonaut
     def perform_request(payload)
       @mtx.synchronize {
         response = []
-        Timeout.timeout(REQUEST_TIMEOUT) {
-          s = connect
-          packet = pack(payload)
-          log("Client/REQ : #{packet.inspect}")
-          s.write(packet)
-          response = recv(s)
-          s.close
-        }
+        s = connect(REQUEST_TIMEOUT)
+        packet = pack(payload)
+        Kosmonaut.log("Client/REQ : #{packet.inspect}")
+        s.write(packet)
+        response = recv(s)
+        s.close
         parse_response(response)
       }
     end
 
     def parse_response(response)
       cmd = response[0].to_s
-      log("Client/RES : #{response.join("\n").inspect}")
+      Kosmonaut.log("Client/RES : #{response.join("\n").inspect}")
       case cmd
       when "OK"
         return 0

data/lib/kosmonaut/socket.rb

@@ -1,21 +1,38 @@
+require 'uri'
+require 'socket'
+require 'securerandom'
+
 module Kosmonaut
   class Socket
     attr_reader :uri
 
     def initialize(url)
       @uri = URI.parse(url)
+      @addr = ::Socket.getaddrinfo(@uri.host, nil)
+    end
+
+    def connect(timeout)
+      secs   = timeout.to_i
+      usecs  = ((timeout - secs) * 1_000_000).to_i
+      optval = [secs, usecs].pack("l_2")
+      
+      s = ::Socket.new(::Socket.const_get(@addr[0][0]), ::Socket::SOCK_STREAM, 0)
+      s.setsockopt(::Socket::IPPROTO_TCP, ::Socket::TCP_NODELAY, 1)
+      s.setsockopt(::Socket::SOL_SOCKET, ::Socket::SO_RCVTIMEO, optval)
+      s.setsockopt(::Socket::SOL_SOCKET, ::Socket::SO_SNDTIMEO, optval)
+      s.connect(::Socket.pack_sockaddr_in(@uri.port, @addr[0][3]))
+      
       generate_identity
+      return s
     end
 
     protected
 
-    def connect
-      TCPSocket.open(@uri.host, @uri.port)
-    end
-
-    def pack(payload=[])
-      payload.unshift("")
-      payload.unshift(@identity)
+    def pack(payload=[], with_identity=true)
+      if with_identity
+        payload.unshift("")
+        payload.unshift(@identity) 
+      end
       payload.join("\n") + "\n\r\n\r\n"
     end
 
@@ -34,7 +51,7 @@ module Kosmonaut
       end
       data
     end
-    
+
     private
 
     def generate_identity

data/lib/kosmonaut/version.rb

@@ -2,7 +2,7 @@ module Kosmonaut
   module Version
     MAJOR = 0
     MINOR = 2
-    PATCH = 3
+    PATCH = 4
 
     def self.to_s
       [MAJOR, MINOR, PATCH].join('.')

data/lib/kosmonaut/worker.rb

@@ -3,10 +3,8 @@ require 'thread'
 
 module Kosmonaut
   class Worker < Socket
-    include Kosmonaut
-
     RECONNECT_DELAY = 1000 # in milliseconds
-    HEARTBEAT_INTERVAL = 1000 # in milliseconds
+    HEARTBEAT_INTERVAL = 500 # in milliseconds
 
     def initialize(url)
       super(url)
@@ -24,20 +22,19 @@ module Kosmonaut
       while true
         begin
           if !alive?
-            send(@sock, ["QT"]) if @sock
+            send(@sock, ["QT"])
             disconnect
             break
           end
           unless @sock
             raise Errno::ECONNREFUSED
           end
-          msg, cmd = nil, nil
-          Timeout.timeout(((@heartbeat_ivl * 2).to_f / 1000.0).to_i + 1) {
-            msg = recv(@sock)
-            raise Errno::ECONNRESET if @sock.eof? || msg.empty?
-            log("Worker/RECV : #{msg.join("\n").inspect}")
-            cmd = msg.shift
-          }
+
+          msg = recv(@sock)
+          raise Errno::ECONNRESET if @sock.eof? || msg.empty?
+          Kosmonaut.log("Worker/RECV : #{msg.join("\n").inspect}")
+          cmd = msg.shift
+
           case cmd
           when "HB"
             # nothing to do...
@@ -49,11 +46,12 @@ module Kosmonaut
           when "ER"
             error_handler(msg.size < 1 ? 597 : msg[0])
           end
-        rescue Timeout::Error, Errno::ECONNRESET, Errno::ECONNREFUSED => err
-          log("Worker/RECONNECT: " + err.to_s)
+        rescue Errno::EAGAIN, Errno::ECONNRESET, Errno::ECONNREFUSED, IOError => err
+          Kosmonaut.log("Worker/RECONNECT: " + err.to_s)
           sleep(@reconnect_delay.to_f / 1000.0)
           reconnect
         end
+        # Send heartbeat if it's time.
         if Time.now.to_f > @heartbeat_at && @sock
           send(@sock, ["HB"])
           @heartbeat_at = Time.now.to_f + (@heartbeat_ivl.to_f / 1000.0)
@@ -75,24 +73,23 @@ module Kosmonaut
 
     private
 
-    def send(s, payload)
-      packet = pack(payload.dup)
-      @sock.write(packet)
-      log("Worker/SENT : #{(payload.join("\n") + "\n").inspect}")
+    def send(s, payload, with_identity=false)
+      return unless s
+      packet = pack(payload, with_identity)
+      s.write(packet)
+      Kosmonaut.log("Worker/SENT : #{packet.inspect}")
+    rescue Errno::EPIPE
     end
 
     def disconnect
-      if @sock
-        @sock.close
-        @sock = nil
-      end
+      @sock.close if @sock 
+    rescue IOError
     end
-
+      
     def reconnect
-      disconnect
-      @sock = connect
-      send(@sock, ["RD"])
-      @heartbeat_at = Time.now.to_f + (@heartbeat_ivl.to_f / 1000.0)      
+      @sock = connect(((@heartbeat_ivl * 2).to_f / 1000.0).to_i + 1)
+      send(@sock, ["RD"], true)
+      @heartbeat_at = Time.now.to_f + (@heartbeat_ivl.to_f / 1000.0)
     rescue Errno::ECONNREFUSED
     end
 

metadata

@@ -2,7 +2,7 @@
 name: kosmonaut
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Krzysztof Kowalik
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-20 00:00:00 Z
+date: 2012-01-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -44,12 +44,12 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/kosmonaut/client.rb
-- lib/kosmonaut/errors.rb
+- lib/kosmonaut.rb
 - lib/kosmonaut/socket.rb
-- lib/kosmonaut/version.rb
 - lib/kosmonaut/worker.rb
-- lib/kosmonaut.rb
+- lib/kosmonaut/version.rb
+- lib/kosmonaut/errors.rb
+- lib/kosmonaut/client.rb
 - test/helper.rb
 - test/test_kosmonaut_client.rb
 - test/test_kosmonaut_worker.rb
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Ruby client for the WebRocket backend