Changeset 718

Timestamp:

04/23/07 19:15:45 (2 years ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/ChangeLog (modified) (1 diff)
• cherokee/trunk/cherokee/fdpoll.c (modified) (1 diff)
• cherokee/trunk/cherokee/macros.h (modified) (1 diff)
• cherokee/trunk/cherokee/server.c (modified) (8 diffs)
• cherokee/trunk/cherokee/source.c (modified) (2 diffs)

cherokee/trunk/ChangeLog

@@ +1 @@
+2007-04-22  A.D.F  <adefacc@tin.it>
+
+        * cherokee/macros.h:
+        - new macros to handler minimum number of system fds,
+          spare fds (used by standard I/O streams, i.e. stdin, etc.)
+          and minimum number of file descriptors really available
+          to Cherokee.
+
+        * cherokee/source.c:
+        - fixed a socket fd leak in cherokee_source_connect(),
+          that function does both the open and the connect,
+          if it fails, caller may retry it, but of course
+          if socket is open then it must be closed before the retry.
+
+        * cherokee/server.c:
+        - fix the max number of threads againts max. number of
+          max_fds.
+
+        * cherokee/fdpoll.c:
+        - now that we leave half of fds free to be used to open files, etc.
+          we can raise the max_fds limit to its real value
+
-2007-04-22  Alvaro Lopez Ortega  <alvaro@alobbs.com>
-

cherokee/trunk/cherokee/fdpoll.c

@@ -158 +158 @@
-cherokee_fdpoll_is_full (cherokee_fdpoll_t *fdp)
-{
-(fdp->nfiles - 2)
+fdp->nfiles
-}
-

cherokee/trunk/cherokee/macros.h

@@ -100 +100 @@
-#define DEFAULT_LOGGER_MAX_BUFSIZE    32768
-#define LOGGER_MAX_BUFSIZE            (4 * 1024 * 1024)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#define IOCACHE_MAX_FILE_SIZE            50000

cherokee/trunk/cherokee/server.c

@@ -91 +91 @@
-#define ENTRIES "core,server"
-
+/* Number of spare fds, used for stdin, stdout, stderr, etc.
+ * Set it between 5 and 20.
+ */
+#define MIN_SPARE_FDS   10
+
-ret_t
-cherokee_server_new  (cherokee_server_t **srv)
@@ -636 +641 @@
-        /* File descriptor limit
-         */
-limit", srv->system_fd_limit
+system limit, max. %d connections ", srv->system_fd_limit, srv->max_fds
-
-        /* Threading stuff
@@ -644 +649 @@
-        } else {
-                cherokee_buffer_add_va (&n, ", %d threads", srv->thread_num);
-in each", srv->system_fd_limit / (
+per thread", (srv->max_fds / 
-
-                switch (srv->thread_policy) {
@@ -733 +738 @@
-{       
-        ret_t ret;
-, max_fds
+
-#ifdef HAVE_PTHREAD
-        int   thr_fds, spare_fds;
-#endif
-
-
-
-
-
+
+
+
-                return ret_error;
-
-
-
+
+
+
+
+
-        else
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-#ifdef HAVE_PTHREAD
-        thr_fds = fds_per_thread * srv->thread_num;
-
+srv->
-#endif
-
@@ -828 +826 @@
-                }
-        }
-
+
-        ret = cherokee_virtual_server_has_tls (srv->vserver_default);
-        if (ret == ret_ok) {
@@ -954 +952 @@
-        if (unlikely(ret < ret_ok))
-                return ret;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                return ret_error;
-        }
@@ -995 +1009 @@
-                srv->thread_num = srv->ncpus * 5;
-        }
-+ 5 >= srv->system_fd_limit
-system_fd_limit - 5
+> srv->max_fds
+max_fds
-                if (srv->thread_num < 1)
-                        srv->thread_num = 1;
@@ -1009 +1023 @@
-                srv->max_conn_reuse = DEFAULT_CONN_REUSE;
-
-
-
-
-
-
+
+
-
-        /* Get the passwd file entry before chroot

cherokee/trunk/cherokee/source.c

@@ -74 +74 @@
-         */
-        if (! cherokee_buffer_is_empty (&src->unix_socket)) {
+                ret = cherokee_socket_close (sock);
-                ret = cherokee_socket_set_client (sock, AF_UNIX);
-                if (ret != ret_ok) return ret;
@@ -85 +86 @@
-        /* INET socket
-         */
+        ret = cherokee_socket_close (sock);
-        ret = cherokee_socket_set_client (sock, AF_INET);
-        if (ret != ret_ok) return ret;
-
+
-        ret = cherokee_resolv_cache_get_host (resolv, src->host.buf, sock);
-        if (ret != ret_ok) return ret;