Changeset 706

Timestamp:

04/18/07 08:31:53 (2 years ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/ChangeLog (modified) (1 diff)
• cherokee/trunk/cherokee/server.c (modified) (4 diffs)
• cherokee/trunk/cherokee/socket.c (modified) (1 diff)
• cherokee/trunk/cherokee/thread.c (modified) (2 diffs)

cherokee/trunk/ChangeLog

@@ +1 @@
+2007-04-17  A.D.F  <adefacc@tin.it>
+
+        * cherokee/socket.c:
+        - cleanup HTTPS session only if it is not NULL;
+
+        * cherokee/server.c:
+        - force good limits for max. number of fds;
+
+        * cherokee/thread.c:
+        - __accept_from_server(),
+          fix locking and always close new accepted fd
+          on error (fixes a socket leak which lead
+          to many idle connections left open).
+        
-2007-04-14  A.D.F  <adefacc@tin.it>
-

cherokee/trunk/cherokee/server.c

@@ -734 +734 @@
-        ret_t ret;
-        int   i, fds_per_thread, max_fds;
+#ifdef HAVE_PTHREAD
+        int   thr_fds, spare_fds;
+#endif
-
-        /* Leave some spare fds.
@@ -741 +744 @@
-                return ret_error;
-        }
-
+
+
+
+
+
+
+
-
-        /* Set fd upper limit for threads.
@@ -750 +759 @@
-                srv->thread_num = max_fds;
-        fds_per_thread = max_fds / srv->thread_num;
+#ifdef HAVE_PTHREAD
+        thr_fds = fds_per_thread * srv->thread_num;
+        spare_fds = max_fds - thr_fds;
+#endif
-
-        /* Create the main thread
@@ -776 +789 @@
-        for (i = 0; i < srv->thread_num - 1; i++) {
-                cherokee_thread_t *thread;
+                int                fds_per_thread1 = fds_per_thread;
+
+                /* Add one more fd to this thread,
+                 * this is useful if we are using a huge number of threads
+                 * (i.e. 1000 or more) and we don't want to leave lots of
+                 * unused fds.
+                 */
+                if (spare_fds > 0) {
+                        spare_fds--;
+                        fds_per_thread1++;
+                }
-
-                ret = cherokee_thread_new (&thread, srv, thread_async, 
-                          srv->fdpoll_method, srv->system_fd_limit, fds_per_thread
+            srv->fdpoll_method, srv->system_fd_limit, fds_per_thread1
-                if (unlikely(ret < ret_ok)) return ret;
-                

cherokee/trunk/cherokee/socket.c

@@ -441 +441 @@
-
-#ifdef HAVE_TLS
-
-
+
-#if   defined (HAVE_GNUTLS)
-

cherokee/trunk/cherokee/thread.c

@@ -1358 +1358 @@
-         */
-        ret = cherokee_thread_add_connection (thd, new_conn);
+
+        /* Release the thread ownership
+         */
+        CHEROKEE_MUTEX_UNLOCK (&thd->ownership);
+
-        if (unlikely (ret < ret_ok)) {
+                cherokee_close_fd (new_fd);
-                goto error;
-        }
-
-        /* Release the thread ownership
-         */
-        CHEROKEE_MUTEX_UNLOCK (&thd->ownership);
-
-        TRACE (ENTRIES, "new conn %p, fd %d\n", new_conn, new_fd);
@@ -1373 +1375 @@
-        TRACE (ENTRIES, "error accepting connection! fd %d\n", srv_socket);
-
+        /* New socket has alread been closed,
+         * so here we reinit fd to default init value.
+         */
+        SOCKET_FD(&new_conn->socket) = -1;
-        connection_reuse_or_free (thd, new_conn);
-        return 0;