X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fhousekeeping.c;h=92336277733acaaeaab8a0bd9145dfeea0cf7ee6;hb=7c94d5bb68f1c448770d31205ec5ae12bd8a02ed;hp=901dd8ec8bfda23b29aab9f4b83e990ed51df21a;hpb=5656627a804d561b14924df70f1e16deac6ff8fb;p=citadel.git diff --git a/citadel/housekeeping.c b/citadel/housekeeping.c index 901dd8ec8..923362777 100644 --- a/citadel/housekeeping.c +++ b/citadel/housekeeping.c @@ -1,85 +1,30 @@ /* - * $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" -#include -#include #include -#include - -#if TIME_WITH_SYS_TIME -# include -# include -#else -# if HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif - -#include -#include -#include -#include -#include -#ifdef HAVE_SYS_SELECT_H -#include -#endif #include -#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 "journaling.h" -#include "ctdl_module.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) - CtdlLogPrintf(CTDL_INFO, "Terminated %d 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; } } @@ -104,13 +49,13 @@ 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 (time_t)60 ) { - do_perminute_housekeeping_now = 1; - last_timer = time(NULL); - } } end_critical_section(S_HOUSEKEEPING); @@ -167,23 +106,83 @@ 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); +} + +void CtdlDisableHouseKeeping(void) +{ + int ActiveBackgroundJobs; + int do_housekeeping_now = 0; + struct CitContext *nptr; + int nContexts, i; + +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"); + +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