*** empty log message ***

[citadel.git] / citadel / housekeeping.c

diff --git a/citadel/housekeeping.c b/citadel/housekeeping.c
index 1f2fc70f36e3d0cc40f85e505c23df6ccfba9d84..09dbad4eb143aca6d3b3fb76b22dcb9706d6823c 100644 (file)
--- a/citadel/housekeeping.c
+++ b/citadel/housekeeping.c
@@ -5,24 +5,39 @@
  *
  */
 
+#ifdef DLL_EXPORT
+#define IN_LIBCIT
+#endif
+
 #include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <fcntl.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <ctype.h>
 #include <string.h>
 #include <errno.h>
 #include <limits.h>
 #include <sys/types.h>
-#include <sys/time.h>
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
 #include "tools.h"
 #include "citadel.h"
 #include "server.h"
+#include "serv_extensions.h"
 #include "citserver.h"
 #include "config.h"
 #include "housekeeping.h"
@@ -31,7 +46,6 @@
 #include "database.h"
 
 
-int housepipe[2];      /* This is the queue for housekeeping tasks */
 
 
 /*
@@ -78,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);
@@ -99,6 +113,53 @@ void check_ref_counts(void) {
                putfloor(&flbuf, a);
        }
 
+       cdb_begin_transaction();
        ForEachRoom(check_ref_counts_backend, NULL);
+       cdb_end_transaction();
 }      
 
+/*
+ * 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.
+ */
+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
+        * 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;
+                       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 */
+
+       /*
+        * All done.
+        */
+       housekeeping_in_progress = 0;
+}