/*
* This file contains miscellaneous housekeeping tasks.
*
- * Copyright (c) 1987-2017 by the citadel.org team
+ * 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.
#include "serv_extensions.h"
#include "room_ops.h"
#include "internet_addressing.h"
+#include "config.h"
#include "journaling.h"
#include "citadel_ldap.h"
lputfloor(&flbuf, 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
+}
/*
* 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) {
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
end_critical_section(S_HOUSEKEEPING);
now = time(NULL);
- if (do_housekeeping_now == 0) {
+ 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?",
/* Then, do the "once per minute" stuff... */
if (do_perminute_housekeeping_now) {
cdb_check_handles();
- CtdlPopulateUsersFromLDAP(); // This one isn't from a module so we put it here
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();
}
/*
}
-void CtdlDisableHouseKeeping(void)
-{
- int ActiveBackgroundJobs;
- int do_housekeeping_now = 0;
- struct CitContext *nptr;
- int nContexts, i;
+void CtdlDisableHouseKeeping(void) {
+ syslog(LOG_INFO, "housekeeping: trying to disable");
+ while ( (!housekeeping_disabled) && (!server_shutting_down) && (!housekeeping_in_progress) ) {
-retry_block_housekeeping:
- syslog(LOG_INFO, "housekeeping: trying to disable 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, "housekeeping: checking for running server jobs");
-
-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].lastcmd == 0))
- continue;
- ActiveBackgroundJobs ++;
- syslog(LOG_INFO, "jousekeeping: job CC[%d] active; use TERM if you don't want to wait for it", nptr[i].cs_pid);
-
+ if (housekeeping_in_progress) {
+ sleep(1);
+ }
+ else {
+ begin_critical_section(S_HOUSEKEEPING);
+ if (!housekeeping_in_progress) {
+ housekeeping_disabled = 1;
+ }
+ end_critical_section(S_HOUSEKEEPING);
}
-
- free(nptr);
-
- }
- if (ActiveBackgroundJobs != 0) {
- syslog(LOG_INFO, "housekeeping: found %d running jobs, need to wait", ActiveBackgroundJobs);
- usleep(5000000);
- goto retry_wait_for_contexts;
}
- syslog(LOG_INFO, "housekeeping: disabled now.");
+ syslog(LOG_INFO, "housekeeping: disabled now");
}
-void CtdlEnableHouseKeeping(void)
-{
+void CtdlEnableHouseKeeping(void) {
begin_critical_section(S_HOUSEKEEPING);
housekeeping_in_progress = 0;
end_critical_section(S_HOUSEKEEPING);