X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fhousekeeping.c;h=108410af29a79a7924526d2f214ba5dea868ffea;hb=aa7365c86de8e26e796d3aa3fd605c85d8c26220;hp=a16ce58a6d09a51542a5174311233b2a7b7d0410;hpb=7c951cae9394503de49af38b5231ed049f2cac5e;p=citadel.git

diff --git a/citadel/housekeeping.c b/citadel/housekeeping.c
index a16ce58a6..108410af2 100644
--- 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"
@@ -10,63 +17,47 @@
 #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 <syslog.h>
+#include <libcitadel.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 "msgbase.h"
+#include "journaling.h"
 
-
-int housepipe[2];	/* This is the queue for housekeeping tasks */
-
-
-/*
- * 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) {
-	struct CitContext *ccptr;
-	time_t now;
-	int session_to_kill;
-	int killed = 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);
-}
-
-
+#include "ctdl_module.h"
+#include "threads.h"
 
 void check_sched_shutdown(void) {
 	if ((ScheduledShutdown == 1) && (ContextList == NULL)) {
-		lprintf(3, "Scheduled shutdown initiating.\n");
-		master_cleanup();
+		syslog(LOG_NOTICE, "Scheduled shutdown initiating.\n");
+		server_shutting_down = 1;
 	}
 }
 
@@ -75,30 +66,99 @@ void check_sched_shutdown(void) {
 /*
  * 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_backend(struct quickroom *qrbuf, void *data) {
-	struct floor flbuf;
+void check_ref_counts_backend(struct ctdlroom *qrbuf, void *data) {
+
+	int *new_refcounts;
+
+	new_refcounts = (int *) data;
 
-	getfloor(&flbuf, qrbuf->QRfloor);
-	++flbuf.f_ref_count;
-	flbuf.f_flags = flbuf.f_flags | QR_INUSE;
-	putfloor(&flbuf, qrbuf->QRfloor);
+	++new_refcounts[(int)qrbuf->QRfloor];
 }
 
 void check_ref_counts(void) {
 	struct floor flbuf;
 	int a;
 
-	lprintf(7, "Checking floor reference counts\n");
+	int new_refcounts[MAXFLOORS];
+
+	syslog(LOG_DEBUG, "Checking floor reference counts\n");
 	for (a=0; a<MAXFLOORS; ++a) {
-		getfloor(&flbuf, a);
-		flbuf.f_ref_count = 0;
-		flbuf.f_flags = flbuf.f_flags & ~QR_INUSE;
-		putfloor(&flbuf, a);
+		new_refcounts[a] = 0;
 	}
 
-	ForEachRoom(check_ref_counts_backend, NULL);
+	cdb_begin_transaction();
+	CtdlForEachRoom(check_ref_counts_backend, (void *)new_refcounts );
+	cdb_end_transaction();
+
+	for (a=0; a<MAXFLOORS; ++a) {
+		lgetfloor(&flbuf, a);
+		flbuf.f_ref_count = new_refcounts[a];
+		if (new_refcounts[a] > 0) {
+			flbuf.f_flags = flbuf.f_flags | QR_INUSE;
+		}
+		else {
+			flbuf.f_flags = flbuf.f_flags & ~QR_INUSE;
+		}
+		lputfloor(&flbuf, a);
+		syslog(LOG_DEBUG, "Floor %d: %d rooms\n", a, new_refcounts[a]);
+	}
 }	
 
+/*
+ * 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.
+ */
+static int housekeeping_in_progress = 0;
+static time_t last_timer = 0L;
+void do_housekeeping(void) {
+	int do_housekeeping_now = 0;
+	int do_perminute_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);
+	if (housekeeping_in_progress == 0) {
+		do_housekeeping_now = 1;
+		housekeeping_in_progress = 1;
+	}
+	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.
+	 */
+
+	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... */
+	JournalRunQueue();
+	PerformSessionHooks(EVT_HOUSE);
+
+	/* Then, do the "once per minute" stuff... */
+	if (do_perminute_housekeeping_now) {
+		cdb_check_handles();			/* suggested by Justin Case */
+		PerformSessionHooks(EVT_TIMER);		/* Run any timer hooks */
+	}
+
+	/*
+	 * All done.
+	 */
+	begin_critical_section(S_HOUSEKEEPING);
+	housekeeping_in_progress = 0;
+	end_critical_section(S_HOUSEKEEPING);
+}