Citadel API clean up.

[citadel.git] / citadel / housekeeping.c

diff --git a/citadel/housekeeping.c b/citadel/housekeeping.c
index 788fd913bae76f7b6fcb3d71d53fe136cfefe529..742291c5a653338e16f48c66f787cf4f59f25b43 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
@@ -59,6 +57,7 @@ void terminate_idle_sessions(void) {
        time_t now;
        int session_to_kill;
        int killed = 0;
+       int longrunners = 0;
 
        now = time(NULL);
        session_to_kill = 0;
@@ -67,21 +66,27 @@ void terminate_idle_sessions(void) {
                if (  (ccptr!=CC)
                && (config.c_sleeping > 0)
                && (now - (ccptr->lastcmd) > config.c_sleeping) ) {
-                       ccptr->kill_me = 1;
-                       ++killed;
+                       if (!ccptr->dont_term) {
+                               ccptr->kill_me = 1;
+                               ++killed;
+                       }
+                       else 
+                               longrunners ++;
                }
        }
        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);
+       if (longrunners > 0)
+               CtdlLogPrintf(CTDL_INFO, "Didn't terminate %d protected 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();
        }
 }
 
@@ -106,13 +111,13 @@ 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;
        }
 
        cdb_begin_transaction();
-       ForEachRoom(check_ref_counts_backend, (void *)new_refcounts );
+       CtdlForEachRoom(check_ref_counts_backend, (void *)new_refcounts );
        cdb_end_transaction();
 
        for (a=0; a<MAXFLOORS; ++a) {
@@ -125,7 +130,7 @@ 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]);
        }
 }      
 
@@ -139,7 +144,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
@@ -147,11 +154,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);
                }
        }
@@ -166,11 +174,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);
 }