Fix reporting jobs from state file + misc

[bacula/bacula] / bacula / src / lib / jcr.c

diff --git a/bacula/src/lib/jcr.c b/bacula/src/lib/jcr.c
index f3710da0032a03227402e048c2ccda63233cb0f2..5ef6c4fac00fb52924ba8f1ea2fe9c42b6116430 100755 (executable)
--- a/bacula/src/lib/jcr.c
+++ b/bacula/src/lib/jcr.c
@@ -44,40 +44,97 @@ dlist *last_jobs = NULL;
 
 static JCR *jobs = NULL;             /* pointer to JCR chain */
 
-/* Mutex for locking various jcr chains while updating */
-static pthread_mutex_t jcr_chain_mutex = PTHREAD_MUTEX_INITIALIZER;
+static brwlock_t lock;               /* lock for last jobs and JCR chain */
 
 void init_last_jobs_list()
 {
-   struct s_last_job *job_entry;
+   int errstat;
+   struct s_last_job *job_entry = NULL;
    if (!last_jobs) {
       last_jobs = new dlist(job_entry, &job_entry->link);
       memset(&last_job, 0, sizeof(last_job));
+      if ((errstat=rwl_init(&lock)) != 0) {
+         Emsg1(M_ABORT, 0, _("Unable to initialize jcr_chain lock. ERR=%s\n"), 
+              strerror(errstat));
+      }
    }
+
 }
 
 void term_last_jobs_list()
 {
-   char *je;
+   struct s_last_job *je;
    if (last_jobs) {
       foreach_dlist(je, last_jobs) {
         free(je);                     
       }
       delete last_jobs;
       last_jobs = NULL;
+      rwl_destroy(&lock);
+   }
+}
+
+void read_last_jobs_list(int fd, uint64_t addr)
+{
+   struct s_last_job *je;
+
+   if (addr == 0 || lseek(fd, addr, SEEK_SET) < 0) {
+      return;
+   }
+   for ( ;; ) {
+      if (read(fd, &last_job, sizeof(last_job)) < 0) {
+        return;
+      }
+      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));
+        if (!last_jobs) {
+           init_last_jobs_list();
+        }
+        last_jobs->append(je);
+        if (last_jobs->size() > MAX_LAST_JOBS) {
+           last_jobs->remove(last_jobs->first());
+        }
+        last_job.JobId = 0;             /* zap last job */
+      } else {
+        break;
+      }
+   }
+}
+
+uint64_t write_last_jobs_list(int fd, uint64_t addr)
+{
+   struct s_last_job *je;
+   if (lseek(fd, addr, SEEK_SET) < 0) {
+      return 0;
    }
+   if (last_jobs) {
+      foreach_dlist(je, last_jobs) {
+        if (write(fd, je, sizeof(struct s_last_job)) < 0) {
+           return 0;
+        }
+      }
+   }
+   memset(&last_job, 0, sizeof(last_job));
+   write(fd, &last_job, sizeof(last_job));
+   ssize_t stat = lseek(fd, 0, SEEK_CUR);
+   if (stat < 0) {
+      return 0;
+   }
+   return stat;
+      
 }
 
 void lock_last_jobs_list() 
 {
    /* Use jcr chain mutex */
-   P(jcr_chain_mutex);
+   lock_jcr_chain();
 }
 
 void unlock_last_jobs_list() 
 {
    /* Use jcr chain mutex */
-   V(jcr_chain_mutex);
+   unlock_jcr_chain();
 }
 
 /*
@@ -89,11 +146,13 @@ void unlock_last_jobs_list()
 JCR *new_jcr(int size, JCR_free_HANDLER *daemon_free_jcr)
 {
    JCR *jcr;
+   MQUEUE_ITEM *item = NULL;
    struct sigaction sigtimer;
 
    Dmsg0(200, "Enter new_jcr\n");
    jcr = (JCR *)malloc(size);
    memset(jcr, 0, size);
+   jcr->msg_queue = new dlist(item, &item->link);
    jcr->my_thread_id = pthread_self();
    jcr->sched_time = time(NULL);
    jcr->daemon_free_jcr = daemon_free_jcr;    /* plug daemon free routine */
@@ -111,14 +170,14 @@ JCR *new_jcr(int size, JCR_free_HANDLER *daemon_free_jcr)
    sigfillset(&sigtimer.sa_mask);
    sigaction(TIMEOUT_SIGNAL, &sigtimer, NULL);
 
-   P(jcr_chain_mutex);
+   lock_jcr_chain();
    jcr->prev = NULL;
    jcr->next = jobs;
    if (jobs) {
       jobs->prev = jcr;
    }
    jobs = jcr;
-   V(jcr_chain_mutex);
+   unlock_jcr_chain();
    return jcr;
 }
 
@@ -157,7 +216,6 @@ static void free_common_jcr(JCR *jcr)
    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;
@@ -176,6 +234,7 @@ static void free_common_jcr(JCR *jcr)
    pthread_mutex_destroy(&jcr->mutex);
 
    close_msg(jcr);                   /* close messages for this job */
+   delete jcr->msg_queue;
 
    /* do this after closing messages */
    if (jcr->client_name) {
@@ -218,7 +277,7 @@ static void free_common_jcr(JCR *jcr)
  * Global routine to free a jcr
  */
 #ifdef DEBUG
-void b_free_jcr(char *file, int line, JCR *jcr)
+void b_free_jcr(const char *file, int line, JCR *jcr)
 {
    Dmsg3(200, "Enter free_jcr 0x%x from %s:%d\n", jcr, file, line);
 
@@ -232,11 +291,11 @@ void free_jcr(JCR *jcr)
 #endif
    struct s_last_job *je;
 
-   P(jcr_chain_mutex);
+   lock_jcr_chain();
    jcr->use_count--;                 /* decrement use count */
    Dmsg3(200, "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 */
-      V(jcr_chain_mutex);
+      unlock_jcr_chain();
       Dmsg2(200, "free_jcr 0x%x use_count=%d\n", jcr, jcr->use_count);
       return;
    }
@@ -263,7 +322,7 @@ void free_jcr(JCR *jcr)
       last_job.JobId = 0;            /* zap last job */
    }
    close_msg(NULL);                  /* flush any daemon messages */
-   V(jcr_chain_mutex);
+   unlock_jcr_chain();
    Dmsg0(200, "Exit free_jcr\n");
 }
 
@@ -296,7 +355,7 @@ JCR *get_jcr_by_id(uint32_t JobId)
 {
    JCR *jcr;      
 
-   P(jcr_chain_mutex);                 /* lock chain */
+   lock_jcr_chain();                   /* lock chain */
    for (jcr = jobs; jcr; jcr=jcr->next) {
       if (jcr->JobId == JobId) {
         P(jcr->mutex);
@@ -306,7 +365,7 @@ JCR *get_jcr_by_id(uint32_t JobId)
         break;
       }
    }
-   V(jcr_chain_mutex);
+   unlock_jcr_chain();
    return jcr; 
 }
 
@@ -319,7 +378,7 @@ JCR *get_jcr_by_session(uint32_t SessionId, uint32_t SessionTime)
 {
    JCR *jcr;      
 
-   P(jcr_chain_mutex);
+   lock_jcr_chain();
    for (jcr = jobs; jcr; jcr=jcr->next) {
       if (jcr->VolSessionId == SessionId && 
          jcr->VolSessionTime == SessionTime) {
@@ -330,7 +389,7 @@ JCR *get_jcr_by_session(uint32_t SessionId, uint32_t SessionTime)
         break;
       }
    }
-   V(jcr_chain_mutex);
+   unlock_jcr_chain();
    return jcr; 
 }
 
@@ -350,7 +409,7 @@ JCR *get_jcr_by_partial_name(char *Job)
    if (!Job) {
       return NULL;
    }
-   P(jcr_chain_mutex);
+   lock_jcr_chain();
    len = strlen(Job);
    for (jcr = jobs; jcr; jcr=jcr->next) {
       if (strncmp(Job, jcr->Job, len) == 0) {
@@ -361,7 +420,7 @@ JCR *get_jcr_by_partial_name(char *Job)
         break;
       }
    }
-   V(jcr_chain_mutex);
+   unlock_jcr_chain();
    return jcr; 
 }
 
@@ -379,7 +438,7 @@ JCR *get_jcr_by_full_name(char *Job)
    if (!Job) {
       return NULL;
    }
-   P(jcr_chain_mutex);
+   lock_jcr_chain();
    for (jcr = jobs; jcr; jcr=jcr->next) {
       if (strcmp(jcr->Job, Job) == 0) {
         P(jcr->mutex);
@@ -389,7 +448,7 @@ JCR *get_jcr_by_full_name(char *Job)
         break;
       }
    }
-   V(jcr_chain_mutex);
+   unlock_jcr_chain();
    return jcr; 
 }
 
@@ -416,7 +475,11 @@ void set_jcr_job_status(JCR *jcr, int JobStatus)
  */
 void lock_jcr_chain()
 {
-   P(jcr_chain_mutex);
+   int errstat;
+   if ((errstat=rwl_writelock(&lock)) != 0) {
+      Emsg1(M_ABORT, 0, "rwl_writelock failure. ERR=%s\n",
+          strerror(errstat));
+   }
 }
 
 /*
@@ -424,7 +487,11 @@ void lock_jcr_chain()
  */
 void unlock_jcr_chain()
 {
-   V(jcr_chain_mutex);
+   int errstat;
+   if ((errstat=rwl_writeunlock(&lock)) != 0) {
+      Emsg1(M_ABORT, 0, "rwl_writeunlock failure. ERR=%s\n",
+          strerror(errstat));
+   }
 }
 
 
@@ -472,7 +539,7 @@ static void jcr_timeout_check(watchdog_t *self)
     * blocked for more than specified max time.
     */
    lock_jcr_chain();
-   for (jcr=NULL; (jcr=get_next_jcr(jcr)); ) {
+   foreach_jcr(jcr) {
       free_locked_jcr(jcr);          /* OK to free now cuz chain is locked */
       if (jcr->JobId == 0) {
         continue;
@@ -523,7 +590,7 @@ static void jcr_timeout_check(watchdog_t *self)
 /*
  * Timeout signal comes here
  */
-void timeout_handler(int sig)
+static void timeout_handler(int sig)
 {
    return;                           /* thus interrupting the function */
 }