Upsie, usleep is 10^6 times smaller than sleep

[citadel.git] / citadel / threads.c

diff --git a/citadel/threads.c b/citadel/threads.c
index 0d3caed9f24043e5a46bef32238ad9b76e9c4494..4a4fe5163ec2260335ca7e537e1a39ea7cf2f601 100644 (file)
--- a/citadel/threads.c
+++ b/citadel/threads.c
@@ -4,18 +4,12 @@
  * Copyright (c) 1987-2011 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License, version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 #include <stdlib.h>
@@ -67,6 +61,7 @@ int active_workers = 0;                               /* Number of ACTIVE worker threads */
 pthread_key_t ThreadKey;
 pthread_mutex_t Critters[MAX_SEMAPHORES];      /* Things needing locking */
 struct thread_tsd masterTSD;
+int server_shutting_down = 0;                  /* set to nonzero during shutdown */
 
 
 
@@ -128,27 +123,6 @@ void end_critical_section(int which_one)
 }
 
 
-/*
- * A function to tell all threads to exit
- */
-void CtdlThreadStopAll(void)
-{
-       terminate_all_sessions();               /* close all client sockets */
-       CtdlShutdownServiceHooks();             /* close all listener sockets to prevent new connections */
-       PerformSessionHooks(EVT_SHUTDOWN);      /* run any registered shutdown hooks */
-}
-
-
-/*
- * A function for a thread to check if it has been asked to stop
- */
-int CtdlThreadCheckStop(void)
-{
-
-       /* FIXME this needs to do something useful.  moar code pls ! */
-
-       return 0;
-}
 
 
 /*
@@ -177,6 +151,7 @@ void *CTC_backend(void *supplied_start_routine)
 
        start_routine(NULL);
 
+       free(mytsd);
        return(NULL);
 }
 
@@ -202,7 +177,10 @@ void InitializeMasterTSD(void) {
        memset(&masterTSD, 0, sizeof(struct thread_tsd));
 }
 
+extern void ShutDownEventQueues(void);
 
+int EventQShuttingDown = 0;
+int EVQShutDown = 0;
 /*
  * Initialize the thread system
  */
@@ -216,24 +194,38 @@ void go_threading(void)
        /* Second call to module init functions now that threading is up */
        initialise_modules(1);
 
-       CtdlThreadCreate(select_on_master);
-
        /* Begin with one worker thread.  We will expand the pool if necessary */
        CtdlThreadCreate(worker_thread);
 
        /* The supervisor thread monitors worker threads and spawns more of them if it finds that
         * they are all in use.  FIXME make the 256 max threads a configurable value.
         */
-       while(!CtdlThreadCheckStop()) {
+       while (!server_shutting_down) {
                if ((active_workers == num_workers) && (num_workers < 256)) {
-                       syslog(LOG_DEBUG, "worker threads: %d, active: %d\n", num_workers, active_workers);
                        CtdlThreadCreate(worker_thread);
-                       syslog(LOG_DEBUG, "worker threads: %d, active: %d\n", num_workers, active_workers);
                }
-               sleep(1);
+               usleep(1000000);
+       }
+
+       /* When we get to this point we are getting ready to shut down our Citadel server */
+       if (!EventQShuttingDown)
+       {
+               EventQShuttingDown = 1;
+               ShutDownEventQueues();
        }
+       while (!EVQShutDown)
+               usleep(1000000);
 
-       /* Shut down */
-       CtdlThreadStopAll();
-       exit(0);
+
+       terminate_all_sessions();               /* close all client sockets */
+       CtdlShutdownServiceHooks();             /* close all listener sockets to prevent new connections */
+       PerformSessionHooks(EVT_SHUTDOWN);      /* run any registered shutdown hooks */
+
+       int countdown = 30;
+       while ( (num_workers > 0) && (countdown-- > 0)) {
+               syslog(LOG_DEBUG, "Waiting %d seconds for %d worker threads to exit",
+                       countdown, num_workers
+               );
+               usleep(1000000);
+       }
 }