Changeover to new room structure. See ChangeLog for details.

[citadel.git] / citadel / housekeeping.c

diff --git a/citadel/housekeeping.c b/citadel/housekeeping.c
index e1c15e4924106d231ab1813bc6cc49747dc4d81f..f54e3122f2375ab1907cd7274f863ddcafe7ddc5 100644 (file)
--- a/citadel/housekeeping.c
+++ b/citadel/housekeeping.c
@@ -11,10 +11,15 @@
 #include <ctype.h>
 #include <string.h>
 #include <errno.h>
+#include <limits.h>
 #include <pthread.h>
 #include "citadel.h"
 #include "server.h"
-#include "proto.h"
+#include "citserver.h"
+#include "config.h"
+#include "housekeeping.h"
+#include "sysdep_decls.h"
+#include "room_ops.h"
 
 /*
  * Terminate idle sessions.  This function pounds through the session table
@@ -42,7 +47,7 @@ void terminate_idle_sessions(void) {
 /*
  * Main housekeeping function.  This gets run whenever a session terminates.
  */
-void do_housekeeping() {
+void do_housekeeping(void) {
 
        begin_critical_section(S_HOUSEKEEPING);
        /*
@@ -67,27 +72,29 @@ void do_housekeeping() {
 /*
  * 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() {
-       int ref[MAXFLOORS];
-       struct quickroom qrbuf;
+void check_ref_counts_backend(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];
-                       }
-               }
+       lgetfloor(&flbuf, qrbuf->QRfloor);
+       ++flbuf.f_ref_count;
+       flbuf.f_flags = flbuf.f_flags | QR_INUSE;
+       lputfloor(&flbuf, qrbuf->QRfloor);
+       }
+
+void check_ref_counts(void) {
+       struct floor flbuf;
+       int a;
 
        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 ;
+               flbuf.f_ref_count = 0;
+               flbuf.f_flags = flbuf.f_flags & ~QR_INUSE;
                lputfloor(&flbuf, a);
                }
+
+       ForEachRoom(check_ref_counts_backend);
        }