X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fhousekeeping.c;h=4de8e4baf497317e3ab23578755a7ab6474c4d05;hb=b223424749db67c28961787ce6ae841387f4de46;hp=1c833f0401af04687ddbfb05dd98e2a4021867f6;hpb=56d9cf5327c6f72b24cae765dc3498231e097f38;p=citadel.git

diff --git a/citadel/housekeeping.c b/citadel/housekeeping.c
index 1c833f040..4de8e4baf 100644
--- a/citadel/housekeeping.c
+++ b/citadel/housekeeping.c
@@ -1,90 +1,36 @@
 /*
- * $Id$
- *
  * This file contains miscellaneous housekeeping tasks.
  *
+ * Copyright (c) 1987-2021 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 <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 <libcitadel.h>
 
-#include <ctype.h>
-#include <string.h>
-#include <errno.h>
-#include <limits.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 "ctdl_module.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 "internet_addressing.h"
+#include "config.h"
 #include "journaling.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) {
-	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);
-	if (killed > 0)
-		lprintf(CTDL_INFO, "Terminated %d idle sessions\n", killed);
-}
-
-
+#include "citadel_ldap.h"
 
 void check_sched_shutdown(void) {
 	if ((ScheduledShutdown == 1) && (ContextList == NULL)) {
-		lprintf(CTDL_NOTICE, "Scheduled shutdown initiating.\n");
-		time_to_die = 1;
-		master_cleanup(0);
+		syslog(LOG_NOTICE, "housekeeping: scheduled shutdown initiating");
+		server_shutting_down = 1;
 	}
 }
 
 
-
 /*
  * Check (and fix) floor reference counts.  This doesn't need to be done
  * very often, since the counts should remain correct during normal operation.
@@ -98,19 +44,20 @@ void check_ref_counts_backend(struct ctdlroom *qrbuf, void *data) {
 	++new_refcounts[(int)qrbuf->QRfloor];
 }
 
+
 void check_ref_counts(void) {
 	struct floor flbuf;
 	int a;
 
 	int new_refcounts[MAXFLOORS];
 
-	lprintf(CTDL_DEBUG, "Checking floor reference counts\n");
+	syslog(LOG_DEBUG, "housekeeping: checking floor reference counts");
 	for (a=0; a<MAXFLOORS; ++a) {
 		new_refcounts[a] = 0;
 	}
 
 	cdb_begin_transaction();
-	ForEachRoom(check_ref_counts_backend, (void *)new_refcounts );
+	CtdlForEachRoom(check_ref_counts_backend, (void *)new_refcounts );
 	cdb_end_transaction();
 
 	for (a=0; a<MAXFLOORS; ++a) {
@@ -123,9 +70,20 @@ void check_ref_counts(void) {
 			flbuf.f_flags = flbuf.f_flags & ~QR_INUSE;
 		}
 		lputfloor(&flbuf, a);
-		lprintf(CTDL_DEBUG, "Floor %d: %d rooms\n", a, new_refcounts[a]);
+		syslog(LOG_DEBUG, "housekeeping: floor %d has %d rooms", a, new_refcounts[a]);
 	}
-}	
+}
+
+
+/*
+ * Provide hints as to whether we have any memory leaks
+ */
+void keep_an_eye_on_memory_usage(void) {
+	static void *original_brk = NULL;
+	if (!original_brk) original_brk = sbrk(0);	// Remember the original program break so we can test for leaks
+	syslog(LOG_DEBUG, "original_brk=%lx, current_brk=%lx, addl=%ld", (long)original_brk, (long)sbrk(0), (long)(sbrk(0)-original_brk));	// FIXME not so noisy please
+}
+
 
 /*
  * This is the housekeeping loop.  Worker threads come through here after
@@ -133,13 +91,19 @@ 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 int housekeeping_disabled = 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;
 
+	if (housekeeping_disabled) {
+		return;
+	}
+
 	/*
 	 * We do it this way instead of wrapping the whole loop in an
 	 * S_HOUSEKEEPING critical section because it eliminates the need to
@@ -149,15 +113,17 @@ 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);
 
-	if (do_housekeeping_now == 0) {
+	now = time(NULL);
+	if ( (do_housekeeping_now == 0) && (!CtdlIsSingleUser()) ) {
+		if ( (now - last_timer) > (time_t)300 ) {
+			syslog(LOG_WARNING,
+				"housekeeping: WARNING: housekeeping loop has not run for %ld minutes.  Is something stuck?",
+				((now - last_timer) / 60)
+			);
+		}
 		return;
 	}
 
@@ -166,17 +132,61 @@ void do_housekeeping(void) {
 	 * loop.  Everything below this point is real work.
 	 */
 
+	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 */
+		cdb_check_handles();
+		PerformSessionHooks(EVT_TIMER);		// Run all registered TIMER hooks
+
+#ifdef HAVE_LDAP					// LDAP sync isn't in a module so we can put it here
+		static time_t last_ldap_sync = 0L;
+		if ( (now - last_ldap_sync) > (time_t)CtdlGetConfigLong("c_ldap_sync_freq") ) {
+			CtdlSynchronizeUsersFromLDAP();
+			last_ldap_sync = time(NULL);
+		}
+#endif
+
+	keep_an_eye_on_memory_usage();
 	}
 
 	/*
 	 * All done.
 	 */
+	begin_critical_section(S_HOUSEKEEPING);
+	housekeeping_in_progress = 0;
+	end_critical_section(S_HOUSEKEEPING);
+}
+
+
+void CtdlDisableHouseKeeping(void) {
+	syslog(LOG_INFO, "housekeeping: trying to disable");
+	while ( (!housekeeping_disabled) && (!server_shutting_down) && (!housekeeping_in_progress) ) {
+
+		if (housekeeping_in_progress) {
+			sleep(1);
+		}
+		else {
+			begin_critical_section(S_HOUSEKEEPING);
+			if (!housekeeping_in_progress) {
+				housekeeping_disabled = 1;
+			}
+			end_critical_section(S_HOUSEKEEPING);
+		}
+	}
+	syslog(LOG_INFO, "housekeeping: disabled now");
+}
+
+
+void CtdlEnableHouseKeeping(void) {
+	begin_critical_section(S_HOUSEKEEPING);
 	housekeeping_in_progress = 0;
+	end_critical_section(S_HOUSEKEEPING);
 }