zerg_support 0.1.4 → 0.1.5

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.1.5. A second take on the SocketFactory issues.
+
 v0.1.4. SocketFactory issues: no lingering, proper closing.
 
 v0.1.3. Anti-zombie protection in spawn.

data/lib/zerg_support/socket_factory.rb

@@ -101,7 +101,6 @@ module SocketFactory
     else
       # No lingering sockets.
       socket.setsockopt Socket::SOL_SOCKET, Socket::SO_LINGER, [1, 0].pack('ii')
-      sugar_socket_close socket
     end
   end
 
@@ -114,6 +113,7 @@ module SocketFactory
       sock, addr = super
       Zerg::Support::SocketFactory.set_options sock,
                                                @zerg_support_factory_options
+      Zerg::Support::SocketFactory.sugar_socket_close sock
       return sock, addr
     end
   end
@@ -126,13 +126,16 @@ module SocketFactory
     end
   end
 
-  # Sugar-coat the socket's close() call with the proper way to close a socket.
+  # Sugar-coat the socket's close() call with a better way to close a socket.
   def self.sugar_socket_close(socket)
     def socket.close
-      shutdown rescue nil
-      recv 1 rescue nil
+      begin
+        shutdown Socket::SHUT_WR
+        loop { break if recv(65536).empty? }
+      rescue SystemCallError
+      end
       super
-    end    
+    end
   end
   
   # Binds a socket to an address based on the options.
@@ -181,7 +184,10 @@ module SocketFactory
     addr_infos.each do |addr_info|
       socket = new_outbound_socket_with_addr_info addr_info
       set_options socket, options      
-      return socket if connect_with_addr_info socket, addr_info
+      if connect_with_addr_info socket, addr_info
+        sugar_socket_close socket
+        return socket
+      end
       socket.close rescue nil
     end
     nil

data/lib/zerg_support/sockets/protocol_adapter.rb

@@ -24,8 +24,13 @@ module ProtocolAdapter
       define_method :"recv_#{object_name}" do
         @zerg_protocol_adapter_state ||= state_class.new self
         while @zerg_protocol_adapter_state.recv_object_buffer.empty?
-          data = recv 65536
-          return nil if data.length == 0  # Other side closed socket.
+          begin
+            data = recv 65536
+          rescue SystemCallError  # The other side closed the socket forcibly.
+            break
+          end
+          break if data.empty?  # The other side closed the socket.
+
           @zerg_protocol_adapter_state.received_bytes data
         end
         @zerg_protocol_adapter_state.recv_object_buffer.shift

data/test/test_socket_factory.rb

@@ -55,7 +55,7 @@ class SocketFactoryTest < Test::Unit::TestCase
   
   def _test_connection(server_options, client_options = nil)
     client_options ||= server_options
-    test_port = 31996
+    test_port = 31993
     
     cli_gold = { :request_type => 1, :request_name => "moo",
                  :blob => 'abc' * 43000 }
@@ -65,7 +65,7 @@ class SocketFactoryTest < Test::Unit::TestCase
     
     # Server thread.
     server = SF.socket({:in_addr => ":#{test_port}"}.merge server_options)
-    Thread.new do
+    server_thread = Thread.new do
       server.listen
       serv_client, client_addrinfo = server.accept
       serv_client.extend OPAdapter
@@ -81,6 +81,7 @@ class SocketFactoryTest < Test::Unit::TestCase
     client.send_object cli_gold
     srv_hash = client.recv_object
     client.close
+    server_thread.join
     server.close
     
     # Checks
@@ -89,8 +90,9 @@ class SocketFactoryTest < Test::Unit::TestCase
   end
   
   def test_connection  
-    _test_connection({:no_delay => true})
     _test_connection({:reuse_addr => true})
+    Kernel.sleep 1.1  # Wait for the lingering socket to flush.
+    _test_connection({:reuse_addr => true, :no_delay => true})
     
     # TODO(costan): fix UDP at some point
   end

data/zerg_support.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zerg_support}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zerg_support
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Victor Costan