#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"
/*
}
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);
}
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;
}
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_perminute_housekeeping_now = 0;
time_t now;
+ CtdlThreadPushName("do_housekeeping");
+
/*
* We do it this way instead of wrapping the whole loop in an
* S_HOUSEKEEPING critical section because it eliminates the need to
end_critical_section(S_HOUSEKEEPING);
if (do_housekeeping_now == 0) {
+ CtdlThreadPopName();
return;
}
/* First, do the "as often as needed" stuff... */
JournalRunQueue();
+ 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 */
* All done.
*/
housekeeping_in_progress = 0;
+ CtdlThreadPopName();
}