X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserver_main.c;h=9bd9be89e8ebfd21468f6bc1a95b2ad5f6a61604;hb=HEAD;hp=20bc5dddf0629e0b2912e60a5a7fe2fa0b90302e;hpb=5abf3d0c3343809374a116cbe23c808a81a780c4;p=citadel.git

diff --git a/citadel/server_main.c b/citadel/server_main.c
deleted file mode 100644
index 20bc5dddf..000000000
--- a/citadel/server_main.c
+++ /dev/null
@@ -1,459 +0,0 @@
-/*
- * citserver's main() function lives here.
- *
- * $Id$
- */
-
-#include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <ctype.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <syslog.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
-
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/un.h>
-#include <string.h>
-#include <pwd.h>
-#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 "sysdep_decls.h"
-#include "citserver.h"
-#include "support.h"
-#include "config.h"
-#include "control.h"
-#include "database.h"
-#include "user_ops.h"
-#include "housekeeping.h"
-#include "citadel_dirs.c"
-
-#include "modules_init.h"
-#include "ecrash.h"
-
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-
-#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 facility[32];
-	int a;			/* General-purpose variables */
-	struct passwd pw, *pwp = NULL;
-	char pwbuf[SIZ];
-	int drop_root_perms = 1;
-	size_t size;
-	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 CtdlLogPrintf for thread safety
-	 */
-	CtdlInitBase64Table();
-	InitialiseSemaphores();
-	
-	/* initialize the master context */
-	InitializeMasterCC();
-
-	/* parse command-line arguments */
-	for (a=1; a<argc; ++a) {
-
-		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")) {
-			running_as_daemon = 1;
-		}
-
-		/* -x specifies the desired logging level */
-		else if (!strncmp(argv[a], "-x", 2)) {
-			verbosity = atoi(&argv[a][2]);
-		}
-
-		else if (!strncmp(argv[a], "-h", 2)) {
-			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. */
-		else if (!strcmp(argv[a], "-r"))
-			drop_root_perms = 0;
-
-		/* any other parameter makes it crash and burn */
-		else {
-			CtdlLogPrintf(CTDL_EMERG,	"citserver: usage: "
-					"citserver "
-					"[-lLogFacility] "
-					"[-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(&params, 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(&params);
-		
-	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 */
-	CtdlLogPrintf(CTDL_NOTICE, "\n");
-	CtdlLogPrintf(CTDL_NOTICE, "\n");
-	CtdlLogPrintf(CTDL_NOTICE,
-		"*** 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");
-	CtdlLogPrintf(CTDL_NOTICE,
-		"This program is distributed under the terms of the GNU "
-		"General Public License.\n");
-	CtdlLogPrintf(CTDL_NOTICE, "\n");
-	CtdlLogPrintf(CTDL_DEBUG, "Called as: %s\n", argv[0]);
-	CtdlLogPrintf(CTDL_INFO, "%s\n", libcitadel_version_string());
-
-	/* Load site-specific parameters, and set the ipgm secret */
-	CtdlLogPrintf(CTDL_INFO, "Loading citadel.config\n");
-	get_config();
-	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();
-
-	/*
-	 * Do non system dependent startup functions.
-	 */
-	master_startup();
-
-	CtdlLogPrintf(CTDL_INFO, "Acquiring control record\n");
-	get_control();
-
-	/*
-	 * Bind the server to a Unix-domain socket.
-	 */
-	CtdlRegisterServiceHook(0,
-				file_citadel_socket,
-				citproto_begin_session,
-				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_async_loop,
-				CitadelServiceTCP);
-
-				
-	/*
-	 * Run any upgrade entry points
-	 */
-	CtdlLogPrintf(CTDL_INFO, "Upgrading modules.\n");
-	upgrade_modules();
-	
-	
-	/*
-	 * Load any server-side extensions available here.
-	 */
-	CtdlLogPrintf(CTDL_INFO, "Initializing server extensions\n");
-	size = strlen(ctdl_home_directory) + 9;
-	
-	initialise_modules(0);
-	
-	
-
-	/*
-	 * If we need host auth, start our chkpwd daemon.
-	 */
-	if (config.c_auth_mode == 1) {
-		start_chkpwd_daemon();
-	}
-
-	/*
-	 * Now that we've bound the sockets, change to the Citadel user id and its
-	 * corresponding group ids
-	 */
-	if (drop_root_perms) {
-		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)
-			CtdlLogPrintf(CTDL_CRIT, "WARNING: getpwuid(%ld): %s\n"
-				   "Group IDs will be incorrect.\n", (long)CTDLUID,
-				strerror(errno));
-		else {
-			initgroups(pw.pw_name, pw.pw_gid);
-			if (setgid(pw.pw_gid))
-				CtdlLogPrintf(CTDL_CRIT, "setgid(%ld): %s\n", (long)pw.pw_gid,
-					strerror(errno));
-		}
-		CtdlLogPrintf(CTDL_INFO, "Changing uid to %ld\n", (long)CTDLUID);
-		if (setuid(CTDLUID) != 0) {
-			CtdlLogPrintf(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;
-	
-	/*
-	 * 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();
-		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();
-}