X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fhousekeeping.c;h=92336277733acaaeaab8a0bd9145dfeea0cf7ee6;hb=cbc736c6fd45401b653454914a1b437050600a00;hp=a97ea47799e35c7c7ee824da1ca1dc40397aae44;hpb=366a3a5141eefb75f26621ab6ba2969ad8d42f6e;p=citadel.git

diff --git a/citadel/housekeeping.c b/citadel/housekeeping.c
index a97ea4779..923362777 100644
--- a/citadel/housekeeping.c
+++ b/citadel/housekeeping.c
@@ -1,119 +1,188 @@
 /*
- * This file contains housekeeping tasks which periodically
- * need to be executed.
+ * This file contains miscellaneous housekeeping tasks.
  *
- * $Id$
+ * 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"
-#include <stdlib.h>
-#include <unistd.h>
 #include <stdio.h>
-#include <time.h>
-#include <ctype.h>
-#include <string.h>
-#include <errno.h>
-#include <limits.h>
-#ifdef HAVE_PTHREAD_H
-#include <pthread.h>
-#endif
-#include "citadel.h"
-#include "server.h"
-#include "citserver.h"
-#include "config.h"
-#include "housekeeping.h"
-#include "sysdep_decls.h"
+#include <libcitadel.h>
+
+#include "ctdl_module.h"
+#include "serv_extensions.h"
 #include "room_ops.h"
+#include "internet_addressing.h"
+#include "journaling.h"
+
+void check_sched_shutdown(void) {
+	if ((ScheduledShutdown == 1) && (ContextList == NULL)) {
+		syslog(LOG_NOTICE, "Scheduled shutdown initiating.\n");
+		server_shutting_down = 1;
+	}
+}
+
+
 
 /*
- * 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.
+ * Check (and fix) floor reference counts.  This doesn't need to be done
+ * very often, since the counts should remain correct during normal operation.
  */
-void terminate_idle_sessions(void) {
-	struct CitContext *ccptr;
-	time_t now;
-	int session_to_kill;
-
-	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);
+void check_ref_counts_backend(struct ctdlroom *qrbuf, void *data) {
+
+	int *new_refcounts;
+
+	new_refcounts = (int *) data;
+
+	++new_refcounts[(int)qrbuf->QRfloor];
+}
+
+void check_ref_counts(void) {
+	struct floor flbuf;
+	int a;
+
+	int new_refcounts[MAXFLOORS];
+
+	syslog(LOG_DEBUG, "Checking floor reference counts\n");
+	for (a=0; a<MAXFLOORS; ++a) {
+		new_refcounts[a] = 0;
 	}
 
+	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]);
+	}
+}	
 
 /*
- * Main housekeeping function.  This gets run whenever a session terminates.
+ * 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;
 
-	lprintf(9, "--- begin housekeeping ---\n");
-	begin_critical_section(S_HOUSEKEEPING);
 	/*
-	 * Terminate idle sessions.
+	 * 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.
 	 */
-	lprintf(7, "Calling terminate_idle_sessions()\n");
-	terminate_idle_sessions();
-	lprintf(9, "Done with terminate_idle_sessions()\n");
+	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;
+	}
 
 	/*
-	 * If the server is scheduled to shut down the next time all
-	 * users are logged out, now's the time to do it.
+	 * Ok, at this point we've made the decision to run the housekeeping
+	 * loop.  Everything below this point is real work.
 	 */
-	if ((ScheduledShutdown == 1) && (ContextList == NULL)) {
-		lprintf(3, "Scheduled shutdown initiating.\n");
-		master_cleanup();
-		}
-	end_critical_section(S_HOUSEKEEPING);
-	lprintf(9, "--- end housekeeping ---\n");
+
+	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 */
+	}
 
-/*
- * 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) {
-	struct floor flbuf;
+	/*
+	 * All done.
+	 */
+	begin_critical_section(S_HOUSEKEEPING);
+	housekeeping_in_progress = 0;
+	end_critical_section(S_HOUSEKEEPING);
+}
 
-	lgetfloor(&flbuf, qrbuf->QRfloor);
-	++flbuf.f_ref_count;
-	flbuf.f_flags = flbuf.f_flags | QR_INUSE;
-	lputfloor(&flbuf, qrbuf->QRfloor);
-	}
+void CtdlDisableHouseKeeping(void)
+{
+	int ActiveBackgroundJobs;
+	int do_housekeeping_now = 0;
+	struct CitContext *nptr;
+	int nContexts, i;
 
-void check_ref_counts(void) {
-	struct floor flbuf;
-	int a;
+retry_block_housekeeping:
+	syslog(LOG_INFO, "trying to disable housekeeping services");
+	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) {
+		usleep(1000000);
+		goto retry_block_housekeeping;
+	}
+	
+	syslog(LOG_INFO, "checking for running server Jobs");
 
-	for (a=0; a<MAXFLOORS; ++a) {
-		lgetfloor(&flbuf, a);
-		flbuf.f_ref_count = 0;
-		flbuf.f_flags = flbuf.f_flags & ~QR_INUSE;
-		lputfloor(&flbuf, a);
+retry_wait_for_contexts:
+	/* So that we don't keep the context list locked for a long time
+	 * we create a copy of it first
+	 */
+	ActiveBackgroundJobs = 0;
+	nptr = CtdlGetContextArray(&nContexts) ;
+	if (nptr)
+	{
+		for (i=0; i<nContexts; i++) 
+		{
+			if ((nptr[i].state != CON_SYS) || (nptr[i].IO == NULL) || (nptr[i].lastcmd == 0))
+				continue;
+			ActiveBackgroundJobs ++;
+			syslog(LOG_INFO, "Job CC[%d] active; use TERM if you don't want to wait for it",nptr[i].cs_pid);
+		
 		}
+	
+		free(nptr);
 
-	ForEachRoom(check_ref_counts_backend);
-	}	
+	}
+	if (ActiveBackgroundJobs != 0) {
+		syslog(LOG_INFO, "found %d running jobs, need to wait", ActiveBackgroundJobs);
+		usleep(5000000);
+		goto retry_wait_for_contexts;
+	}
+	syslog(LOG_INFO, "Housekeeping disabled now.");
+}
 
+void CtdlEnableHouseKeeping(void)
+{
+	begin_critical_section(S_HOUSEKEEPING);
+	housekeeping_in_progress = 0;
+	end_critical_section(S_HOUSEKEEPING);
+}