Clean up in housekeeping.c

Removed some unused variables and old comments.

diff --git a/citadel/housekeeping.c b/citadel/housekeeping.c
index bde6634b97689f85da0c64bbf5d9490e4db7bac6..a883b8f64775a813bc20fa702996375a0f702344 100644 (file)
--- a/citadel/housekeeping.c
+++ b/citadel/housekeeping.c
@@ -128,47 +128,24 @@ void check_ref_counts(void) {
 }      
 
 /*
- * This is the housekeeping loop.  Worker threads come through here after
- * processing client requests but before jumping back into the pool.  We
- * only allow housekeeping to execute once per minute, and we only allow one
- * instance to run at a time.
+ * This is the housekeeping thread. We
+ * only allow housekeeping to execute once per minute.
  */
 void *do_housekeeping(void *args) {
-       static int housekeeping_in_progress = 0;
        static time_t last_timer = 0L;
-       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
-        * S_HOUSEKEEPING critical section because it eliminates the need to
-        * potentially have multiple concurrent mutexes in progress.
-        */
        while (!CtdlThreadCheckStop())
        {
        CtdlThreadName("House keeping - sleeping");
        CtdlThreadSleep(1);
        
-/*     begin_critical_section(S_HOUSEKEEPING);
-       if (housekeeping_in_progress == 0) {
-               do_housekeeping_now = 1;
-               housekeeping_in_progress = 1;
-*/
                now = time(NULL);
                if ( (now - last_timer) > (time_t)60 ) {
                        do_perminute_housekeeping_now = 1;
                        last_timer = time(NULL);
                }
-/*
-       }
-       end_critical_section(S_HOUSEKEEPING);
-
-       if (do_housekeeping_now == 0) {
-               return;
-       }
-*/
        /*
         * Ok, at this point we've made the decision to run the housekeeping
         * loop.  Everything below this point is real work.
@@ -192,6 +169,5 @@ void *do_housekeeping(void *args) {
        /*
         * All done.
         */
-       housekeeping_in_progress = 0;
        return NULL;
 }