X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fhousekeeping.c;h=077b509300c002433aa5f21cd9a26d9f84b6d689;hb=314acc50c58e49fb9a5df9d7f0c24b2535ba0757;hp=ac6d8882e2cb50cc0cc865f570d49b3f6291b2dc;hpb=1f5bb4497765f2f56c4caaf14b2bc66c4f97b397;p=citadel.git diff --git a/citadel/housekeeping.c b/citadel/housekeeping.c index ac6d8882e..077b50930 100644 --- a/citadel/housekeeping.c +++ b/citadel/housekeeping.c @@ -1,8 +1,15 @@ /* - * This file contains housekeeping tasks which periodically - * need to be executed. It keeps a nice little queue... + * 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" @@ -10,175 +17,149 @@ #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 -#include #ifdef HAVE_SYS_SELECT_H #include #endif -#ifdef HAVE_PTHREAD_H -#include -#endif -#include "tools.h" +#include +#include #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 "internet_addressing.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; - - do { - 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) ) { - session_to_kill = ccptr->cs_pid; - } - } - end_critical_section(S_SESSION_TABLE); - if (session_to_kill > 0) { - lprintf(3, "Session %d timed out. Terminating it...\n", - session_to_kill); - kill_session(session_to_kill); - } - } while(session_to_kill > 0); - } - - +#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; } } /* - * This is the main loop for the housekeeping thread. It remains active - * during the entire run of the server. + * 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 housekeeping_loop(void) { - long flags; - struct timeval tv; - fd_set readfds; - int did_something; - char house_cmd[256]; /* Housekeep cmds are always 256 bytes long */ - - if (pipe(housepipe) != 0) { - lprintf(1, "FATAL ERROR: can't create housekeeping pipe: %s\n", - strerror(errno)); - exit(0); - } +void check_ref_counts_backend(struct ctdlroom *qrbuf, void *data) { - flags = (long) fcntl(housepipe[1], F_GETFL); - flags |= O_NONBLOCK; - fcntl(housepipe[1], F_SETFL, flags); - - while(1) { - do { - did_something = 0; - tv.tv_sec = HOUSEKEEPING_WAKEUP; - tv.tv_usec = 0; - FD_ZERO(&readfds); - FD_SET(housepipe[0], &readfds); - select(housepipe[0] + 1, &readfds, 0L, 0L, &tv); - if (FD_ISSET(housepipe[0], &readfds)) { - did_something = 1; - } - - if (did_something) { - read(housepipe[0], house_cmd, 256); - } - else { - memset(house_cmd, 0, 256); - strcpy(house_cmd, "MINUTE"); - } - - - /* Do whatever this cmd requires */ - if (!strcmp(house_cmd, "MINUTE")) { - terminate_idle_sessions(); - } - - else if (!strcmp(house_cmd, "SCHED_SHUTDOWN")) { - check_sched_shutdown(); - } - - else { - lprintf(7, "Unknown housekeeping command\n"); - } - - } while (did_something); - } + 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 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]); + } +} -void enter_housekeeping_cmd(char *cmd) { - char cmdbuf[256]; +/* + * 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; - safestrncpy(cmdbuf, cmd, 256); + /* + * 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); - write(housepipe[1], cmdbuf, 256); + if (housekeeping_in_progress == 0) { + do_housekeeping_now = 1; + housekeeping_in_progress = 1; + } end_critical_section(S_HOUSEKEEPING); -} - + if (do_housekeeping_now == 0) { + return; + } -/* - * 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; + /* + * Ok, at this point we've made the decision to run the housekeeping + * loop. Everything below this point is real work. + */ - getfloor(&flbuf, qrbuf->QRfloor); - ++flbuf.f_ref_count; - flbuf.f_flags = flbuf.f_flags | QR_INUSE; - putfloor(&flbuf, qrbuf->QRfloor); + now = time(NULL); + if ( (now - last_timer) > (time_t)60 ) { + do_perminute_housekeeping_now = 1; + last_timer = time(NULL); } -void check_ref_counts(void) { - struct floor flbuf; - int a; - - for (a=0; a