Changeset 583

Timestamp:

01/04/07 00:20:24 (2 years ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/ChangeLog (modified) (1 diff)
• cherokee/trunk/cherokee/handler_file.c (modified) (1 diff)
• cherokee/trunk/cherokee/socket.c (modified) (3 diffs)
• cherokee/trunk/configure.in (modified) (1 diff)

cherokee/trunk/ChangeLog

@@ +1 @@
+2007-01-04  Alvaro Lopez Ortega  <alvaro@alobbs.com>
+
+        * cherokee/socket.c (cherokee_socket_sendfile): Added a static
+        boolean variable to store whether the system doesn't support the
+        sendfile() function, in that way, this wrapper function will
+        return faster since the systems reports ENOSYS once.
+
+        * cherokee/handler_file.c (cherokee_handler_file_init): Removed
+        check for HAVE_SENDFILE_BROKEN.
+
+        * configure.in: Removed sendfile() test. It was declaring a
+        superfluous macro called HAVE_SENDFILE_BROKEN if the system had a
+        buggy sendfile implementation (like in some Linux 2.2 versions).
+
-2007-01-03  A.D.F  <adefacc@tin.it>
-

cherokee/trunk/cherokee/handler_file.c

@@ -535 +535 @@
-                                (conn->socket.is_tls == non_TLS));
-
-# ifdef HAVE_SENDFILE_BROKEN
-        fhdl->using_sendfile = false;
-# endif
-
-        if (fhdl->using_sendfile) {
-                cherokee_connection_set_cork (conn, 1);

cherokee/trunk/cherokee/socket.c

@@ -1139 +1139 @@
-cherokee_socket_sendfile (cherokee_socket_t *socket, int fd, size_t size, off_t *offset, ssize_t *sent)
-{
+        static cherokee_boolean_t no_sys = false;
+
+        /* Exit if there is no sendfile() function in the system
+         */
+        if (unlikely (no_sys)) 
+                return ret_no_sys;
+
-        /* If there is nothing to send then return now, this may be
-         * needed in some systems (i.e. *BSD) because value 0 may have
@@ -1176 +1183 @@
-        if (*sent < 0) {
-                switch (errno) {
-
+
+
+
-                case EAGAIN: return ret_eagain;
-                }
@@ -1236 +1245 @@
-                switch (errno) {
-                case ENOSYS:
+                        no_sys = true;
-                        return ret_no_sys;
-                case EAGAIN:

cherokee/trunk/configure.in

@@ -663 +663 @@
-SENDFILE_CHECK
-
-# Is sendfile broken?
-AC_MSG_CHECKING(if sendfile works)
-AC_RUN_IFELSE([#include <errno.h>
-            int main() {
-               int o = 0;
-               if (-1 == sendfile(0, 0, &o, 0) && errno == ENOSYS) return -1;
-               return 0;
-            } ], 
-            AC_MSG_RESULT(yes), 
-            [ AC_MSG_RESULT(no) 
-              AC_DEFINE([HAVE_SENDFILE_BROKEN], [1], [broken sendfile])],
-                  AC_MSG_RESULT(cross, assuming: yes))
-
-# readdir_r()
-LIBWWW_READDIR_R_TYPE