const int dbglvl = 3400;
/* External variables we reference */
-extern time_t watchdog_time;
/* External referenced functions */
void free_bregexps(alist *bregexps);
free_guid_list(jcr->id_list);
jcr->id_list = NULL;
}
- /* Invalidate the tsd jcr data */
- set_jcr_in_tsd(INVALID_JCR);
+ remove_jcr_from_tsd(jcr);
free(jcr);
}
#endif
- dequeue_messages(jcr);
lock_jcr_chain();
jcr->dec_use_count(); /* decrement use count */
if (jcr->use_count() < 0) {
}
remove_jcr(jcr); /* remove Jcr from chain */
+ dequeue_messages(jcr);
job_end_pop(jcr); /* pop and call hooked routines */
Dmsg1(dbglvl, "End job=%d\n", jcr->JobId);
num_jobs_run++;
je = (struct s_last_job *)malloc(sizeof(struct s_last_job));
memset(je, 0, sizeof(struct s_last_job)); /* zero in case unset fields */
- je->Errors = jcr->Errors;
+ je->Errors = jcr->JobErrors;
je->JobType = jcr->get_JobType();
je->JobId = jcr->JobId;
je->VolSessionId = jcr->VolSessionId;
Dmsg0(dbglvl, "Exit free_jcr\n");
}
+/*
+ * Remove jcr from thread specific data, but
+ * but make sure it is us who are attached.
+ */
+void remove_jcr_from_tsd(JCR *jcr)
+{
+ JCR *tjcr = get_jcr_from_tsd();
+ if (tjcr == jcr) {
+ set_jcr_in_tsd(INVALID_JCR);
+ }
+}
+
+/*
+ * Put this jcr in the thread specifc data
+ */
void set_jcr_in_tsd(JCR *jcr)
{
int status = pthread_setspecific(jcr_key, (void *)jcr);
}
}
+/*
+ * Give me the jcr that is attached to this thread
+ */
JCR *get_jcr_from_tsd()
{
JCR *jcr = (JCR *)pthread_getspecific(jcr_key);
return priority;
}
-void set_jcr_job_status(JCR *jcr, int JobStatus)
+
+static void update_wait_time(JCR *jcr, int newJobStatus)
{
- bool set_waittime = false;
- int oldJobStatus = jcr->JobStatus;
- int priority, old_priority;
-
- priority = get_status_priority(JobStatus);
- old_priority = get_status_priority(oldJobStatus);
-
- Dmsg2(800, "set_jcr_job_status(%s, %c)\n", jcr->Job, JobStatus);
- /* if wait state is new, we keep current time for watchdog MaxWaitTime */
- switch (JobStatus) {
- case JS_WaitFD:
- case JS_WaitSD:
- case JS_WaitMedia:
- case JS_WaitMount:
- case JS_WaitStoreRes:
- case JS_WaitJobRes:
- case JS_WaitClientRes:
- case JS_WaitMaxJobs:
- case JS_WaitPriority:
- set_waittime = true;
- default:
- break;
- }
-
- /*
- * For a set of errors, ... keep the current status
- * so it isn't lost. For all others, set it.
- */
- Dmsg3(300, "jid=%u OnEntry JobStatus=%c set=%c\n", (uint32_t)jcr->JobId,
- jcr->JobStatus, JobStatus);
- if (priority >= old_priority) {
- jcr->JobStatus = JobStatus; /* replace with new priority */
+ bool enter_in_waittime;
+ int oldJobStatus = jcr->JobStatus;
+
+ switch (newJobStatus) {
+ case JS_WaitFD:
+ case JS_WaitSD:
+ case JS_WaitMedia:
+ case JS_WaitMount:
+ case JS_WaitStoreRes:
+ case JS_WaitJobRes:
+ case JS_WaitClientRes:
+ case JS_WaitMaxJobs:
+ case JS_WaitPriority:
+ enter_in_waittime = true;
+ break;
+ default:
+ enter_in_waittime = false; /* not a Wait situation */
+ break;
}
+
/*
* If we were previously waiting and are not any more
* we want to update the wait_time variable, which is
case JS_WaitClientRes:
case JS_WaitMaxJobs:
case JS_WaitPriority:
- set_waittime = false; /* keep old time */
+ if (!enter_in_waittime) { /* we get out the wait time */
+ jcr->wait_time_sum += (time(NULL) - jcr->wait_time);
+ jcr->wait_time = 0;
+ }
+ break;
+
+ /* if wait state is new, we keep current time for watchdog MaxWaitTime */
default:
- if (set_waittime) {
- Dmsg0(800, "Setting wait_time\n");
+ if (enter_in_waittime) {
jcr->wait_time = time(NULL);
}
+ break;
+ }
+}
+
+void set_jcr_job_status(JCR *jcr, int JobStatus)
+{
+ int priority, old_priority;
+ int oldJobStatus = jcr->JobStatus;
+ priority = get_status_priority(JobStatus);
+ old_priority = get_status_priority(oldJobStatus);
+
+ Dmsg2(800, "set_jcr_job_status(%s, %c)\n", jcr->Job, JobStatus);
+
+ /* Update wait_time depending on newJobStatus and oldJobStatus */
+ update_wait_time(jcr, JobStatus);
+
+ /*
+ * For a set of errors, ... keep the current status
+ * so it isn't lost. For all others, set it.
+ */
+ Dmsg3(300, "jid=%u OnEntry JobStatus=%c set=%c\n", (uint32_t)jcr->JobId,
+ jcr->JobStatus, JobStatus);
+ if (priority >= old_priority) {
+ jcr->JobStatus = JobStatus; /* replace with new priority */
}
+
if (oldJobStatus != jcr->JobStatus) {
Dmsg3(200, "jid=%u leave set_old_job_status=%c new_set=%c\n", (uint32_t)jcr->JobId,
oldJobStatus, JobStatus);
V(jcr_lock);
}
-/*
- * This function should be used only after receiving a violent signal
- * We walk through the JCR chain without doing any lock, bacula should
- * not be running.
- */
-void print_jcr_dbg()
-{
- char buf1[128], buf2[128], buf3[128], buf4[128];
-
- if (!jcrs) {
- return;
- }
-
- fprintf(stderr, "Attempt to dump current JCRs\n");
-
- for (JCR *jcr = (JCR *)jcrs->first(); jcr ; jcr = (JCR *)jcrs->next(jcr)) {
- if (!jcr) { /* protect us against something ? */
- continue;
- }
-
- fprintf(stderr, "JCR=%p JobId=%i name=%s JobStatus=%c\n",
- jcr, jcr->JobId, jcr->Job, jcr->JobStatus);
- fprintf(stderr, "\tuse_count=%i threadid=0x%x\n",
- jcr->use_count(), (int)jcr->my_thread_id);
- fprintf(stderr, "\tJobType=%c JobLevel=%c\n",
- jcr->get_JobType(), jcr->get_JobLevel());
- bstrftime(buf1, sizeof(buf1), jcr->sched_time);
- bstrftime(buf2, sizeof(buf2), jcr->start_time);
- bstrftime(buf3, sizeof(buf3), jcr->end_time);
- bstrftime(buf4, sizeof(buf4), jcr->wait_time);
- fprintf(stderr, "\tsched_time=%s start_time=%s\n\tend_time=%s wait_time=%s\n",
- buf1, buf2, buf3, buf4);
- fprintf(stderr, "\tdequeing=%i\n", jcr->dequeuing);
- fprintf(stderr, "\tdb=%p db_batch=%p batch_started=%i\n",
- jcr->db, jcr->db_batch, jcr->batch_started);
- }
-}
-
/*
* Start walk of jcr chain
* The proper way to walk the jcr chain is:
{
return; /* thus interrupting the function */
}
+
+/* Used to display specific daemon information after a fatal signal
+ * (like B_DB in the director)
+ */
+#define MAX_DBG_HOOK 10
+static dbg_jcr_hook_t *dbg_jcr_hooks[MAX_DBG_HOOK];
+static int dbg_jcr_handler_count;
+
+void dbg_jcr_add_hook(dbg_jcr_hook_t *fct)
+{
+ ASSERT(dbg_jcr_handler_count < MAX_DBG_HOOK);
+ dbg_jcr_hooks[dbg_jcr_handler_count++] = fct;
+}
+
+/*
+ * !!! WARNING !!!
+ *
+ * This function should be used ONLY after a fatal signal. We walk through the
+ * JCR chain without doing any lock, bacula should not be running.
+ */
+void _dbg_print_jcr(FILE *fp)
+{
+ char buf1[128], buf2[128], buf3[128], buf4[128];
+ if (!jcrs) {
+ return;
+ }
+
+ fprintf(fp, "Attempt to dump current JCRs\n");
+
+ for (JCR *jcr = (JCR *)jcrs->first(); jcr ; jcr = (JCR *)jcrs->next(jcr)) {
+ if (!jcr) { /* protect us against something ? */
+ continue;
+ }
+
+ fprintf(fp, "JCR=%p JobId=%i name=%s JobStatus=%c\n",
+ jcr, jcr->JobId, jcr->Job, jcr->JobStatus);
+#ifdef HAVE_WIN32
+ fprintf(fp, "\tuse_count=%i\n",
+ jcr->use_count());
+#else
+ fprintf(fp, "\tuse_count=%i threadid=0x%x\n",
+ jcr->use_count(), (int)jcr->my_thread_id);
+#endif
+ fprintf(fp, "\tJobType=%c JobLevel=%c\n",
+ jcr->get_JobType(), jcr->get_JobLevel());
+ bstrftime(buf1, sizeof(buf1), jcr->sched_time);
+ bstrftime(buf2, sizeof(buf2), jcr->start_time);
+ bstrftime(buf3, sizeof(buf3), jcr->end_time);
+ bstrftime(buf4, sizeof(buf4), jcr->wait_time);
+ fprintf(fp, "\tsched_time=%s start_time=%s\n\tend_time=%s wait_time=%s\n",
+ buf1, buf2, buf3, buf4);
+ fprintf(fp, "\tdequeing=%i\n", jcr->dequeuing);
+ fprintf(fp, "\tdb=%p db_batch=%p batch_started=%i\n",
+ jcr->db, jcr->db_batch, jcr->batch_started);
+
+ for(int i=0; i < dbg_jcr_handler_count; i++) {
+ dbg_jcr_hook_t *fct = dbg_jcr_hooks[i];
+ fct(jcr, fp);
+ }
+ }
+}
projects / bacula / bacula / blobdiff