*
*/
/*
- Copyright (C) 2000-2005 Kern Sibbald
+ Copyright (C) 2000-2006 Kern Sibbald
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
- version 2 as ammended with additional clauses defined in the
+ version 2 as amended with additional clauses defined in the
file LICENSE in the main source directory.
This program is distributed in the hope that it will be useful,
const int max_last_jobs = 10;
static dlist *jcrs = NULL; /* JCR chain */
-//static brwlock_t lock; /* lock for last jobs and JCR chain */
static pthread_mutex_t jcr_lock = PTHREAD_MUTEX_INITIALIZER;
static pthread_mutex_t job_start_mutex = PTHREAD_MUTEX_INITIALIZER;
void init_last_jobs_list()
{
-// int errstat;
- JCR *jcr;
+ JCR *jcr = NULL;
struct s_last_job *job_entry = NULL;
if (!last_jobs) {
last_jobs = New(dlist(job_entry, &job_entry->link));
-// if ((errstat=rwl_init(&lock)) != 0) {
-// Emsg1(M_ABORT, 0, _("Unable to initialize jcr_chain lock. ERR=%s\n"),
-// strerror(errstat));
-// }
}
if (!jcrs) {
jcrs = New(dlist(jcr, &jcr->link));
}
delete last_jobs;
last_jobs = NULL;
-// rwl_destroy(&lock);
+ }
+ if (jcrs) {
delete jcrs;
+ jcrs = NULL;
}
}
-void read_last_jobs_list(int fd, uint64_t addr)
+bool read_last_jobs_list(int fd, uint64_t addr)
{
struct s_last_job *je, job;
uint32_t num;
Dmsg1(100, "read_last_jobs seek to %d\n", (int)addr);
if (addr == 0 || lseek(fd, (off_t)addr, SEEK_SET) < 0) {
- return;
+ return false;
}
if (read(fd, &num, sizeof(num)) != sizeof(num)) {
- return;
+ return false;
}
Dmsg1(100, "Read num_items=%d\n", num);
if (num > 4 * max_last_jobs) { /* sanity check */
- return;
+ return false;
}
for ( ; num; num--) {
if (read(fd, &job, sizeof(job)) != sizeof(job)) {
Dmsg1(000, "Read job entry. ERR=%s\n", strerror(errno));
- return;
+ return false;
}
if (job.JobId > 0) {
je = (struct s_last_job *)malloc(sizeof(struct s_last_job));
}
}
}
+ return true;
}
uint64_t write_last_jobs_list(int fd, uint64_t addr)
{
Dmsg0(3400, "Enter remove_jcr\n");
if (!jcr) {
- Emsg0(M_ABORT, 0, "NULL jcr.\n");
+ Emsg0(M_ABORT, 0, _("NULL jcr.\n"));
}
jcrs->remove(jcr);
Dmsg0(3400, "Leave remove_jcr\n");
case JT_BACKUP:
case JT_VERIFY:
case JT_RESTORE:
+ case JT_MIGRATE:
+ case JT_COPY:
case JT_ADMIN:
num_jobs_run++;
last_job.Errors = jcr->Errors;
void free_jcr(JCR *jcr)
{
- Dmsg1(3400, "Enter free_jcr 0x%x\n", jcr);
+ Dmsg2(3400, "Enter free_jcr 0x%x job=%d\n", jcr, jcr->JobId);
#endif
Dmsg3(3400, "Dec free_jcr 0x%x use_count=%d jobid=%d\n", jcr, jcr->use_count, jcr->JobId);
if (jcr->use_count > 0) { /* if in use */
unlock_jcr_chain();
- Dmsg2(3400, "free_jcr 0x%x use_count=%d\n", jcr, jcr->use_count);
+ Dmsg3(3400, "free_jcr 0x%x job=%d use_count=%d\n", jcr, jcr->JobId, jcr->use_count);
return;
}
}
free_common_jcr(jcr);
close_msg(NULL); /* flush any daemon messages */
+ garbage_collect_memory_pool();
Dmsg0(3400, "Exit free_jcr\n");
}
static void lock_jcr_chain()
#endif
{
-// int errstat;
#ifdef TRACE_JCR_CHAIN
Dmsg3(3400, "Lock jcr chain %d from %s:%d\n", ++lock_count,
fname, line);
#endif
-// if ((errstat=rwl_writelock(&lock)) != 0) {
-// Emsg1(M_ABORT, 0, "rwl_writelock failure. ERR=%s\n",
-// strerror(errstat));
-// }
P(jcr_lock);
}
static void unlock_jcr_chain()
#endif
{
-// int errstat;
#ifdef TRACE_JCR_CHAIN
Dmsg3(3400, "Unlock jcr chain %d from %s:%d\n", lock_count--,
fname, line);
#endif
-// if ((errstat=rwl_writeunlock(&lock)) != 0) {
-// Emsg1(M_ABORT, 0, "rwl_writeunlock failure. ERR=%s\n",
-// strerror(errstat));
-// }
V(jcr_lock);
}
-JCR *get_next_jcr(JCR *prev_jcr)
+/*
+ * Start walk of jcr chain
+ * The proper way to walk the jcr chain is:
+ * JCR *jcr;
+ * foreach_jcr(jcr) {
+ * ...
+ * }
+ * endeach_jcr(jcr);
+ *
+ * It is possible to leave out the endeach_jcr(jcr), but
+ * in that case, the last jcr referenced must be explicitly
+ * released with:
+ *
+ * free_jcr(jcr);
+ *
+ */
+JCR *jcr_walk_start()
+{
+ JCR *jcr;
+ lock_jcr_chain();
+ jcr = (JCR *)jcrs->first();
+ if (jcr) {
+ jcr->inc_use_count();
+ Dmsg3(3400, "Inc jcr_walk_start 0x%x job=%d use_count=%d\n", jcr,
+ jcr->JobId, jcr->use_count);
+ }
+ unlock_jcr_chain();
+ return jcr;
+}
+
+/*
+ * Get next jcr from chain, and release current one
+ */
+JCR *jcr_walk_next(JCR *prev_jcr)
{
JCR *jcr;
jcr = (JCR *)jcrs->next(prev_jcr);
if (jcr) {
jcr->inc_use_count();
- Dmsg2(3400, "Inc get_next_jcr 0x%x use_count=%d\n", jcr, jcr->use_count);
+ Dmsg3(3400, "Inc jcr_walk_next 0x%x job=%d use_count=%d\n", jcr,
+ jcr->JobId, jcr->use_count);
}
unlock_jcr_chain();
+ if (prev_jcr) {
+ free_jcr(prev_jcr);
+ }
return jcr;
}
+/*
+ * Release last jcr referenced
+ */
+void jcr_walk_end(JCR *jcr)
+{
+ if (jcr) {
+ free_jcr(jcr);
+ }
+}
+
+
+/*
+ * Setup to call the timeout check routine every 30 seconds
+ * This routine will check any timers that have been enabled.
+ */
bool init_jcr_subsystem(void)
{
watchdog_t *wd = new_watchdog();
*/
foreach_jcr(jcr) {
if (jcr->JobId == 0) {
- free_jcr(jcr);
continue;
}
fd = jcr->store_bsock;
timer_start = fd->timer_start;
if (timer_start && (watchdog_time - timer_start) > fd->timeout) {
fd->timer_start = 0; /* turn off timer */
- fd->timed_out = TRUE;
+ fd->timed_out = true;
Jmsg(jcr, M_ERROR, 0, _(
"Watchdog sending kill after %d secs to thread stalled reading Storage daemon.\n"),
watchdog_time - timer_start);
timer_start = fd->timer_start;
if (timer_start && (watchdog_time - timer_start) > fd->timeout) {
fd->timer_start = 0; /* turn off timer */
- fd->timed_out = TRUE;
+ fd->timed_out = true;
Jmsg(jcr, M_ERROR, 0, _(
"Watchdog sending kill after %d secs to thread stalled reading File daemon.\n"),
watchdog_time - timer_start);
timer_start = fd->timer_start;
if (timer_start && (watchdog_time - timer_start) > fd->timeout) {
fd->timer_start = 0; /* turn off timer */
- fd->timed_out = TRUE;
+ fd->timed_out = true;
Jmsg(jcr, M_ERROR, 0, _(
"Watchdog sending kill after %d secs to thread stalled reading Director.\n"),
watchdog_time - timer_start);
pthread_kill(jcr->my_thread_id, TIMEOUT_SIGNAL);
}
}
- free_jcr(jcr);
}
+ endeach_jcr(jcr);
Dmsg0(3400, "Finished JCR timeout checks\n");
}
projects / bacula / bacula / blobdiff