Backed out r5921 and r5936 because they were causing

[citadel.git] / citadel / housekeeping.c

diff --git a/citadel/housekeeping.c b/citadel/housekeeping.c
index c60bcbf94da28dd46ddc804d236c5737a9f537d7..742fb861bdba9f68eef2e69735c25befb2303d81 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,15 +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;
+               CtdlLogPrintf(CTDL_NOTICE, "Scheduled shutdown initiating.\n");
+               CtdlThreadStopAll();
        }
 }
 
@@ -90,33 +88,43 @@ void check_sched_shutdown(void) {
 /*
  * Check (and fix) floor reference counts.  This doesn't need to be done
  * very often, since the counts should remain correct during normal operation.
- * NOTE: this function pair should ONLY be called during startup.  It is NOT
- * thread safe.
  */
 void check_ref_counts_backend(struct ctdlroom *qrbuf, void *data) {
-       struct floor flbuf;
 
-       getfloor(&flbuf, qrbuf->QRfloor);
-       ++flbuf.f_ref_count;
-       flbuf.f_flags = flbuf.f_flags | QR_INUSE;
-       putfloor(&flbuf, qrbuf->QRfloor);
+       int *new_refcounts;
+
+       new_refcounts = (int *) data;
+
+       ++new_refcounts[(int)qrbuf->QRfloor];
 }
 
 void check_ref_counts(void) {
        struct floor flbuf;
        int a;
 
-       lprintf(CTDL_DEBUG, "Checking floor reference counts\n");
+       int new_refcounts[MAXFLOORS];
+
+       CtdlLogPrintf(CTDL_DEBUG, "Checking floor reference counts\n");
        for (a=0; a<MAXFLOORS; ++a) {
-               getfloor(&flbuf, a);
-               flbuf.f_ref_count = 0;
-               flbuf.f_flags = flbuf.f_flags & ~QR_INUSE;
-               putfloor(&flbuf, a);
+               new_refcounts[a] = 0;
        }
 
        cdb_begin_transaction();
-       ForEachRoom(check_ref_counts_backend, NULL);
+       ForEachRoom(check_ref_counts_backend, (void *)new_refcounts );
        cdb_end_transaction();
+
+       for (a=0; a<MAXFLOORS; ++a) {
+               lgetfloor(&flbuf, a);
+               flbuf.f_ref_count = new_refcounts[a];
+               if (new_refcounts[a] > 0) {
+                       flbuf.f_flags = flbuf.f_flags | QR_INUSE;
+               }
+               else {
+                       flbuf.f_flags = flbuf.f_flags & ~QR_INUSE;
+               }
+               lputfloor(&flbuf, a);
+               CtdlLogPrintf(CTDL_DEBUG, "Floor %d: %d rooms\n", a, new_refcounts[a]);
+       }
 }      
 
 /*
@@ -129,7 +137,9 @@ void do_housekeeping(void) {
        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
@@ -137,11 +147,12 @@ void do_housekeeping(void) {
         * 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;
+       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);
                }
        }
@@ -156,11 +167,23 @@ void do_housekeeping(void) {
         * 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... */
+       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 */
+       }
 
        /*
         * All done.
         */
        housekeeping_in_progress = 0;
+       CtdlThreadName(old_name);
 }