Updated the copyright declaration in several modules, removing any language which...

[citadel.git] / citadel / housekeeping.c

diff --git a/citadel/housekeeping.c b/citadel/housekeeping.c
index 78e0da5f2d025a5a71983b0c31dc6de17e9a8a4d..108410af29a79a7924526d2f214ba5dea868ffea 100644 (file)
--- a/citadel/housekeeping.c
+++ b/citadel/housekeeping.c
@@ -1,8 +1,15 @@
 /*
- * $Id$
- *
  * This file contains miscellaneous housekeeping tasks.
  *
+ * Copyright (c) 1987-2011 by the citadel.org team
+ *
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
 #include "sysdep.h"
@@ -30,6 +37,7 @@
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
+#include <syslog.h>
 #include <libcitadel.h>
 #include "citadel.h"
 #include "server.h"
@@ -46,47 +54,10 @@
 #include "ctdl_module.h"
 #include "threads.h"
 
-/*
- * Terminate idle sessions.  This function pounds through the session table
- * comparing the current time to each session's time-of-last-command.  If an
- * idle session is found it is terminated, then the search restarts at the
- * beginning because the pointer to our place in the list becomes invalid.
- */
-void terminate_idle_sessions(void) {
-       CitContext *ccptr;
-       time_t now;
-       int session_to_kill;
-       int killed = 0;
-       int longrunners = 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) ) {
-                       if (!ccptr->dont_term) {
-                               ccptr->kill_me = 1;
-                               ++killed;
-                       }
-                       else 
-                               longrunners ++;
-               }
-       }
-       end_critical_section(S_SESSION_TABLE);
-       if (killed > 0)
-               CtdlLogPrintf(CTDL_INFO, "Terminated %d idle sessions\n", killed);
-       if (longrunners > 0)
-               CtdlLogPrintf(CTDL_INFO, "Didn't terminate %d protected idle sessions;\n", killed);
-}
-
-
-
 void check_sched_shutdown(void) {
        if ((ScheduledShutdown == 1) && (ContextList == NULL)) {
-               CtdlLogPrintf(CTDL_NOTICE, "Scheduled shutdown initiating.\n");
-               CtdlThreadStopAll();
+               syslog(LOG_NOTICE, "Scheduled shutdown initiating.\n");
+               server_shutting_down = 1;
        }
 }
 
@@ -111,7 +82,7 @@ void check_ref_counts(void) {
 
        int new_refcounts[MAXFLOORS];
 
-       CtdlLogPrintf(CTDL_DEBUG, "Checking floor reference counts\n");
+       syslog(LOG_DEBUG, "Checking floor reference counts\n");
        for (a=0; a<MAXFLOORS; ++a) {
                new_refcounts[a] = 0;
        }
@@ -130,7 +101,7 @@ void check_ref_counts(void) {
                        flbuf.f_flags = flbuf.f_flags & ~QR_INUSE;
                }
                lputfloor(&flbuf, a);
-               CtdlLogPrintf(CTDL_DEBUG, "Floor %d: %d rooms\n", a, new_refcounts[a]);
+               syslog(LOG_DEBUG, "Floor %d: %d rooms\n", a, new_refcounts[a]);
        }
 }      
 
@@ -140,13 +111,12 @@ void check_ref_counts(void) {
  * only allow housekeeping to execute once per minute, and we only allow one
  * instance to run at a time.
  */
+static int housekeeping_in_progress = 0;
+static time_t last_timer = 0L;
 void do_housekeeping(void) {
-       static int housekeeping_in_progress = 0;
-       static time_t last_timer = 0L;
        int do_housekeeping_now = 0;
        int do_perminute_housekeeping_now = 0;
        time_t now;
-       const char *old_name;
 
        /*
         * We do it this way instead of wrapping the whole loop in an
@@ -157,11 +127,6 @@ void do_housekeeping(void) {
        if (housekeeping_in_progress == 0) {
                do_housekeeping_now = 1;
                housekeeping_in_progress = 1;
-               now = time(NULL);
-               if ( (now - last_timer) > (time_t)60 ) {
-                       do_perminute_housekeeping_now = 1;
-                       last_timer = time(NULL);
-               }
        }
        end_critical_section(S_HOUSEKEEPING);
 
@@ -174,23 +139,26 @@ void do_housekeeping(void) {
         * loop.  Everything below this point is real work.
         */
 
+       now = time(NULL);
+       if ( (now - last_timer) > (time_t)60 ) {
+               do_perminute_housekeeping_now = 1;
+               last_timer = time(NULL);
+       }
+
        /* First, do the "as often as needed" stuff... */
-       old_name = CtdlThreadName("House Keeping - Journal");
        JournalRunQueue();
-
-       CtdlThreadName("House Keeping - EVT_HOUSE");
-       PerformSessionHooks(EVT_HOUSE); /* perform as needed housekeeping */
+       PerformSessionHooks(EVT_HOUSE);
 
        /* Then, do the "once per minute" stuff... */
        if (do_perminute_housekeeping_now) {
                cdb_check_handles();                    /* suggested by Justin Case */
-               CtdlThreadName("House Keeping - EVT_TIMER");
                PerformSessionHooks(EVT_TIMER);         /* Run any timer hooks */
        }
 
        /*
         * All done.
         */
+       begin_critical_section(S_HOUSEKEEPING);
        housekeeping_in_progress = 0;
-       CtdlThreadName(old_name);
+       end_critical_section(S_HOUSEKEEPING);
 }