/*
- * Process and thread timer routines, built on top of watchdogs.
- *
- * Nic Bellamy <nic@bellamy.co.nz>, October 2004.
- *
-*/
-/*
- Copyright (C) 2000-2004 Kern Sibbald and John Walker
+ Bacula® - The Network Backup Solution
- This program is free 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 2 of
- the License, or (at your option) any later version.
+ Copyright (C) 2004-2007 Free Software Foundation Europe e.V.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
+ 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 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
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.
+ 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., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
- */
+ 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.
+*/
+/*
+ * Process and thread timer routines, built on top of watchdogs.
+ *
+ * Nic Bellamy <nic@bellamy.co.nz>, October 2004.
+ *
+*/
#include "bacula.h"
#include "jcr.h"
+const int dbglvl = 900;
+
/* Forward referenced functions */
static void stop_btimer(btimer_t *wid);
static btimer_t *btimer_start_common(uint32_t wait);
static void destructor_child_timer(watchdog_t *self);
#endif
-/*
+/*
* Start a timer on a child process of pid, kill it after wait seconds.
*
* Returns: btimer_t *(pointer to btimer_t struct) on success
- * NULL on failure
+ * NULL on failure
*/
-btimer_t *start_child_timer(pid_t pid, uint32_t wait)
+btimer_t *start_child_timer(JCR *jcr, pid_t pid, uint32_t wait)
{
btimer_t *wid;
wid->type = TYPE_CHILD;
wid->pid = pid;
wid->killed = false;
+ wid->jcr = jcr;
wid->wd->callback = callback_child_timer;
wid->wd->one_shot = false;
wid->wd->interval = wait;
register_watchdog(wid->wd);
- Dmsg3(200, "Start child timer %p, pid %d for %d secs.\n", wid, pid, wait);
+ Dmsg3(dbglvl, "Start child timer %p, pid %d for %d secs.\n", wid, pid, wait);
return wid;
}
void stop_child_timer(btimer_t *wid)
{
if (wid == NULL) {
- Dmsg0(200, "stop_child_timer called with NULL btimer_id\n");
+ Dmsg0(dbglvl, "stop_child_timer called with NULL btimer_id\n");
return;
}
- Dmsg2(200, "Stop child timer %p pid %d\n", wid, wid->pid);
+ Dmsg2(dbglvl, "Stop child timer %p pid %d\n", wid, wid->pid);
stop_btimer(wid);
}
/* First kill attempt; try killing it softly (kill -SONG) first */
wid->killed = true;
- Dmsg2(050, "watchdog %p term PID %d\n", self, wid->pid);
+ Dmsg2(dbglvl, "watchdog %p term PID %d\n", self, wid->pid);
- /* Kill -TERM the specified PID, and reschedule a -KILL for 3 seconds
- * later.
+ /* Kill -TERM the specified PID, and reschedule a -KILL for 5 seconds
+ * later. (Warning: this should let dvd-writepart enough time to term
+ * and kill growisofs, which takes 3 seconds, so the interval must not
+ * be less than 5 seconds)
*/
kill(wid->pid, SIGTERM);
- self->interval = 3;
+ self->interval = 5;
} else {
/* This is the second call - terminate with prejudice. */
- Dmsg2(050, "watchdog %p kill PID %d\n", self, wid->pid);
+ Dmsg2(dbglvl, "watchdog %p kill PID %d\n", self, wid->pid);
kill(wid->pid, SIGKILL);
}
}
-/*
+/*
* Start a timer on a thread. kill it after wait seconds.
*
* Returns: btimer_t *(pointer to btimer_t struct) on success
- * NULL on failure
+ * NULL on failure
*/
-btimer_t *start_thread_timer(pthread_t tid, uint32_t wait)
+btimer_t *start_thread_timer(JCR *jcr, pthread_t tid, uint32_t wait)
{
btimer_t *wid;
wid = btimer_start_common(wait);
if (wid == NULL) {
- Dmsg1(200, "start_thread_timer return NULL from common. wait=%d.\n", wait);
+ Dmsg1(dbglvl, "start_thread_timer return NULL from common. wait=%d.\n", wait);
return NULL;
}
wid->type = TYPE_PTHREAD;
wid->tid = tid;
+ wid->jcr = jcr;
wid->wd->callback = callback_thread_timer;
wid->wd->one_shot = true;
wid->wd->interval = wait;
register_watchdog(wid->wd);
- Dmsg3(200, "Start thread timer %p tid %p for %d secs.\n", wid, tid, wait);
+ Dmsg3(dbglvl, "Start thread timer %p tid %p for %d secs.\n", wid, tid, wait);
return wid;
}
-/*
+/*
* Start a timer on a BSOCK. kill it after wait seconds.
*
* Returns: btimer_t *(pointer to btimer_t struct) on success
- * NULL on failure
+ * NULL on failure
*/
btimer_t *start_bsock_timer(BSOCK *bsock, uint32_t wait)
{
wid->type = TYPE_BSOCK;
wid->tid = pthread_self();
wid->bsock = bsock;
+ wid->jcr = bsock->jcr();
wid->wd->callback = callback_thread_timer;
wid->wd->one_shot = true;
wid->wd->interval = wait;
register_watchdog(wid->wd);
- Dmsg4(50, "Start bsock timer %p tid=%p for %d secs at %d\n", wid,
- wid->tid, wait, time(NULL));
+ Dmsg4(dbglvl, "Start bsock timer %p tid=%p for %d secs at %d\n", wid,
+ wid->tid, wait, time(NULL));
return wid;
}
void stop_bsock_timer(btimer_t *wid)
{
if (wid == NULL) {
- Dmsg0(200, "stop_bsock_timer called with NULL btimer_id\n");
+ Dmsg0(900, "stop_bsock_timer called with NULL btimer_id\n");
return;
}
- Dmsg3(50, "Stop bsock timer %p tid=%p at %d.\n", wid, wid->tid, time(NULL));
+ Dmsg3(dbglvl, "Stop bsock timer %p tid=%p at %d.\n", wid, wid->tid, time(NULL));
stop_btimer(wid);
}
void stop_thread_timer(btimer_t *wid)
{
if (wid == NULL) {
- Dmsg0(200, "stop_thread_timer called with NULL btimer_id\n");
+ Dmsg0(dbglvl, "stop_thread_timer called with NULL btimer_id\n");
return;
}
- Dmsg2(200, "Stop thread timer %p tid=%p.\n", wid, wid->tid);
+ Dmsg2(dbglvl, "Stop thread timer %p tid=%p.\n", wid, wid->tid);
stop_btimer(wid);
}
{
btimer_t *wid = (btimer_t *)self->data;
- Dmsg4(50, "thread timer %p kill %s tid=%p at %d.\n", self,
+ Dmsg4(dbglvl, "thread timer %p kill %s tid=%p at %d.\n", self,
wid->type == TYPE_BSOCK ? "bsock" : "thread", wid->tid, time(NULL));
+ if (wid->jcr) {
+ Dmsg2(dbglvl, "killed jid=%u Job=%s\n", wid->jcr->JobId, wid->jcr->Job);
+ }
if (wid->type == TYPE_BSOCK && wid->bsock) {
- wid->bsock->timed_out = true;
+ wid->bsock->set_timed_out();
}
pthread_kill(wid->tid, TIMEOUT_SIGNAL);
}
static void stop_btimer(btimer_t *wid)
{
if (wid == NULL) {
- Emsg0(M_ABORT, 0, "stop_btimer called with NULL btimer_id\n");
+ Emsg0(M_ABORT, 0, _("stop_btimer called with NULL btimer_id\n"));
}
unregister_watchdog(wid->wd);
free(wid->wd);
projects / bacula / bacula / blobdiff