Merge 0546ecc into 8820362

lib/reel/mixins.rb

@@ -19,6 +19,7 @@ def remote_host
       # NOTE: Celluloid::IO does not yet support non-blocking reverse DNS
       socket.peeraddr(true)[2]
     end
+
   end
 
   module RequestMixin
@@ -60,4 +61,51 @@ def fragment
     end
 
   end
+
+  module SocketMixin
+
+    # Optimizations possible, depending on OS:
+
+    # TCP_NODELAY:    prevent TCP packets from being buffered
+    # TCP_CORK:       TODO: tersely describe
+    # SO_REUSEADDR:   TODO: tersely describe
+
+    if RUBY_PLATFORM =~ /linux/
+
+      # Only Linux supports the mix of socket behaviors given in these optimizations.
+      # Beaware, certain optimizations may work individually off Linux; not together.
+      def optimize_socket socket
+        if socket.is_a? TCPSocket
+          socket.setsockopt( Socket::IPPROTO_TCP, :TCP_NODELAY, 1 )
+          socket.setsockopt( Socket::IPPROTO_TCP, 3, 1 ) # TCP_CORK
+          socket.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1 )
+        end
+      end
+
+      def deoptimize_socket socket
+        if socket.is_a? TCPSocket
+          socket.setsockopt( Socket::IPPROTO_TCP, :TCP_NODELAY, 1 )
+          socket.setsockopt( Socket::IPPROTO_TCP, 3, 1 ) # TCP_CORK
+          socket.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1 )
+        end
+      end
+
+    else
+
+      # If the underying OS is not Linux, apply the remaining available optimizations.
+      def optimize_socket socket
+        if socket.is_a? TCPSocket
+          socket.setsockopt( Socket::IPPROTO_TCP, :TCP_NODELAY, 1 )
+        end
+      end
+
+      def deoptimize_socket socket
+        if socket.is_a? TCPSocket
+          socket.setsockopt( Socket::IPPROTO_TCP, :TCP_NODELAY, 0 )
+        end
+      end
+    end
+
+  end
+
 end

lib/reel/server.rb

@@ -17,6 +17,7 @@ class Server
     # TCP sockets.
     #
     class << self
+      include SocketMixin
       alias_method :_new, :new
       protected    :_new
     end
@@ -40,8 +41,7 @@ def self.new(host, port, options = {} , &callback)
       server  = Celluloid::IO::TCPServer.new(host, port)
       backlog = options.fetch(:backlog, DEFAULT_BACKLOG)
 
-      # prevent TCP packets from being buffered
-      server.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+      self.optimize_socket server
       server.listen(backlog)
 
       self._new(server, options, &callback)
@@ -64,11 +64,13 @@ def initialize(server, options = {}, &callback)
       @callback = callback
 
       async.run
-   end
-
-
+    end
+
     def shutdown
-      @server.close if @server
+      if @server
+        self.deoptimize_socket @server
+        @server.close
+      end
     end
 
     def run