Changeset 244

Timestamp:

12/09/07 12:13:03 (9 months ago)

Author:

gethema..@gmail.com

Message:

check in code that makes use of tcp server

Files:

• trunk/framework/core.rb (modified) (3 diffs)

trunk/framework/core.rb

@@ -68 +68 @@
-        begin
-          client_socket,client_sockaddr = sock_io.accept_nonblock
+          client_sockaddr.setsockopt(*$tcp_cork_opts) rescue nil
-        rescue Errno::EAGAIN, Errno::ECONNABORTED, Errno::EPROTO, Errno::EINTR
-          puts "not ready yet"
@@ -107 +108 @@
-        rescue DisconnectError
-          return false
+        end
+      end
+
+      def configure_socket_options
+        case RUBY_PLATFORM
+        when /linux/
+          # 9 is currently TCP_DEFER_ACCEPT
+          $tcp_defer_accept_opts = [Socket::SOL_TCP, 9, 1]
+          $tcp_cork_opts = [Socket::SOL_TCP, 3, 1]
+        when /freebsd(([1-4]\..{1,2})|5\.[0-4])/
+          # Do nothing, just closing a bug when freebsd <= 5.4
+        when /freebsd/
+          # Use the HTTP accept filter if available.
+          # The struct made by pack() is defined in /usr/include/sys/socket.h as accept_filter_arg
+          unless `/sbin/sysctl -nq net.inet.accf.http`.empty?
+            $tcp_defer_accept_opts = [Socket::SOL_SOCKET, Socket::SO_ACCEPTFILTER, ['httpready', nil].pack('a16a240')]
+          end
-        end
-      end
@@ -118 +136 @@
-#         t_socket.listen(50)
-        #         t_socket.setsockopt(Socket::IPPROTO_TCP,Socket::TCP_NODELAY,1)
+        configure_socket_options
-        t_socket = TCPServer.new(ip,port.to_i)
-
+
+
-        listen_sockets[t_socket.fileno] = { :socket => t_socket,:block => block,:module => t_module }
-        @read_ios << t_socket