zerg_support 0.1.3 → 0.1.4

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.1.4. SocketFactory issues: no lingering, proper closing.
+
 v0.1.3. Anti-zombie protection in spawn.
 
 v0.1.2. Removed Ruby warnings (change accidentally left out of v0.1.1).

data/Rakefile

@@ -3,7 +3,7 @@ gem 'echoe'
 require 'echoe'
 
 Echoe.new('zerg_support') do |p|
-  p.project = 'zerglings' # rubyforge project
+  p.project = 'zerglings'  # rubyforge project
   
   p.author = 'Victor Costan'
   p.email = 'victor@zergling.net'

data/lib/zerg_support/protocols/frame_protocol.rb

@@ -10,7 +10,7 @@ module FrameProtocol
 
     i = 0
     loop do
-      while @frame_protocol_buffer.nil? and i < data.size
+      while @frame_protocol_buffer.nil? and i < data.length
         @frame_protocol_varsize << data[i]
         if (data[i] & 0x80) == 0
           @frame_protocol_bytes_left =
@@ -21,15 +21,16 @@ module FrameProtocol
       end
 
       return if @frame_protocol_buffer.nil?
-      break if @frame_protocol_bytes_left > data.size - i
+      break if @frame_protocol_bytes_left > data.length - i
 
-      received_frame @frame_protocol_buffer + data[i, @frame_protocol_bytes_left]
+      received_frame @frame_protocol_buffer +
+                     data[i, @frame_protocol_bytes_left]
       @frame_protocol_varsize, @frame_protocol_buffer = '', nil
       i += @frame_protocol_bytes_left
     end
 
     @frame_protocol_buffer << data[i..-1]
-    @frame_protocol_bytes_left -= data.size-i
+    @frame_protocol_bytes_left -= data.length - i
   end
   
   # Override to process incoming frames.

data/lib/zerg_support/socket_factory.rb

@@ -94,6 +94,15 @@ module SocketFactory
         BasicSocket.do_not_reverse_lookup = true
       end
     end
+    
+    if options[:linger]
+      socket.setsockopt Socket::SOL_SOCKET, Socket::SO_LINGER,
+                        [1, options[:linger]].pack('ii')
+    else
+      # No lingering sockets.
+      socket.setsockopt Socket::SOL_SOCKET, Socket::SO_LINGER, [1, 0].pack('ii')
+      sugar_socket_close socket
+    end
   end
 
   # Hacks a socket's accept method so that new sockets have the given flags set.
@@ -116,6 +125,15 @@ module SocketFactory
       super(*args)
     end
   end
+
+  # Sugar-coat the socket's close() call with the proper way to close a socket.
+  def self.sugar_socket_close(socket)
+    def socket.close
+      shutdown rescue nil
+      recv 1 rescue nil
+      super
+    end    
+  end
   
   # Binds a socket to an address based on the options.
   def self.bind(socket, options)

data/lib/zerg_support/sockets/protocol_adapter.rb

@@ -23,7 +23,7 @@ module ProtocolAdapter
       # Receives an object from a socket.
       define_method :"recv_#{object_name}" do
         @zerg_protocol_adapter_state ||= state_class.new self
-        while @zerg_protocol_adapter_state.recv_object_buffer.length == 0
+        while @zerg_protocol_adapter_state.recv_object_buffer.empty?
           data = recv 65536
           return nil if data.length == 0  # Other side closed socket.
           @zerg_protocol_adapter_state.received_bytes data
@@ -51,7 +51,14 @@ module ProtocolAdapter
 
     # Called by the protocol when an entire object is available.
     def send_bytes(data)
-      @target.send data, 0
+      # NOTE: need to chunk the data so kernel buffers don't overflow.
+      #       Found out about this the hard way -- sending 150k in one call
+      #       drops data.      
+      i = 0
+      while i < data.length      
+        @target.send data[i, 65536], 0
+        i += 65536
+      end
     end
   end
 end

data/lib/zerg_support/spawn.rb

@@ -98,9 +98,9 @@ else
           
           Kernel.exec(*([binary] + args))
         end
-        
         # Get rid of zombies.
-        Process.detach child_pid
+        Process.detach child_pid if options[:pgroup]
+
       end
       
       return child_pid

data/test/test_frame_protocol.rb

@@ -101,7 +101,8 @@ module FrameProtocolTestMethods
   def test_natural_encoding
     table = [[0, "\0"], [1, "\x01"], [127, "\x7f"], [128, "\x80\x01"],
              [65535, "\xff\xff\x03"], [0xf0f0f0, "\xf0\xe1\xc3\x07"],
-             [0xaa55aa55aa55, "\xd5\xd4\xd6\xd2\xda\xca\x2a"]]
+             [0xaa55aa55aa55, "\xd5\xd4\xd6\xd2\xda\xca\x2a"],
+             [148296, "\310\206\t"]]
     table.each do |entry|
       assert_equal entry.last, FP.encode_natural(entry.first) 
       assert_equal entry.first, FP.decode_natural(entry.last) 

data/test/test_socket_factory.rb

@@ -10,11 +10,14 @@ class SocketFactoryTest < Test::Unit::TestCase
   OPAdapter = Zerg::Support::Sockets::ProtocolAdapter.adapter_module OP
   
   def setup
+    super
+    @thread_abort = Thread.abort_on_exception
     Thread.abort_on_exception = true
   end
 
   def teardown
-    
+    Thread.abort_on_exception = @thread_abort
+    super    
   end
   
   def test_host_from_address
@@ -54,21 +57,21 @@ class SocketFactoryTest < Test::Unit::TestCase
     client_options ||= server_options
     test_port = 31996
     
-    cli_gold = { :request_type => 1, :request_name => "moo" }
-    srv_gold = { :response_type => 2, :response_value => [true, 314] }
+    cli_gold = { :request_type => 1, :request_name => "moo",
+                 :blob => 'abc' * 43000 }
+    srv_gold = { :response_type => 2, :response_value => [true, 314],
+                 :rblob => 'xyz' * 41000 }
     cli_hash = nil
     
     # Server thread.
+    server = SF.socket({:in_addr => ":#{test_port}"}.merge server_options)
     Thread.new do
-      server = SF.socket({:in_addr => ":#{test_port}"}.merge server_options)
       server.listen
       serv_client, client_addrinfo = server.accept
       serv_client.extend OPAdapter
       cli_hash = serv_client.recv_object
       serv_client.send_object srv_gold
       serv_client.close
-      
-      server.close
     end
     
     # Client.
@@ -78,6 +81,7 @@ class SocketFactoryTest < Test::Unit::TestCase
     client.send_object cli_gold
     srv_hash = client.recv_object
     client.close
+    server.close
     
     # Checks
     assert_equal cli_gold, cli_hash, "Client -> server failed"

data/zerg_support.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zerg_support}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
-  s.date = %q{2009-11-09}
+  s.date = %q{2009-11-11}
   s.description = %q{Support libraries used by Zergling.Net deployment code.}
   s.email = %q{victor@zergling.net}
   s.extra_rdoc_files = ["CHANGELOG", "lib/zerg_support/event_machine/connection_mocks.rb", "lib/zerg_support/event_machine/protocol_adapter.rb", "lib/zerg_support/gems.rb", "lib/zerg_support/open_ssh.rb", "lib/zerg_support/process.rb", "lib/zerg_support/protocols/frame_protocol.rb", "lib/zerg_support/protocols/object_protocol.rb", "lib/zerg_support/socket_factory.rb", "lib/zerg_support/sockets/protocol_adapter.rb", "lib/zerg_support/sockets/socket_mocks.rb", "lib/zerg_support/spawn.rb", "lib/zerg_support.rb", "LICENSE", "README"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zerg_support
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Victor Costan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-09 00:00:00 -05:00
+date: 2009-11-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency