/*
* Thread handling stuff for Citadel server
*
- * Copyright (c) 1987-2011 by the citadel.org team
+ * Copyright (c) 1987-2015 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>
-#include <unistd.h>
-#include <stdio.h>
-#include <sys/types.h>
#include <errno.h>
-#include <sys/socket.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <signal.h>
+#include <stdio.h>
#include <syslog.h>
-
-#include "sysdep.h"
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
-
-#ifdef HAVE_SYSCALL_H
-# include <syscall.h>
-#else
-# if HAVE_SYS_SYSCALL_H
-# include <sys/syscall.h>
-# endif
-#endif
-
#include <libcitadel.h>
-
-#include "threads.h"
-#include "ctdl_module.h"
#include "modules_init.h"
-#include "housekeeping.h"
+#include "serv_extensions.h"
+#include "ctdl_module.h"
#include "config.h"
-#include "citserver.h"
-#include "sysdep_decls.h"
#include "context.h"
-#include "event_client.h"
+#include "threads.h"
int num_workers = 0; /* Current number of 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 */
+pthread_mutex_t ThreadCountMutex;;
void InitializeSemaphores(void)
}
-/*
- * 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
*/
abort();
}
+ pthread_mutex_init(&ThreadCountMutex, NULL);
+
/* 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.
+ * they are all in use.
*/
- while(!CtdlThreadCheckStop()) {
- if ((active_workers == num_workers) && (num_workers < 256)) {
- syslog(LOG_DEBUG, "worker threads: %d, active: %d\n", num_workers, active_workers);
+ while (!server_shutting_down) {
+ if ((active_workers == num_workers) && (num_workers < CtdlGetConfigInt("c_max_workers"))) {
CtdlThreadCreate(worker_thread);
- syslog(LOG_DEBUG, "worker threads: %d, active: %d\n", num_workers, active_workers);
}
- sleep(1);
+ usleep(1000000);
}
- /* Shut down */
- CtdlThreadStopAll();
- exit(0);
+ /* 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 = 30;
+ while ( (num_workers > 0) && (countdown-- > 0)) {
+ syslog(LOG_DEBUG, "Waiting %d seconds for %d worker threads to exit",
+ countdown, num_workers
+ );
+ usleep(1000000);
+ }
}