/*
* 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, version 3.
* GNU General Public License for more details.
*/
-#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 */
start_routine(NULL);
- free(mytsd);
+// free(mytsd);
return(NULL);
}
* they are all in use.
*/
while (!server_shutting_down) {
- if ((active_workers == num_workers) && (num_workers < config.c_max_workers)) {
+ if ((active_workers == num_workers) && (num_workers < CtdlGetConfigInt("c_max_workers"))) {
CtdlThreadCreate(worker_thread);
}
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 */