*** empty log message ***

[citadel.git] / citadel / housekeeping.c

diff --git a/citadel/housekeeping.c b/citadel/housekeeping.c
index 5cfea179ae84809a1bfb41c9345dd676dbcb213a..09dbad4eb143aca6d3b3fb76b22dcb9706d6823c 100644 (file)
--- a/citadel/housekeeping.c
+++ b/citadel/housekeeping.c
@@ -5,6 +5,10 @@
  *
  */
 
+#ifdef DLL_EXPORT
+#define IN_LIBCIT
+#endif
+
 #include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
@@ -33,13 +37,13 @@
 #include "tools.h"
 #include "citadel.h"
 #include "server.h"
+#include "serv_extensions.h"
 #include "citserver.h"
 #include "config.h"
 #include "housekeeping.h"
 #include "sysdep_decls.h"
 #include "room_ops.h"
 #include "database.h"
-#include "dynloader.h"
 
 
 
@@ -88,7 +92,7 @@ void check_sched_shutdown(void) {
  * NOTE: this function pair should ONLY be called during startup.  It is NOT
  * thread safe.
  */
-void check_ref_counts_backend(struct quickroom *qrbuf, void *data) {
+void check_ref_counts_backend(struct room *qrbuf, void *data) {
        struct floor flbuf;
 
        getfloor(&flbuf, qrbuf->QRfloor);
@@ -109,7 +113,9 @@ void check_ref_counts(void) {
                putfloor(&flbuf, a);
        }
 
+       cdb_begin_transaction();
        ForEachRoom(check_ref_counts_backend, NULL);
+       cdb_end_transaction();
 }      
 
 /*
@@ -122,6 +128,7 @@ void do_housekeeping(void) {
        static int housekeeping_in_progress = 0;
        static time_t last_timer = 0L;
        int do_housekeeping_now = 0;
+       time_t now;
 
        /*
         * We do it this way instead of wrapping the whole loop in an
@@ -129,14 +136,19 @@ void do_housekeeping(void) {
         * 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);
+       now = time(NULL);
+       if ( (now - last_timer) > (time_t)60 ) {
+               if (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;
+
+       if (do_housekeeping_now == 0) {
+               return;
+       }
 
        /*
         * Ok, at this point we've made the decision to run the housekeeping