fix all the <time.h> vs. <sys/time.h> issues, hopefully

[citadel.git] / citadel / housekeeping.c

diff --git a/citadel/housekeeping.c b/citadel/housekeeping.c
index a97ea47799e35c7c7ee824da1ca1dc40397aae44..2746b68de55126a7e4551c8f5f7e2e8bdd1c7b5a 100644 (file)
--- a/citadel/housekeeping.c
+++ b/citadel/housekeeping.c
@@ -1,22 +1,36 @@
 /*
- * This file contains housekeeping tasks which periodically
- * need to be executed.
- *
  * $Id$
+ *
+ * This file contains miscellaneous housekeeping tasks.
+ *
  */
 
 #include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <time.h>
+#include <fcntl.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>
-#ifdef HAVE_PTHREAD_H
-#include <pthread.h>
+#include <sys/types.h>
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
 #endif
+#include "tools.h"
 #include "citadel.h"
 #include "server.h"
 #include "citserver.h"
@@ -24,6 +38,11 @@
 #include "housekeeping.h"
 #include "sysdep_decls.h"
 #include "room_ops.h"
+#include "database.h"
+
+
+int housepipe[2];      /* This is the queue for housekeeping tasks */
+
 
 /*
  * Terminate idle sessions.  This function pounds through the session table
@@ -35,56 +54,31 @@ void terminate_idle_sessions(void) {
        struct CitContext *ccptr;
        time_t now;
        int session_to_kill;
+       int killed = 0;
 
-       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);
+       now = time(NULL);
+       session_to_kill = 0;
+       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) ) {
+                       ccptr->kill_me = 1;
+                       ++killed;
+               }
        }
+       end_critical_section(S_SESSION_TABLE);
+       lprintf(9, "Terminated %d idle sessions\n", killed);
+}
 
 
-/*
- * Main housekeeping function.  This gets run whenever a session terminates.
- */
-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
-        * users are logged out, now's the time to do it.
-        */
+
+void check_sched_shutdown(void) {
        if ((ScheduledShutdown == 1) && (ContextList == NULL)) {
                lprintf(3, "Scheduled shutdown initiating.\n");
-               master_cleanup();
-               }
-       end_critical_section(S_HOUSEKEEPING);
-       lprintf(9, "--- end housekeeping ---\n");
+               time_to_die = 1;
        }
+}
 
 
 
@@ -94,26 +88,27 @@ void do_housekeeping(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 check_ref_counts_backend(struct quickroom *qrbuf, void *data) {
        struct floor flbuf;
 
-       lgetfloor(&flbuf, qrbuf->QRfloor);
+       getfloor(&flbuf, qrbuf->QRfloor);
        ++flbuf.f_ref_count;
        flbuf.f_flags = flbuf.f_flags | QR_INUSE;
-       lputfloor(&flbuf, qrbuf->QRfloor);
-       }
+       putfloor(&flbuf, qrbuf->QRfloor);
+}
 
 void check_ref_counts(void) {
        struct floor flbuf;
        int a;
 
+       lprintf(7, "Checking floor reference counts\n");
        for (a=0; a<MAXFLOORS; ++a) {
-               lgetfloor(&flbuf, a);
+               getfloor(&flbuf, a);
                flbuf.f_ref_count = 0;
                flbuf.f_flags = flbuf.f_flags & ~QR_INUSE;
-               lputfloor(&flbuf, a);
-               }
+               putfloor(&flbuf, a);
+       }
 
-       ForEachRoom(check_ref_counts_backend);
-       }       
+       ForEachRoom(check_ref_counts_backend, NULL);
+}