#ifdef HAVE_SYS_PRCTL_H
#include <sys/prctl.h>
#endif
+#include <libcitadel.h>
#include "citadel.h"
#include "server.h"
#include "serv_extensions.h"
#include "database.h"
#include "user_ops.h"
#include "housekeeping.h"
-#include "tools.h"
#include "citadel_dirs.c"
#include "modules_init.h"
const char *CitadelServiceUDS="citadel-UDS";
const char *CitadelServiceTCP="citadel-TCP";
+
+void go_threading(void);
+
+
/*
* Here's where it all begins.
*/
int main(int argc, char **argv)
{
char facility[32];
- int a, i; /* General-purpose variables */
+ int a; /* General-purpose variables */
struct passwd pw, *pwp = NULL;
char pwbuf[SIZ];
int drop_root_perms = 1;
"General Public License.\n");
lprintf(CTDL_NOTICE, "\n");
lprintf(CTDL_DEBUG, "Called as: %s\n", argv[0]);
+ lprintf(CTDL_INFO, "%s\n", libcitadel_version_string());
/* Load site-specific parameters, and set the ipgm secret */
lprintf(CTDL_INFO, "Loading citadel.config\n");
lprintf(CTDL_INFO, "Initializing server extensions\n");
size = strlen(ctdl_home_directory) + 9;
-/*
- initialize_server_extensions();
-*/
-
- initialise_modules();
+ initialise_modules(0);
/* We want to check for idle sessions once per minute */
CtdlRegisterSessionHook(terminate_idle_sessions, EVT_TIMER);
+ go_threading();
+
+
+ master_cleanup(exit_signal);
+ return(0);
+}
+
+
+
+void go_threading(void)
+{
+ int i;
+ struct CtdlThreadNode *last_worker;
+
+ /* We can't use CT_PUSH() here so we do it the long way
+ * So we can still use CT for current thread */
+ struct CtdlThreadNode *_this_cit_thread;
+
+ /*
+ * Initialise the thread system
+ */
+ ctdl_thread_internal_init();
+ _this_cit_thread = CtdlThreadSelf();
/*
* Now create a bunch of worker threads.
*/
- lprintf(CTDL_DEBUG, "Starting %d worker threads\n",
- config.c_min_workers-1);
- begin_critical_section(S_WORKER_LIST);
- for (i=0; i<(config.c_min_workers-1); ++i) {
- create_worker();
- }
- end_critical_section(S_WORKER_LIST);
+ CtdlLogPrintf(CTDL_DEBUG, "Starting %d worker threads\n", config.c_min_workers);
+ begin_critical_section(S_THREAD_LIST);
+ i=0; /* Always start at least 1 worker thread */
+ do
+ {
+ ctdl_internal_create_thread("Worker Thread", CTDLTHREAD_BIGSTACK + CTDLTHREAD_WORKER, worker_thread, NULL);
+ } while (++i < config.c_min_workers);
+ end_critical_section(S_THREAD_LIST);
+
+ /* Second call to module init functions now that threading is up */
+ initialise_modules(1);
- /* Create the maintenance threads. */
- create_maintenance_threads();
+ /*
+ * This thread is now used for garbage collection of other threads in the thread list
+ */
+ CtdlLogPrintf(CTDL_INFO, "Startup thread %d becoming garbage collector,\n", pthread_self());
- /* This thread is now useless. It can't be turned into a worker
- * thread because its stack is too small, but it can't be killed
- * either because the whole server process would exit. So we just
- * join to the first worker thread and exit when it exits.
+ /*
+ * We do a lot of locking and unlocking of the thread list in here.
+ * We do this so that we can repeatedly release time for other threads
+ * that may be waiting on the thread list.
+ * We are a low priority thread so we can afford to do this
*/
- pthread_join(worker_list->tid, NULL);
- master_cleanup(0);
- return(0);
+
+ while (CtdlThreadGetCount())
+ {
+ if (exit_signal)
+ CtdlThreadStopAll();
+ check_sched_shutdown();
+ begin_critical_section(S_THREAD_LIST);
+ ctdl_thread_internal_calc_loadavg();
+ end_critical_section(S_THREAD_LIST);
+
+ /* Reduce the size of the worker thread pool if necessary. */
+ if ((CtdlThreadGetWorkers() > config.c_min_workers) && (CtdlThreadWorkerAvg < 20))
+ {
+ /* Ask a worker thread to stop as we no longer need it */
+ begin_critical_section(S_THREAD_LIST);
+ last_worker = CtdlThreadList;
+ while (last_worker)
+ {
+ if (last_worker->flags & CTDLTHREAD_WORKER && last_worker->state > CTDL_THREAD_STOPPING)
+ break;
+ else
+ last_worker = last_worker->next;
+ }
+ end_critical_section(S_THREAD_LIST);
+ if (last_worker)
+ {
+#ifdef WITH_THREADLOG
+ CtdlLogPrintf(CTDL_DEBUG, "Thread system, stopping excess worker thread \"%s\" (%ld).\n",
+ last_worker->name,
+ last_worker->tid
+ );
+#endif
+ CtdlThreadStop(last_worker);
+ }
+ }
+
+ /*
+ * If all our workers are working hard, start some more to help out
+ * with things
+ */
+ begin_critical_section(S_THREAD_LIST);
+ /* FIXME: come up with a better way to dynamically alter the number of threads
+ * based on the system load
+ */
+// if ((CtdlThreadGetWorkers() < config.c_max_workers) && (CtdlThreadGetWorkers() < num_sessions))
+ // && (CtdlThreadLoadAvg < 90) )
+ if ((CtdlThreadGetWorkers() < config.c_max_workers) && (CtdlThreadWorkerAvg > 60) && (CtdlThreadLoadAvg < 90) )
+ {
+ end_critical_section(S_THREAD_LIST);
+ for (i=0; i<5 ; i++)
+// for (i=0; i< (num_sessions - CtdlThreadGetWorkers()) ; i++)
+// for (i=0; i< (10 - (55 - CtdlThreadWorkerAvg) / CtdlThreadWorkerAvg / CtdlThreadGetWorkers()) ; i++)
+ {
+ begin_critical_section(S_THREAD_LIST);
+ ctdl_internal_create_thread("Worker Thread",
+ CTDLTHREAD_BIGSTACK + CTDLTHREAD_WORKER,
+ worker_thread,
+ NULL
+ );
+ end_critical_section(S_THREAD_LIST);
+ }
+ }
+ else
+ end_critical_section(S_THREAD_LIST);
+
+ begin_critical_section(S_THREAD_LIST);
+ ctdl_internal_thread_gc();
+ end_critical_section(S_THREAD_LIST);
+
+ if (CtdlThreadGetCount() <= 1) // Shutting down clean up the garbage collector
+ {
+ begin_critical_section(S_THREAD_LIST);
+ ctdl_internal_thread_gc();
+ end_critical_section(S_THREAD_LIST);
+ }
+
+ if (CtdlThreadGetCount())
+ CtdlThreadSleep(1);
+ }
+ /*
+ * If the above loop exits we must be shutting down since we obviously have no threads
+ */
+ ctdl_thread_internal_cleanup();
}
projects / citadel.git / blobdiff