Began removing $Id$ tags. This will be an ongoing process.

[citadel.git] / citadel / housekeeping.c

diff --git a/citadel/housekeeping.c b/citadel/housekeeping.c
index 1dd18d61e82532a12556f58baf8cba923eaa128a..0b2f2464d4ce8eb829ad14cfa8f60ce2f219cefc 100644 (file)
--- a/citadel/housekeeping.c
+++ b/citadel/housekeeping.c
@@ -1,8 +1,5 @@
 /*
- * $Id$
- *
  * This file contains miscellaneous housekeeping tasks.
- *
  */
 
 #include "sysdep.h"
@@ -44,41 +41,11 @@
 #include "journaling.h"
 
 #include "ctdl_module.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
- * idle session is found it is terminated, then the search restarts at the
- * beginning because the pointer to our place in the list becomes invalid.
- */
-void terminate_idle_sessions(void) {
-       struct CitContext *ccptr;
-       time_t now;
-       int session_to_kill;
-       int killed = 0;
-
-       now = time(NULL);
-       session_to_kill = 0;
-       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) ) {
-                       ccptr->kill_me = 1;
-                       ++killed;
-               }
-       }
-       end_critical_section(S_SESSION_TABLE);
-       if (killed > 0)
-               lprintf(CTDL_INFO, "Terminated %d idle sessions\n", killed);
-}
-
-
+#include "threads.h"
 
 void check_sched_shutdown(void) {
        if ((ScheduledShutdown == 1) && (ContextList == NULL)) {
-               lprintf(CTDL_NOTICE, "Scheduled shutdown initiating.\n");
+               CtdlLogPrintf(CTDL_NOTICE, "Scheduled shutdown initiating.\n");
                CtdlThreadStopAll();
        }
 }
@@ -104,13 +71,13 @@ void check_ref_counts(void) {
 
        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) {
@@ -123,7 +90,7 @@ void check_ref_counts(void) {
                        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]);
        }
 }      
 
@@ -139,6 +106,7 @@ void do_housekeeping(void) {
        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
@@ -167,13 +135,16 @@ void do_housekeeping(void) {
         */
 
        /* 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 */
        }
 
@@ -181,4 +152,5 @@ void do_housekeeping(void) {
         * All done.
         */
        housekeeping_in_progress = 0;
+       CtdlThreadName(old_name);
 }