Changeset 1568

Timestamp:

06/17/08 20:22:44 (3 months ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/ChangeLog (modified) (1 diff)
• cherokee/trunk/cherokee/common-internal.h (modified) (2 diffs)
• cherokee/trunk/cherokee/server.c (modified) (3 diffs)

cherokee/trunk/ChangeLog

@@ -1 +1 @@
-2008-06-17  Alvaro Lopez Ortega  <alvaro@alobbs.com>
+
+        * cherokee/server.c (stop_threads): It must stop all the threads
+        before flushing the log files.
+
+        * cherokee/common-internal.h (CHEROKEE_THREAD_JOIN): New macro.
-
-        * cherokee/server.c (cherokee_server_print_build_info),

cherokee/trunk/cherokee/common-internal.h

@@ -86 +86 @@
-# define CHEROKEE_MUTEX_T(n)          pthread_mutex_t n
-# define CHEROKEE_RWLOCK_T(n)         pthread_rwlock_t n
+# define CHEROKEE_THREAD_JOIN(t)      pthread_join(t,NULL)
-
-# define CHEROKEE_MUTEX_LOCK(m)       pthread_mutex_lock(m)
@@ -103 +104 @@
-# define CHEROKEE_MUTEX_T(n)          
-# define CHEROKEE_RWLOCK_T(n)         
+# define CHEROKEE_THREAD_JOIN(t)
-
-# define CHEROKEE_MUTEX_LOCK(m)

cherokee/trunk/cherokee/server.c

@@ -1151 +1151 @@
-
-static void
+stop_threads (cherokee_server_t *srv)
+{
+        cherokee_list_t *i;
+
+        list_for_each (i, &srv->thread_list) {
+                THREAD(i)->exit = true;
+        }
+
+        list_for_each (i, &srv->thread_list) {
+                CHEROKEE_THREAD_JOIN (THREAD(i)->thread);
+        }
+}
+
+
+static void
-flush_logs (cherokee_server_t *srv)
-{
-        cherokee_list_t   *i;
-        cherokee_logger_t *logger;
-
-
-
-
-
-
-
-
+
+
+
-        logger = VSERVER_LOGGER(srv->vserver_default);
-        if (logger) 
-                cherokee_logger_flush (VSERVER_LOGGER(srv->vserver_default));
+
+        /* Rest of the virtual servers
+         */
+        list_for_each (i, &srv->vservers) {
+                logger = VSERVER_LOGGER(i);
+                if (logger)
+                        cherokee_logger_flush (VSERVER_LOGGER(i));
+        }
-}
-
@@ -1354 +1372 @@
-#endif
-
-        /* Wanna reinit or exit ?
-         */
-        if (likely ((srv->wanna_reinit | srv->wanna_exit) == 0))
-                return ret_eagain;
-
-        /* Wanna reinit ?
-         */
-srv->wanna_reinit
+unlikely (srv->wanna_reinit)
-                ret = cherokee_server_reinit (srv);
-
@@ -1374 +1387 @@
-        /* Wanna exit ?
-         */
-
+
+
-                flush_logs (srv);
-                return ret_ok;