#include <stdarg.h>
#include <grp.h>
#include <pwd.h>
-#ifdef HAVE_PTHREAD_H
-#include <pthread.h>
-#endif
#ifdef HAVE_SYS_PRCTL_H
#include <sys/prctl.h>
#endif
#include "server.h"
#include "serv_extensions.h"
#include "sysdep_decls.h"
+#include "threads.h"
#include "citserver.h"
#include "support.h"
#include "config.h"
void go_threading(void);
+/*
+ * For the subversion revision number
+ */
+const char *svn_revision(void);
/*
* Here's where it all begins.
/* initialise semaphores here. Patch by Matt and davew
* its called here as they are needed by CtdlLogPrintf for thread safety
*/
- CtdlInitBase64Table();
InitialiseSemaphores();
/* initialize the master context */
freopen(&argv[a][2], "w", stderr);
}
- else if (!strncmp(argv[a], "-f", 2)) {
- do_defrag = 1;
- }
-
else if (!strncmp(argv[a], "-D", 2)) {
dbg = 1;
}
CtdlLogPrintf(CTDL_EMERG, "citserver: usage: "
"citserver "
"[-lLogFacility] "
- "[-d] [-f] [-D] "
+ "[-d] [-D] "
" [-tTraceFile]"
" [-xLogLevel] [-hHomeDir]\n");
exit(1);
params.debugLevel = ECRASH_DEBUG_VERBOSE;
params.dumpAllThreads = TRUE;
params.useBacktraceSymbols = 1;
-/// BuildSymbolTable(&symbol_table);
-// params.symbolTable = &symbol_table;
params.signals[0]=SIGSEGV;
params.signals[1]=SIGILL;
params.signals[2]=SIGBUS;
params.signals[3]=SIGABRT;
-
eCrash_Init(¶ms);
-
eCrash_RegisterThread("MasterThread", 0);
-
-/// signal(SIGSEGV, cit_panic_backtrace);
#endif
+
/* Initialize the syslogger. Yes, we are really using 0 as the
* facility, because we are going to bitwise-OR the facility to
* the severity of each message, allowing us to write to other
"*** Citadel server engine v%d.%02d ***\n",
(REV_LEVEL/100), (REV_LEVEL%100));
CtdlLogPrintf(CTDL_NOTICE,
- "Copyright (C) 1987-2007 by the Citadel development team.\n");
+ "*** Build number %s ***\n", svn_revision());
+ CtdlLogPrintf(CTDL_NOTICE,
+ "Copyright (C) 1987-2008 by the Citadel development team.\n");
CtdlLogPrintf(CTDL_NOTICE,
"This program is distributed under the terms of the GNU "
"General Public License.\n");
/* on some dists rundir gets purged on startup. so we need to recreate it. */
if (stat(ctdl_run_dir, &filestats)==-1){
+#ifdef HAVE_GETPWUID_R
#ifdef SOLARIS_GETPWUID
pwp = getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf));
-#else
+#else // SOLARIS_GETPWUID
getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf), &pwp);
-#endif
+#endif // SOLARIS_GETPWUID
+#else // HAVE_GETPWUID_R
+ pwp = NULL;
+#endif // HAVE_GETPWUID_R
mkdir(ctdl_run_dir, 0755);
chown(ctdl_run_dir, config.c_ctdluid, (pwp==NULL)?-1:pw.pw_gid);
}
/*
* If we need host auth, start our chkpwd daemon.
*/
- if (config.c_auth_mode == 1) {
+ if (config.c_auth_mode == AUTHMODE_HOST) {
start_chkpwd_daemon();
}
if (drop_root_perms) {
cdb_chmod_data(); /* make sure we own our data files */
+#ifdef HAVE_GETPWUID_R
#ifdef SOLARIS_GETPWUID
pwp = getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf));
-#else
+#else // SOLARIS_GETPWUID
getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf), &pwp);
-#endif
+#endif // SOLARIS_GETPWUID
+#else // HAVE_GETPWUID_R
+ pwp = NULL;
+#endif // HAVE_GETPWUID_R
+
if (pwp == NULL)
CtdlLogPrintf(CTDL_CRIT, "WARNING: getpwuid(%ld): %s\n"
"Group IDs will be incorrect.\n", (long)CTDLUID,
master_cleanup(exit_signal);
return(0);
}
-
-
-
-void go_threading(void)
-{
- int i;
- struct CtdlThreadNode *last_worker;
-
- /*
- * Initialise the thread system
- */
- ctdl_thread_internal_init();
- /*
- * Now create a bunch of worker threads.
- */
- 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);
-
- /*
- * 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());
-
- /*
- * 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
- */
-
- while (CtdlThreadGetCount())
- {
- if (exit_signal)
- CtdlThreadStopAll();
- check_sched_shutdown();
- if (CT->state > CTDL_THREAD_STOP_REQ)
- {
- 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) && (CT->state > CTDL_THREAD_STOP_REQ))
- {
- /* Ask a worker thread to stop as we no longer need it */
- begin_critical_section(S_THREAD_LIST);
- last_worker = CtdlThreadList;
- while (last_worker)
- {
- pthread_mutex_lock(&last_worker->ThreadMutex);
- if (last_worker->flags & CTDLTHREAD_WORKER && last_worker->state > CTDL_THREAD_STOPPING)
- {
- pthread_mutex_unlock(&last_worker->ThreadMutex);
- break;
- }
- pthread_mutex_unlock(&last_worker->ThreadMutex);
- 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
- */
- /* 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) && (CtdlThreadGetWorkerAvg() > 60) && (CtdlThreadGetLoadAvg() < 90) && (CT->state > CTDL_THREAD_STOP_REQ))
- {
- 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);
- CtdlThreadCreate("Worker Thread",
- CTDLTHREAD_BIGSTACK + CTDLTHREAD_WORKER,
- worker_thread,
- NULL
- );
-// end_critical_section(S_THREAD_LIST);
- }
- }
-
- CtdlThreadGC();
-
- if (CtdlThreadGetCount() <= 1) // Shutting down clean up the garbage collector
- {
- CtdlThreadGC();
- }
-
- 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