#include <errno.h>
#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 <libcitadel.h>
#include "citadel.h"
#include "server.h"
#include "serv_extensions.h"
#include "citserver.h"
#include "support.h"
#include "config.h"
+#include "control.h"
#include "database.h"
+#include "user_ops.h"
#include "housekeeping.h"
-#include "tools.h"
+#include "citadel_dirs.c"
+
+#include "modules_init.h"
+#include "ecrash.h"
#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h>
#ifndef HAVE_SNPRINTF
#include "snprintf.h"
#endif
+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 tracefile[128]; /* Name of file to log traces to */
- int a, i; /* General-purpose variables */
- struct passwd *pw;
+ char facility[32];
+ int a; /* General-purpose variables */
+ struct passwd pw, *pwp = NULL;
+ char pwbuf[SIZ];
int drop_root_perms = 1;
- struct worker_node *wnp;
size_t size;
-
- /* specify default port name and trace file */
- strcpy(tracefile, "");
-
+ int relh=0;
+ int home=0;
+ int dbg=0;
+ char relhome[PATH_MAX]="";
+ char ctdldir[PATH_MAX]=CTDLDIR;
+#ifdef HAVE_RUN_DIR
+ struct stat filestats;
+#endif
+#ifdef HAVE_BACKTRACE
+ eCrashParameters params;
+// eCrashSymbolTable symbol_table;
+#endif
+ /* initialise semaphores here. Patch by Matt and davew
+ * its called here as they are needed by lprintf for thread safety
+ */
+ CtdlInitBase64Table();
+ InitialiseSemaphores();
+
/* initialize the master context */
InitializeMasterCC();
/* parse command-line arguments */
for (a=1; a<argc; ++a) {
- /* -t specifies where to log trace messages to */
- if (!strncmp(argv[a], "-t", 2)) {
- safestrncpy(tracefile, argv[a], sizeof tracefile);
- strcpy(tracefile, &tracefile[2]);
- freopen(tracefile, "r", stdin);
- freopen(tracefile, "w", stdout);
- freopen(tracefile, "w", stderr);
- chmod(tracefile, 0600);
- }
-
- else if (!strncmp(argv[a], "-l", 2)) {
- safestrncpy(tracefile, argv[a], sizeof tracefile);
- strcpy(tracefile, &tracefile[2]);
- syslog_facility = SyslogFacility(tracefile);
- if (syslog_facility >= 0) {
- openlog("citadel", LOG_PID, syslog_facility);
- }
+ if (!strncmp(argv[a], "-l", 2)) {
+ safestrncpy(facility, &argv[a][2], sizeof(facility));
+ syslog_facility = SyslogFacility(facility);
+ enable_syslog = 1;
}
/* run in the background if -d was specified */
else if (!strcmp(argv[a], "-d")) {
- start_daemon( (strlen(tracefile) > 0) ? 0 : 1 ) ;
+ running_as_daemon = 1;
}
/* -x specifies the desired logging level */
}
else if (!strncmp(argv[a], "-h", 2)) {
- safestrncpy(bbs_home_directory, &argv[a][2],
- sizeof bbs_home_directory);
+ relh=argv[a][2]!='/';
+ if (!relh) safestrncpy(ctdl_home_directory, &argv[a][2],
+ sizeof ctdl_home_directory);
+ else
+ safestrncpy(relhome, &argv[a][2],
+ sizeof relhome);
home_specified = 1;
+ home=1;
+ }
+
+ else if (!strncmp(argv[a], "-t", 2)) {
+ 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;
+ }
+
/* -r tells the server not to drop root permissions. don't use
* this unless you know what you're doing. this should be
* removed in the next release if it proves unnecessary. */
/* any other parameter makes it crash and burn */
else {
lprintf(CTDL_EMERG, "citserver: usage: "
- "citserver [-tTraceFile] "
+ "citserver "
"[-lLogFacility] "
- "[-d] [-f]"
+ "[-d] [-f] [-D] "
+ " [-tTraceFile]"
" [-xLogLevel] [-hHomeDir]\n");
exit(1);
}
}
+ calc_dirs_n_files(relh, home, relhome, ctdldir, dbg);
+ /* daemonize, if we were asked to */
+ if (running_as_daemon) {
+ start_daemon(0);
+ drop_root_perms = 1;
+ }
+
+#ifdef HAVE_BACKTRACE
+ bzero(¶ms, sizeof(params));
+ params.filename = file_pid_paniclog;
+ panic_fd=open(file_pid_paniclog, O_APPEND|O_CREAT|O_DIRECT);
+ params.filep = fopen(file_pid_paniclog, "a+");
+ 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
+ * facilities when we need to...
+ */
+ if (enable_syslog) {
+ openlog("citadel", LOG_NDELAY, 0);
+ setlogmask(LOG_UPTO(verbosity));
+ }
+
/* Tell 'em who's in da house */
lprintf(CTDL_NOTICE, "\n");
lprintf(CTDL_NOTICE, "\n");
lprintf(CTDL_NOTICE,
- "*** Citadel/UX messaging server engine v%d.%02d ***\n",
+ "*** Citadel server engine v%d.%02d ***\n",
(REV_LEVEL/100), (REV_LEVEL%100));
lprintf(CTDL_NOTICE,
- "Copyright (C) 1987-2003 by the Citadel/UX development team.\n");
+ "Copyright (C) 1987-2007 by the Citadel development team.\n");
lprintf(CTDL_NOTICE,
"This program is distributed under the terms of the GNU "
"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");
config.c_ipgm_secret = rand();
put_config();
+#ifdef HAVE_RUN_DIR
+ /* on some dists rundir gets purged on startup. so we need to recreate it. */
+
+ if (stat(ctdl_run_dir, &filestats)==-1){
+#ifdef SOLARIS_GETPWUID
+ pwp = getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf));
+#else
+ getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf), &pwp);
+#endif
+ mkdir(ctdl_run_dir, 0755);
+ chown(ctdl_run_dir, config.c_ctdluid, (pwp==NULL)?-1:pw.pw_gid);
+ }
+
+
+#endif
+
/* Initialize... */
init_sysdep();
*/
master_startup();
+ lprintf(CTDL_INFO, "Acquiring control record\n");
+ get_control();
+
/*
* Bind the server to a Unix-domain socket.
*/
CtdlRegisterServiceHook(0,
- "citadel.socket",
+ file_citadel_socket,
citproto_begin_session,
- do_command_loop);
+ do_command_loop,
+ do_async_loop,
+ CitadelServiceUDS);
/*
* Bind the server to our favorite TCP port (usually 504).
CtdlRegisterServiceHook(config.c_port_number,
NULL,
citproto_begin_session,
- do_command_loop);
+ do_command_loop,
+ do_async_loop,
+ CitadelServiceTCP);
/*
* Load any server-side extensions available here.
*/
lprintf(CTDL_INFO, "Initializing server extensions\n");
- size = strlen(bbs_home_directory) + 9;
- initialize_server_extensions();
+ size = strlen(ctdl_home_directory) + 9;
+
+ initialise_modules(0);
+
+
/*
- * The rescan pipe exists so that worker threads can be woken up and
- * told to re-scan the context list for fd's to listen on. This is
- * necessary, for example, when a context is about to go idle and needs
- * to get back on that list.
+ * If we need host auth, start our chkpwd daemon.
*/
- if (pipe(rescan)) {
- lprintf(CTDL_EMERG, "Can't create rescan pipe!\n");
- exit(errno);
+ if (config.c_auth_mode == 1) {
+ start_chkpwd_daemon();
}
- init_master_fdset();
-
/*
- * Now that we've bound the sockets, change to the BBS user id and its
+ * Now that we've bound the sockets, change to the Citadel user id and its
* corresponding group ids
*/
if (drop_root_perms) {
- if ((pw = getpwuid(BBSUID)) == NULL)
+ cdb_chmod_data(); /* make sure we own our data files */
+
+#ifdef SOLARIS_GETPWUID
+ pwp = getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf));
+#else
+ getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf), &pwp);
+#endif
+ if (pwp == NULL)
lprintf(CTDL_CRIT, "WARNING: getpwuid(%ld): %s\n"
- "Group IDs will be incorrect.\n", (long)BBSUID,
+ "Group IDs will be incorrect.\n", (long)CTDLUID,
strerror(errno));
else {
- initgroups(pw->pw_name, pw->pw_gid);
- if (setgid(pw->pw_gid))
- lprintf(CTDL_CRIT, "setgid(%ld): %s\n", (long)pw->pw_gid,
+ initgroups(pw.pw_name, pw.pw_gid);
+ if (setgid(pw.pw_gid))
+ lprintf(CTDL_CRIT, "setgid(%ld): %s\n", (long)pw.pw_gid,
strerror(errno));
}
- lprintf(CTDL_INFO, "Changing uid to %ld\n", (long)BBSUID);
- if (setuid(BBSUID) != 0) {
+ lprintf(CTDL_INFO, "Changing uid to %ld\n", (long)CTDLUID);
+ if (setuid(CTDLUID) != 0) {
lprintf(CTDL_CRIT, "setuid() failed: %s\n", strerror(errno));
}
+#if defined (HAVE_SYS_PRCTL_H) && defined (PR_SET_DUMPABLE)
+ prctl(PR_SET_DUMPABLE, 1);
+#endif
}
/* 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);
-
- /* Now this thread can become a worker as well. */
- initial_thread = pthread_self();
- worker_thread(NULL);
-
- /* Server is exiting. Wait for workers to shutdown. */
- lprintf(CTDL_INFO, "Waiting for worker threads to shut down\n");
-
- begin_critical_section(S_WORKER_LIST);
- while (worker_list != NULL) {
- wnp = worker_list;
- worker_list = wnp->next;
-
- /* avoid deadlock with an exiting thread */
- end_critical_section(S_WORKER_LIST);
- if ((i = pthread_join(wnp->tid, NULL)))
- lprintf(CTDL_CRIT, "pthread_join: %s\n", strerror(i));
- free(wnp);
- begin_critical_section(S_WORKER_LIST);
- }
- 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);
- master_cleanup();
- return(0);
+ /*
+ * 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();
+ 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)
+ {
+ 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) )
+ {
+ 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