* This file contains housekeeping tasks which periodically
* need to be executed.
*
+ * $Id$
*/
+#include "sysdep.h"
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
#include <ctype.h>
#include <string.h>
#include <errno.h>
+#include <limits.h>
+#ifdef HAVE_PTHREAD_H
#include <pthread.h>
+#endif
#include "citadel.h"
#include "server.h"
#include "citserver.h"
void terminate_idle_sessions(void) {
struct CitContext *ccptr;
time_t now;
-
- time(&now);
- for (ccptr = ContextList; ccptr != NULL; ccptr = ccptr->next) {
- if ( (ccptr!=CC)
- && (config.c_sleeping > 0)
- && (now - (ccptr->lastcmd) > config.c_sleeping) ) {
- lprintf(3, "Session %d timed out\n", ccptr->cs_pid);
- kill_session(ccptr->cs_pid);
- ccptr = ContextList;
+ int session_to_kill;
+
+ do {
+ now = time(NULL);
+ session_to_kill = 0;
+ lprintf(9, "Scanning for timed out sessions...\n");
+ begin_critical_section(S_SESSION_TABLE);
+ for (ccptr = ContextList; ccptr != NULL; ccptr = ccptr->next) {
+ if ( (ccptr!=CC)
+ && (config.c_sleeping > 0)
+ && (now - (ccptr->lastcmd) > config.c_sleeping) ) {
+ session_to_kill = ccptr->cs_pid;
+ }
}
- }
+ end_critical_section(S_SESSION_TABLE);
+ lprintf(9, "...done scanning.\n");
+ if (session_to_kill > 0) {
+ lprintf(3, "Session %d timed out. Terminating it...\n",
+ session_to_kill);
+ kill_session(session_to_kill);
+ lprintf(9, "...done terminating it.\n");
+ }
+ } while(session_to_kill > 0);
}
*/
void do_housekeeping(void) {
+ lprintf(9, "--- begin housekeeping ---\n");
begin_critical_section(S_HOUSEKEEPING);
/*
* Terminate idle sessions.
*/
lprintf(7, "Calling terminate_idle_sessions()\n");
terminate_idle_sessions();
+ lprintf(9, "Done with terminate_idle_sessions()\n");
/*
* If the server is scheduled to shut down the next time all
master_cleanup();
}
end_critical_section(S_HOUSEKEEPING);
+ lprintf(9, "--- end housekeeping ---\n");
}
void check_ref_counts_backend(struct quickroom *qrbuf) {
struct floor flbuf;
- lgetfloor(&flbuf, qrbuf->QRfloor);
+ getfloor(&flbuf, qrbuf->QRfloor);
++flbuf.f_ref_count;
flbuf.f_flags = flbuf.f_flags | QR_INUSE;
- lputfloor(&flbuf, qrbuf->QRfloor);
+ putfloor(&flbuf, qrbuf->QRfloor);
}
void check_ref_counts(void) {
int a;
for (a=0; a<MAXFLOORS; ++a) {
- lgetfloor(&flbuf, a);
+ getfloor(&flbuf, a);
flbuf.f_ref_count = 0;
flbuf.f_flags = flbuf.f_flags & ~QR_INUSE;
- lputfloor(&flbuf, a);
+ putfloor(&flbuf, a);
}
ForEachRoom(check_ref_counts_backend);