extern void timeout_handler(int sig);
-struct s_last_job last_job; /* last job run by this daemon */
+struct s_last_job last_job; /* last job run by this daemon */
+dlist *last_jobs;
+#define MAX_LAST_JOBS 10
static JCR *jobs = NULL; /* pointer to JCR chain */
+
+/* Mutex for locking various jcr chains while updating */
static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+void init_last_jobs_list()
+{
+ struct s_last_job *job_entry;
+ last_jobs = new dlist(job_entry, &job_entry->link);
+ memset(&last_job, 0, sizeof(last_job));
+}
+
+void term_last_jobs_list()
+{
+ for (void *je=NULL; (je=last_jobs->next(je)); ) {
+ free(je);
+ }
+ delete last_jobs;
+}
+
+void lock_last_jobs_list()
+{
+ P(mutex);
+}
+
+void unlock_last_jobs_list()
+{
+ V(mutex);
+}
+
/*
* Create a Job Control Record and link it into JCR chain
* Returns newly allocated JCR
}
/*
- * Free stuff common to all JCRs
+ * Free stuff common to all JCRs. N.B. Be careful to include only
+ * generic stuff in the common part of the jcr.
*/
static void free_common_jcr(JCR *jcr)
{
/* Keep some statistics */
switch (jcr->JobType) {
- case JT_BACKUP:
- case JT_VERIFY:
- case JT_RESTORE:
- last_job.NumJobs++;
- last_job.JobType = jcr->JobType;
- last_job.JobId = jcr->JobId;
- last_job.VolSessionId = jcr->VolSessionId;
- last_job.VolSessionTime = jcr->VolSessionTime;
- strcpy(last_job.Job, jcr->Job);
- last_job.JobFiles = jcr->JobFiles;
- last_job.JobBytes = jcr->JobBytes;
- last_job.JobStatus = jcr->JobStatus;
- last_job.start_time = jcr->start_time;
- last_job.end_time = time(NULL);
- break;
- default:
- break;
+ case JT_BACKUP:
+ case JT_VERIFY:
+ case JT_RESTORE:
+ case JT_ADMIN:
+ last_job.NumJobs++;
+ last_job.JobType = jcr->JobType;
+ last_job.JobId = jcr->JobId;
+ last_job.VolSessionId = jcr->VolSessionId;
+ last_job.VolSessionTime = jcr->VolSessionTime;
+ bstrncpy(last_job.Job, jcr->Job, sizeof(last_job.Job));
+ last_job.JobFiles = jcr->JobFiles;
+ last_job.JobBytes = jcr->JobBytes;
+ last_job.JobStatus = jcr->JobStatus;
+ last_job.JobLevel = jcr->JobLevel;
+ last_job.start_time = jcr->start_time;
+ last_job.end_time = time(NULL);
+ break;
+ default:
+ break;
}
pthread_mutex_destroy(&jcr->mutex);
}
if (jcr->sd_auth_key) {
- Dmsg0(200, "Free JCR sd_auth_key\n");
free(jcr->sd_auth_key);
jcr->sd_auth_key = NULL;
}
free_pool_memory(jcr->errmsg);
jcr->errmsg = NULL;
}
+ if (jcr->where) {
+ free(jcr->where);
+ jcr->where = NULL;
+ }
+ if (jcr->cached_path) {
+ free_pool_memory(jcr->cached_path);
+ jcr->cached_path = NULL;
+ jcr->cached_pnl = 0;
+ }
+ free_getuser_cache();
+ free_getgroup_cache();
free(jcr);
}
void free_jcr(JCR *jcr)
{
+
Dmsg1(200, "Enter free_jcr 0x%x\n", jcr);
#endif
+ struct s_last_job *je;
P(mutex);
jcr->use_count--; /* decrement use count */
- Dmsg2(200, "Dec jcr 0x%x use_count=%d\n", jcr, jcr->use_count);
+ Dmsg3(200, "Dec jcr 0x%x use_count=%d jobid=%d\n", jcr, jcr->use_count, jcr->JobId);
if (jcr->use_count > 0) { /* if in use */
V(mutex);
Dmsg2(200, "jcr 0x%x use_count=%d\n", jcr, jcr->use_count);
return;
}
remove_jcr(jcr);
- V(mutex);
+ Dmsg1(200, "End job=%d\n", jcr->JobId);
if (jcr->daemon_free_jcr) {
jcr->daemon_free_jcr(jcr); /* call daemon free routine */
}
+
free_common_jcr(jcr);
- P(mutex);
+ /* Keep list of last jobs, but not Console where JobId==0 */
+ if (last_job.JobId > 0) {
+ je = (struct s_last_job *)malloc(sizeof(struct s_last_job));
+ memcpy((char *)je, (char *)&last_job, sizeof(last_job));
+ last_jobs->append(je);
+ if (last_jobs->size() > MAX_LAST_JOBS) {
+ last_jobs->remove(last_jobs->first());
+ }
+ last_job.JobId = 0; /* zap last job */
+ }
close_msg(NULL); /* flush any daemon messages */
V(mutex);
Dmsg0(200, "Exit free_jcr\n");
JCR *jcr;
int len;
+ if (!Job) {
+ return NULL;
+ }
P(mutex);
len = strlen(Job);
for (jcr = jobs; jcr; jcr=jcr->next) {
{
JCR *jcr;
+ if (!Job) {
+ return NULL;
+ }
P(mutex);
for (jcr = jobs; jcr; jcr=jcr->next) {
if (strcmp(jcr->Job, Job) == 0) {