* 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 as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "sysdep.h"
void check_sched_shutdown(void) {
if ((ScheduledShutdown == 1) && (ContextList == NULL)) {
syslog(LOG_NOTICE, "Scheduled shutdown initiating.\n");
- CtdlThreadStopAll();
+ server_shutting_down = 1;
}
}
* 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) {
- 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;
- const char *old_name;
/*
* We do it this way instead of wrapping the whole loop in an
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);
* 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);
}