fixes for BSDI. see ChangeLog.

[citadel.git] / citadel / housekeeping.c

diff --git a/citadel/housekeeping.c b/citadel/housekeeping.c
index bff8910878a0dcf7a64f999b867420f1b730d143..d273298b82b697aed007029f2d239918a1555da9 100644 (file)
--- a/citadel/housekeeping.c
+++ b/citadel/housekeeping.c
@@ -2,8 +2,10 @@
  * This file contains housekeeping tasks which periodically
  * need to be executed.
  *
+ * $Id$
  */
 
+#include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -11,7 +13,10 @@
 #include <ctype.h>
 #include <string.h>
 #include <errno.h>
+#include <limits.h>
+#ifdef HAVE_PTHREAD_H
 #include <pthread.h>
+#endif
 #include "citadel.h"
 #include "server.h"
 #include "citserver.h"
@@ -29,17 +34,29 @@
 void terminate_idle_sessions(void) {
        struct CitContext *ccptr;
        time_t now;
-       
-       time(&now);
-       for (ccptr = ContextList; ccptr != NULL; ccptr = ccptr->next) {
-               if (  (ccptr!=CC)
-                  && (config.c_sleeping > 0)
-                  && (now - (ccptr->lastcmd) > config.c_sleeping) ) {
-                       lprintf(3, "Session %d timed out\n", ccptr->cs_pid);
-                       kill_session(ccptr->cs_pid);
-                       ccptr = ContextList;
+       int session_to_kill;
+
+       do {
+               now = time(NULL);
+               session_to_kill = 0;
+               lprintf(9, "Scanning for timed out sessions...\n");
+               begin_critical_section(S_SESSION_TABLE);
+               for (ccptr = ContextList; ccptr != NULL; ccptr = ccptr->next) {
+                       if (  (ccptr!=CC)
+                       && (config.c_sleeping > 0)
+                       && (now - (ccptr->lastcmd) > config.c_sleeping) ) {
+                               session_to_kill = ccptr->cs_pid;
+                               }
                        }
-               }
+               end_critical_section(S_SESSION_TABLE);
+               lprintf(9, "...done scanning.\n");
+               if (session_to_kill > 0) {
+                       lprintf(3, "Session %d timed out.  Terminating it...\n",
+                               session_to_kill);
+                       kill_session(session_to_kill);
+                       lprintf(9, "...done terminating it.\n");
+                       }
+               } while(session_to_kill > 0);
        }
 
 
@@ -48,12 +65,14 @@ void terminate_idle_sessions(void) {
  */
 void do_housekeeping(void) {
 
+       lprintf(9, "--- begin housekeeping ---\n");
        begin_critical_section(S_HOUSEKEEPING);
        /*
         * Terminate idle sessions.
         */
        lprintf(7, "Calling terminate_idle_sessions()\n");
        terminate_idle_sessions();
+       lprintf(9, "Done with terminate_idle_sessions()\n");
 
        /*
         * If the server is scheduled to shut down the next time all
@@ -64,6 +83,7 @@ void do_housekeeping(void) {
                master_cleanup();
                }
        end_critical_section(S_HOUSEKEEPING);
+       lprintf(9, "--- end housekeeping ---\n");
        }
 
 
@@ -71,27 +91,29 @@ void do_housekeeping(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 quickroom *qrbuf) {
+       struct floor flbuf;
+
+       getfloor(&flbuf, qrbuf->QRfloor);
+       ++flbuf.f_ref_count;
+       flbuf.f_flags = flbuf.f_flags | QR_INUSE;
+       putfloor(&flbuf, qrbuf->QRfloor);
+       }
+
 void check_ref_counts(void) {
-       int ref[MAXFLOORS];
-       struct quickroom qrbuf;
        struct floor flbuf;
        int a;
 
-       for (a=0; a<MAXFLOORS; ++a) ref[a] = 0;
-               
-       for (a=0; a<MAXROOMS; ++a) {
-               getroom(&qrbuf, a);
-               if (qrbuf.QRflags & QR_INUSE) {
-                       ++ref[(int)qrbuf.QRfloor];
-                       }
-               }
-
        for (a=0; a<MAXFLOORS; ++a) {
-               lgetfloor(&flbuf, a);
-               flbuf.f_ref_count = ref[a];
-               if (ref[a] > 0) flbuf.f_flags = flbuf.f_flags | QR_INUSE ;
-               lputfloor(&flbuf, a);
+               getfloor(&flbuf, a);
+               flbuf.f_ref_count = 0;
+               flbuf.f_flags = flbuf.f_flags & ~QR_INUSE;
+               putfloor(&flbuf, a);
                }
+
+       ForEachRoom(check_ref_counts_backend);
        }