* Shuffled around some of the housekeeping loop code

[citadel.git] / citadel / housekeeping.c

diff --git a/citadel/housekeeping.c b/citadel/housekeeping.c
index a16ce58a6d09a51542a5174311233b2a7b7d0410..34ca22092ed3f672bd290fba136420474d09b326 100644 (file)
--- a/citadel/housekeeping.c
+++ b/citadel/housekeeping.c
@@ -10,13 +10,23 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <fcntl.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <ctype.h>
 #include <string.h>
 #include <errno.h>
 #include <limits.h>
 #include <sys/types.h>
-#include <sys/time.h>
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
@@ -31,7 +41,6 @@
 #include "database.h"
 
 
-int housepipe[2];      /* This is the queue for housekeeping tasks */
 
 
 /*
@@ -66,7 +75,7 @@ void terminate_idle_sessions(void) {
 void check_sched_shutdown(void) {
        if ((ScheduledShutdown == 1) && (ContextList == NULL)) {
                lprintf(3, "Scheduled shutdown initiating.\n");
-               master_cleanup();
+               time_to_die = 1;
        }
 }
 
@@ -102,3 +111,42 @@ void check_ref_counts(void) {
        ForEachRoom(check_ref_counts_backend, NULL);
 }      
 
+/*
+ * 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.
+ */
+void do_housekeeping(void) {
+       static int housekeeping_in_progress = 0;
+       time_t last_timer = 0L;
+       int do_housekeeping_now = 0;
+
+       /*
+        * 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.
+        */
+       begin_critical_section(S_HOUSEKEEPING);
+       if ( ((time(NULL) - last_timer) > 60L)
+          && (housekeeping_in_progress == 0) ) {
+               do_housekeeping_now = 1;
+               housekeeping_in_progress = 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.
+        */
+
+       cdb_check_handles();                    /* suggested by Justin Case */
+       PerformSessionHooks(EVT_TIMER);         /* Run any timer hooks */
+
+       /*
+        * All done.
+        */
+       housekeeping_in_progress = 0;
+}