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 */
}
-/*
- * 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;
-}
/*
start_routine(NULL);
+ free(mytsd);
return(NULL);
}
memset(&masterTSD, 0, sizeof(struct thread_tsd));
}
+extern void ShutDownEventQueues(void);
+int EventQShuttingDown = 0;
+int EVQShutDown = 0;
/*
* Initialize the thread system
*/
/* 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(1000);
+ }
+
+ /* When we get to this point we are getting ready to shut down our Citadel server */
+ if (!EventQShuttingDown)
+ {
+ EventQShuttingDown = 1;
+ ShutDownEventQueues();
}
+ while (!EVQShutDown)
+ usleep(1000);
- /* 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(1000);
+ }
}