/*
Bacula® - The Network Backup Solution
- Copyright (C) 2002-2007 Free Software Foundation Europe e.V.
+ Copyright (C) 2002-2008 Free Software Foundation Europe e.V.
The main author of Bacula is Kern Sibbald, with contributions from
many others, a complete list can be found in the file AUTHORS.
This program is Free Software; you can redistribute it and/or
modify it under the terms of version two of the GNU General Public
- License as published by the Free Software Foundation plus additions
- that are listed in the file LICENSE.
+ License as published by the Free Software Foundation and included
+ in the file LICENSE.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- Bacula® is a registered trademark of John Walker.
+ Bacula® is a registered trademark of Kern Sibbald.
The licensor of Bacula is the Free Software Foundation Europe
(FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
Switzerland, email:ftf@fsfeurope.org.
#include "jcr.h"
/* Exported globals */
-time_t watchdog_time = 0; /* this has granularity of SLEEP_TIME */
-time_t watchdog_sleep_time = 60; /* examine things every 60 seconds */
+utime_t watchdog_time = 0; /* this has granularity of SLEEP_TIME */
+utime_t watchdog_sleep_time = 60; /* examine things every 60 seconds */
/* Locals */
static pthread_mutex_t timer_mutex = PTHREAD_MUTEX_INITIALIZER;
watchdog_time = time(NULL);
if ((errstat=rwl_init(&lock)) != 0) {
- Emsg1(M_ABORT, 0, _("Unable to initialize watchdog lock. ERR=%s\n"),
- strerror(errstat));
+ berrno be;
+ Jmsg1(NULL, M_ABORT, 0, _("Unable to initialize watchdog lock. ERR=%s\n"),
+ be.bstrerror(errstat));
}
wd_queue = New(dlist(dummy, &dummy->link));
wd_inactive = New(dlist(dummy, &dummy->link));
bool register_watchdog(watchdog_t *wd)
{
if (!wd_is_init) {
- Emsg0(M_ABORT, 0, _("BUG! register_watchdog called before start_watchdog\n"));
+ Jmsg0(NULL, M_ABORT, 0, _("BUG! register_watchdog called before start_watchdog\n"));
}
if (wd->callback == NULL) {
- Emsg1(M_ABORT, 0, _("BUG! Watchdog %p has NULL callback\n"), wd);
+ Jmsg1(NULL, M_ABORT, 0, _("BUG! Watchdog %p has NULL callback\n"), wd);
}
if (wd->interval == 0) {
- Emsg1(M_ABORT, 0, _("BUG! Watchdog %p has zero interval\n"), wd);
+ Jmsg1(NULL, M_ABORT, 0, _("BUG! Watchdog %p has zero interval\n"), wd);
}
wd_lock();
bool ok = false;
if (!wd_is_init) {
- Emsg0(M_ABORT, 0, _("BUG! unregister_watchdog_unlocked called before start_watchdog\n"));
+ Jmsg0(NULL, M_ABORT, 0, _("BUG! unregister_watchdog_unlocked called before start_watchdog\n"));
}
wd_lock();
struct timespec timeout;
struct timeval tv;
struct timezone tz;
- time_t next_time;
+ utime_t next_time;
+ set_jcr_in_tsd(INVALID_JCR);
Dmsg0(800, "NicB-reworked watchdog thread entered\n");
while (!quit) {
{
int errstat;
if ((errstat=rwl_writelock(&lock)) != 0) {
- Emsg1(M_ABORT, 0, _("rwl_writelock failure. ERR=%s\n"),
- strerror(errstat));
+ berrno be;
+ Jmsg1(NULL, M_ABORT, 0, _("rwl_writelock failure. ERR=%s\n"),
+ be.bstrerror(errstat));
}
}
{
int errstat;
if ((errstat=rwl_writeunlock(&lock)) != 0) {
- Emsg1(M_ABORT, 0, _("rwl_writeunlock failure. ERR=%s\n"),
- strerror(errstat));
+ berrno be;
+ Jmsg1(NULL, M_ABORT, 0, _("rwl_writeunlock failure. ERR=%s\n"),
+ be.bstrerror(errstat));
}
}