Moved all threading code into threads.c

[citadel.git] / citadel / housekeeping.c

diff --git a/citadel/housekeeping.c b/citadel/housekeeping.c
index b0d4a1d265c93b1b977f3a1678224dc153864cd1..742fb861bdba9f68eef2e69735c25befb2303d81 100644 (file)
--- a/citadel/housekeeping.c
+++ b/citadel/housekeeping.c
@@ -44,7 +44,7 @@
 #include "journaling.h"
 
 #include "ctdl_module.h"
-
+#include "threads.h"
 
 /*
  * Terminate idle sessions.  This function pounds through the session table
@@ -139,6 +139,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 +168,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 +185,5 @@ void do_housekeeping(void) {
         * All done.
         */
        housekeeping_in_progress = 0;
+       CtdlThreadName(old_name);
 }