Changeset 1692

Timestamp:

07/25/08 16:43:48 (6 months ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/ChangeLog (modified) (1 diff)
• cherokee/trunk/acinclude.m4 (modified) (1 diff)
• cherokee/trunk/cherokee/connection.c (modified) (1 diff)
• cherokee/trunk/cherokee/socket.c (modified) (2 diffs)
• cherokee/trunk/cherokee/socket.h (modified) (1 diff)
• cherokee/trunk/configure.in (modified) (1 diff)

cherokee/trunk/ChangeLog

@@ -1 +1 @@
-2008-07-25  Alvaro Lopez Ortega  <alvaro@alobbs.com>
+
+        * cherokee/socket.c, cherokee/socket.h, cherokee/connection.c,
+        configure.in, acinclude.m4: Added support for TCP_CORK on BSD and
+        OS X systems. Actually, it's called TCP_NOPUSH on those.
-
-        * admin/config.py (Config.serialize): Sorts the configuration file

cherokee/trunk/acinclude.m4

@@ -448 +448 @@
-
-])
+
+AC_DEFUN([HYDRA_TCP_NOPUSH], [
+
+AC_MSG_CHECKING([whether TCP_NOPUSH is a valid TCP socket option])
+AC_TRY_COMPILE(
+#include <sys/socket.h>
+#include <netinet/tcp.h>
+#include <netinet/in.h>
+,[
+  int one = 1, fd;
+  if (setsockopt(fd, IPPROTO_TCP, TCP_NOPUSH,
+                    (void *) &one, sizeof (one)) == -1)
+      return -1;
+  return 0;
+
+],
+dnl *** FOUND
+AC_DEFINE( HAVE_TCP_NOPUSH, 1, [TCP_NOPUSH was found and will be used])
+AC_MSG_RESULT(yes),
+dnl *** NOT FOUND
+AC_MSG_RESULT(no)
+)
+
+])

cherokee/trunk/cherokee/connection.c

@@ -721 +721 @@
-cherokee_connection_set_cork (cherokee_connection_t *conn, cherokee_boolean_t enable)
-{
-
-
-
-
-
-
-
-
-
-
+
+
+
-                BIT_SET (conn->options, conn_op_tcp_cork);
-
-
-
-
-
+
-                BIT_UNSET (conn->options, conn_op_tcp_cork);
-        }
-#else
-        UNUSED(conn);
-        UNUSED(enable);
-#endif
-
-        return ret_ok;

cherokee/trunk/cherokee/socket.c

@@ -84 +84 @@
-#endif
-
+#if !defined(TCP_CORK) && defined(TCP_NOPUSH)
+#define TCP_CORK TCP_NOPUSH
+#endif
+
-#define ENTRIES "socket"
-
@@ -1886 +1890 @@
-}
-
+
+ret_t
+cherokee_socket_set_cork (cherokee_socket_t *socket, cherokee_boolean_t *enable)
+{
+#if defined(HAVE_TCP_CORK) || defined(HAVE_TCP_NOPUSH)
+        int on;
+        int fd = socket->socket;
+
+        if (enable) {
+                on = 0;
+                setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &on, sizeof on);
+                on = 1;
+                setsockopt(fd, IPPROTO_TCP, TCP_CORK, &on, sizeof on);
+        } else {
+                on = 0;
+                setsockopt(fd, IPPROTO_TCP, TCP_CORK, &on, sizeof on);
+                on = 1;
+                setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &on, sizeof on);
+        }
+#else
+        UNUSED(socket);
+        UNUSED(enable);
+#endif
+        return ret_ok;
+}

cherokee/trunk/cherokee/socket.h

@@ -204 +204 @@
-ret_t cherokee_socket_gethostbyname     (cherokee_socket_t *socket, cherokee_buffer_t *hostname);
-ret_t cherokee_socket_set_status        (cherokee_socket_t *socket, cherokee_socket_status_t status);
+ret_t cherokee_socket_set_cork          (cherokee_socket_t *socket, cherokee_boolean_t *enable);
-
-/* Low level functions

cherokee/trunk/configure.in

@@ -451 +451 @@
-dnl
-HYDRA_TCP_CORK
+HYDRA_TCP_NOPUSH
-
-dnl