#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
+#include <libcitadel.h>
#include "citadel.h"
#include "server.h"
#include "sysdep_decls.h"
+#include "threads.h"
#include "citserver.h"
#include "config.h"
#include "database.h"
#include "file_ops.h"
#include "policy.h"
#include "control.h"
-#include "tools.h"
#include "euidindex.h"
#ifndef HAVE_SNPRINTF
#include "snprintf.h"
#endif
+#include "ctdl_module.h"
+
+
struct CitContext *ContextList = NULL;
struct CitContext* next_session = NULL;
char *unique_session_numbers;
lprintf(CTDL_INFO, "Opening databases\n");
open_databases();
+ ctdl_thread_internal_init_tsd();
+
+ CtdlThreadAllocTSD();
+
if (do_defrag) {
defrag_databases();
}
*/
void master_cleanup(int exitcode) {
struct CleanupFunctionHook *fcn;
- struct MaintenanceThreadHook *m_fcn;
static int already_cleaning_up = 0;
if (already_cleaning_up) while(1) sleep(1);
/* Close the AdjRefCount queue file */
AdjRefCount(-1, 0);
- for (m_fcn = MaintenanceThreadHookTable; m_fcn != NULL; m_fcn = m_fcn->next) {
- lprintf(CTDL_INFO, "Waiting for maintenance thread \"%s\" to shut down\n", m_fcn->name);
- pthread_join(m_fcn->MaintenanceThread_tid, NULL);
- }
+ /* Do system-dependent stuff */
+ sysdep_master_cleanup();
-
/* Close databases */
lprintf(CTDL_INFO, "Closing databases\n");
close_databases();
- /* Do system-dependent stuff */
- sysdep_master_cleanup();
-
#ifdef DEBUG_MEMORY_LEAKS
dump_heap();
#endif
cprintf("0\n"); /* 1 = no, this server is not LDAP-enabled */
#endif
- if (config.c_auth_mode == 1) {
- cprintf("1\n"); /* "create new user" never works with host auth */
+ if (config.c_auth_mode == AUTHMODE_NATIVE) {
+ cprintf("%d\n", config.c_disable_newu);
}
else {
- cprintf("%d\n", config.c_disable_newu); /* otherwise, site defined */
+ cprintf("1\n"); /* "create new user" does not work with non-native auth modes */
}
cprintf("%s\n", config.c_default_cal_zone);
-
+ /* Output load averages */
+ cprintf("%f\n", CtdlThreadLoadAvg);
+ cprintf("%f\n", CtdlThreadWorkerAvg);
+ cprintf("%d\n", CtdlThreadGetCount());
+
cprintf("000\n");
}
}
else
{
- cprintf(Reply, CIT_OK);
+ cprintf(Reply, CIT_OK + SERVER_SHUTTING_DOWN);
}
- time_to_die = 1;
+ CtdlThreadStopAll();
}
/*
if (CtdlAccessCheck(ac_aide)) return;
cprintf("%d Halting server. Goodbye.\n", CIT_OK);
- time_to_die = 1;
+ CtdlThreadStopAll();
shutdown_and_halt = 1;
}
*/
void do_command_loop(void) {
char cmdbuf[SIZ];
-
+ const char *old_name = NULL;
+
+ old_name = CtdlThreadName("do_command_loop");
+
time(&CC->lastcmd);
memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */
if (client_getln(cmdbuf, sizeof cmdbuf) < 1) {
lprintf(CTDL_ERR, "Client disconnected: ending session.\n");
CC->kill_me = 1;
+ CtdlThreadName(old_name);
return;
}
safestrncpy(CC->lastcmdname, cmdbuf, sizeof(CC->lastcmdname));
time(&CC->lastidle);
}
+
+ CtdlThreadName(cmdbuf);
if ((strncasecmp(cmdbuf, "ENT0", 4))
&& (strncasecmp(cmdbuf, "MESG", 4))
/* Run any after-each-command routines registered by modules */
PerformSessionHooks(EVT_CMD);
+ CtdlThreadName(old_name);
}