static pthread_mutex_t job_start_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t last_jobs_mutex = PTHREAD_MUTEX_INITIALIZER;
+
+
void lock_jobs()
{
P(job_start_mutex);
void lock_last_jobs_list()
{
- /* Use jcr chain mutex */
- lock_jcr_chain();
+ P(last_jobs_mutex);
}
void unlock_last_jobs_list()
{
- /* Use jcr chain mutex */
- unlock_jcr_chain();
+ V(last_jobs_mutex);
}
/*
jcr->job_end_push.init(1, false);
jcr->sched_time = time(NULL);
jcr->daemon_free_jcr = daemon_free_jcr; /* plug daemon free routine */
- jcr->use_count = 1;
- pthread_mutex_init(&(jcr->mutex), NULL);
- jcr->JobStatus = JS_Created; /* ready to run */
+ jcr->init_mutex();
+ jcr->inc_use_count();
jcr->VolumeName = get_pool_memory(PM_FNAME);
jcr->VolumeName[0] = 0;
jcr->errmsg = get_pool_memory(PM_MESSAGE);
jcr->JobId = 0;
jcr->JobType = JT_SYSTEM; /* internal job until defined */
jcr->JobLevel = L_NONE;
- jcr->JobStatus = JS_Created;
+ set_jcr_job_status(jcr, JS_Created); /* ready to run */
sigtimer.sa_flags = 0;
sigtimer.sa_handler = timeout_handler;
default:
break;
}
- pthread_mutex_destroy(&jcr->mutex);
+ jcr->destroy_mutex();
- delete jcr->msg_queue;
+ if (jcr->msg_queue) {
+ delete jcr->msg_queue;
+ jcr->msg_queue = NULL;
+ }
close_msg(jcr); /* close messages for this job */
/* do this after closing messages */
dequeue_messages(jcr);
lock_jcr_chain();
jcr->dec_use_count(); /* decrement use count */
- if (jcr->use_count < 0) {
+ if (jcr->use_count() < 0) {
Emsg2(M_ERROR, 0, _("JCR use_count=%d JobId=%d\n"),
- jcr->use_count, jcr->JobId);
+ jcr->use_count(), jcr->JobId);
}
- 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 */
+ 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();
- Dmsg3(3400, "free_jcr 0x%x job=%d use_count=%d\n", jcr, jcr->JobId, jcr->use_count);
+ Dmsg3(3400, "free_jcr 0x%x job=%d use_count=%d\n", jcr, jcr->JobId, jcr->use_count());
return;
}
{
JCR *jcr;
- lock_jcr_chain(); /* lock chain */
- foreach_dlist(jcr, jcrs) {
+ foreach_jcr(jcr) {
if (jcr->JobId == JobId) {
jcr->inc_use_count();
- Dmsg2(3400, "Inc get_jcr 0x%x use_count=%d\n", jcr, jcr->use_count);
+ Dmsg2(3400, "Inc get_jcr 0x%x use_count=%d\n", jcr, jcr->use_count());
break;
}
}
- unlock_jcr_chain();
+ endeach_jcr(jcr);
return jcr;
}
{
JCR *jcr;
- lock_jcr_chain();
- foreach_dlist(jcr, jcrs) {
+ foreach_jcr(jcr) {
if (jcr->VolSessionId == SessionId &&
jcr->VolSessionTime == SessionTime) {
jcr->inc_use_count();
- Dmsg2(3400, "Inc get_jcr 0x%x use_count=%d\n", jcr, jcr->use_count);
+ Dmsg2(3400, "Inc get_jcr 0x%x use_count=%d\n", jcr, jcr->use_count());
break;
}
}
- unlock_jcr_chain();
+ endeach_jcr(jcr);
return jcr;
}
if (!Job) {
return NULL;
}
- lock_jcr_chain();
len = strlen(Job);
- foreach_dlist(jcr, jcrs) {
+ foreach_jcr(jcr) {
if (strncmp(Job, jcr->Job, len) == 0) {
jcr->inc_use_count();
- Dmsg2(3400, "Inc get_jcr 0x%x use_count=%d\n", jcr, jcr->use_count);
+ Dmsg2(3400, "Inc get_jcr 0x%x use_count=%d\n", jcr, jcr->use_count());
break;
}
}
- unlock_jcr_chain();
+ endeach_jcr(jcr);
return jcr;
}
if (!Job) {
return NULL;
}
- lock_jcr_chain();
- foreach_dlist(jcr, jcrs) {
+ foreach_jcr(jcr) {
if (strcmp(jcr->Job, Job) == 0) {
jcr->inc_use_count();
- Dmsg2(3400, "Inc get_jcr 0x%x use_count=%d\n", jcr, jcr->use_count);
+ Dmsg2(3400, "Inc get_jcr 0x%x use_count=%d\n", jcr, jcr->use_count());
break;
}
}
- unlock_jcr_chain();
+ endeach_jcr(jcr);
return jcr;
}
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);
+ jcr->JobId, jcr->use_count());
}
unlock_jcr_chain();
return jcr;
if (jcr) {
jcr->inc_use_count();
Dmsg3(3400, "Inc jcr_walk_next 0x%x job=%d use_count=%d\n", jcr,
- jcr->JobId, jcr->use_count);
+ jcr->JobId, jcr->use_count());
}
unlock_jcr_chain();
if (prev_jcr) {
* blocked for more than specified max time.
*/
foreach_jcr(jcr) {
+ Dmsg2(3400, "jcr_timeout_check JobId=%u jcr=0x%x\n", jcr->JobId, jcr);
if (jcr->JobId == 0) {
continue;
}