#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h>
#endif
-#include "tools.h"
+#include <libcitadel.h>
#include "citadel.h"
#include "server.h"
#include "serv_extensions.h"
#include "msgbase.h"
#include "journaling.h"
+#include "ctdl_module.h"
+#include "threads.h"
+
/*
* Terminate idle sessions. This function pounds through the session table
* comparing the current time to each session's time-of-last-command. If an
time_t now;
int session_to_kill;
int killed = 0;
+ int longrunners = 0;
now = time(NULL);
session_to_kill = 0;
if ( (ccptr!=CC)
&& (config.c_sleeping > 0)
&& (now - (ccptr->lastcmd) > config.c_sleeping) ) {
- ccptr->kill_me = 1;
- ++killed;
+ if (!ccptr->dont_term) {
+ ccptr->kill_me = 1;
+ ++killed;
+ }
+ else
+ longrunners ++;
}
}
end_critical_section(S_SESSION_TABLE);
if (killed > 0)
- lprintf(CTDL_INFO, "Terminated %d idle sessions\n", killed);
+ CtdlLogPrintf(CTDL_INFO, "Terminated %d idle sessions\n", killed);
+ if (longrunners > 0)
+ CtdlLogPrintf(CTDL_INFO, "Didn't terminate %d protected idle sessions;\n", killed);
}
void check_sched_shutdown(void) {
if ((ScheduledShutdown == 1) && (ContextList == NULL)) {
- lprintf(CTDL_NOTICE, "Scheduled shutdown initiating.\n");
- time_to_die = 1;
- master_cleanup(0);
+ CtdlLogPrintf(CTDL_NOTICE, "Scheduled shutdown initiating.\n");
+ CtdlThreadStopAll();
}
}
int new_refcounts[MAXFLOORS];
- lprintf(CTDL_DEBUG, "Checking floor reference counts\n");
+ CtdlLogPrintf(CTDL_DEBUG, "Checking floor reference counts\n");
for (a=0; a<MAXFLOORS; ++a) {
new_refcounts[a] = 0;
}
cdb_begin_transaction();
- ForEachRoom(check_ref_counts_backend, (void *)new_refcounts );
+ CtdlForEachRoom(check_ref_counts_backend, (void *)new_refcounts );
cdb_end_transaction();
for (a=0; a<MAXFLOORS; ++a) {
flbuf.f_flags = flbuf.f_flags & ~QR_INUSE;
}
lputfloor(&flbuf, a);
- lprintf(CTDL_DEBUG, "Floor %d: %d rooms\n", a, new_refcounts[a]);
+ CtdlLogPrintf(CTDL_DEBUG, "Floor %d: %d rooms\n", a, new_refcounts[a]);
}
}
int do_housekeeping_now = 0;
int do_perminute_housekeeping_now = 0;
time_t now;
+ const char *old_name;
/*
* We do it this way instead of wrapping the whole loop in an
*/
/* First, do the "as often as needed" stuff... */
+ old_name = CtdlThreadName("House Keeping - Journal");
JournalRunQueue();
+ CtdlThreadName("House Keeping - EVT_HOUSE");
PerformSessionHooks(EVT_HOUSE); /* perform as needed housekeeping */
/* Then, do the "once per minute" stuff... */
if (do_perminute_housekeeping_now) {
cdb_check_handles(); /* suggested by Justin Case */
+ CtdlThreadName("House Keeping - EVT_TIMER");
PerformSessionHooks(EVT_TIMER); /* Run any timer hooks */
}
* All done.
*/
housekeeping_in_progress = 0;
+ CtdlThreadName(old_name);
}