X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fthreads.c;h=4a4fe5163ec2260335ca7e537e1a39ea7cf2f601;hb=5365493a013629f909c27528febb9660e5d1d863;hp=965f866da2c31c44000988c8b3caf484c52d4aa3;hpb=2b402dc292b6dcdbc7a3786a6c722e06e3be5ab5;p=citadel.git

diff --git a/citadel/threads.c b/citadel/threads.c
index 965f866da..4a4fe5163 100644
--- 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>
@@ -157,6 +151,7 @@ void *CTC_backend(void *supplied_start_routine)
 
 	start_routine(NULL);
 
+	free(mytsd);
 	return(NULL);
 }
 
@@ -182,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
  */
@@ -196,8 +194,6 @@ 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);
 
@@ -208,18 +204,28 @@ void go_threading(void)
 		if ((active_workers == num_workers) && (num_workers < 256)) {
 			CtdlThreadCreate(worker_thread);
 		}
-		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);
+
 
 	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 = 10;
+	int countdown = 30;
 	while ( (num_workers > 0) && (countdown-- > 0)) {
-		syslog(LOG_DEBUG, "Waiting for %d worker threads to exit", num_workers);
-		sleep(1);
+		syslog(LOG_DEBUG, "Waiting %d seconds for %d worker threads to exit",
+			countdown, num_workers
+		);
+		usleep(1000000);
 	}
 }