Clean up in housekeeping.c

[citadel.git] / citadel / housekeeping.c

diff --git a/citadel/housekeeping.c b/citadel/housekeeping.c
index 1b8deeb9a264359939af70fa54815864fb6e81e6..a883b8f64775a813bc20fa702996375a0f702344 100644 (file)
--- a/citadel/housekeeping.c
+++ b/citadel/housekeeping.c
@@ -5,10 +5,6 @@
  *
  */
 
-#ifdef DLL_EXPORT
-#define IN_LIBCIT
-#endif
-
 #include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
@@ -34,7 +30,7 @@
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
-#include "tools.h"
+#include <libcitadel.h>
 #include "citadel.h"
 #include "server.h"
 #include "serv_extensions.h"
@@ -44,9 +40,11 @@
 #include "sysdep_decls.h"
 #include "room_ops.h"
 #include "database.h"
+#include "msgbase.h"
+#include "journaling.h"
 
-
-
+#include "ctdl_module.h"
+#include "threads.h"
 
 /*
  * Terminate idle sessions.  This function pounds through the session table
@@ -73,16 +71,15 @@ void terminate_idle_sessions(void) {
        }
        end_critical_section(S_SESSION_TABLE);
        if (killed > 0)
-               lprintf(CTDL_INFO, "Terminated %d idle sessions\n", killed);
+               CtdlLogPrintf(CTDL_INFO, "Terminated %d idle sessions\n", killed);
 }
 
 
 
 void check_sched_shutdown(void) {
        if ((ScheduledShutdown == 1) && (ContextList == NULL)) {
-               lprintf(CTDL_NOTICE, "Scheduled shutdown initiating.\n");
-               time_to_die = 1;
-               master_cleanup();
+               CtdlLogPrintf(CTDL_NOTICE, "Scheduled shutdown initiating.\n");
+               CtdlThreadStopAll();
        }
 }
 
@@ -107,7 +104,7 @@ 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;
        }
@@ -126,52 +123,51 @@ 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]);
        }
 }      
 
 /*
- * 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) {
-       static int housekeeping_in_progress = 0;
+void *do_housekeeping(void *args) {
        static time_t last_timer = 0L;
-       int do_housekeeping_now = 0;
+       int do_perminute_housekeeping_now = 0;
        time_t now;
 
-       /*
-        * 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);
-       now = time(NULL);
-       if ( (now - last_timer) > (time_t)60 ) {
-               if (housekeeping_in_progress == 0) {
-                       do_housekeeping_now = 1;
-                       housekeeping_in_progress = 1;
+       while (!CtdlThreadCheckStop())
+       {
+       CtdlThreadName("House keeping - sleeping");
+       CtdlThreadSleep(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.
         */
 
-       cdb_check_handles();                    /* suggested by Justin Case */
-       PerformSessionHooks(EVT_TIMER);         /* Run any timer hooks */
+       /* First, do the "as often as needed" stuff... */
+       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) {
+               do_perminute_housekeeping_now = 0;
+               cdb_check_handles();                    /* suggested by Justin Case */
+               CtdlThreadName("House Keeping - EVT_TIMER");
+               PerformSessionHooks(EVT_TIMER);         /* Run any timer hooks */
+       }
+       }
        /*
         * All done.
         */
-       housekeeping_in_progress = 0;
+       return NULL;
 }