Fix setip crash + missing unlocks()+cleanups

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

diff --git a/bacula/src/lib/jcr.c b/bacula/src/lib/jcr.c
index ff0573747b8600657ed8a5707bf60ac0ed9f3899..f3710da0032a03227402e048c2ccda63233cb0f2 100755 (executable)
--- a/bacula/src/lib/jcr.c
+++ b/bacula/src/lib/jcr.c
@@ -39,7 +39,7 @@ static void timeout_handler(int sig);
 static void jcr_timeout_check(watchdog_t *self);
 
 struct s_last_job last_job;    /* last job run by this daemon */
-dlist *last_jobs;
+dlist *last_jobs = NULL;
 #define MAX_LAST_JOBS 10
 
 static JCR *jobs = NULL;             /* pointer to JCR chain */
@@ -50,16 +50,22 @@ static pthread_mutex_t jcr_chain_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));
+   if (!last_jobs) {
+      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);                    
+   char *je;
+   if (last_jobs) {
+      foreach_dlist(je, last_jobs) {
+        free(je);                     
+      }
+      delete last_jobs;
+      last_jobs = NULL;
    }
-   delete last_jobs;
 }
 
 void lock_last_jobs_list() 
@@ -228,10 +234,10 @@ void free_jcr(JCR *jcr)
 
    P(jcr_chain_mutex);
    jcr->use_count--;                 /* decrement use count */
-   Dmsg3(200, "Dec jcr 0x%x use_count=%d jobid=%d\n", jcr, jcr->use_count, jcr->JobId);
+   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);
-      Dmsg2(200, "jcr 0x%x use_count=%d\n", jcr, jcr->use_count);
+      Dmsg2(200, "free_jcr 0x%x use_count=%d\n", jcr, jcr->use_count);
       return;
    }
    remove_jcr(jcr);
@@ -247,6 +253,9 @@ void free_jcr(JCR *jcr)
    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());
@@ -266,7 +275,7 @@ void free_jcr(JCR *jcr)
 void free_locked_jcr(JCR *jcr)
 {
    jcr->use_count--;                 /* decrement use count */
-   Dmsg2(200, "Dec jcr 0x%x use_count=%d\n", jcr, jcr->use_count);
+   Dmsg2(200, "Dec free_locked_jcr 0x%x use_count=%d\n", jcr, jcr->use_count);
    if (jcr->use_count > 0) {         /* if in use */
       return;
    }
@@ -293,7 +302,7 @@ JCR *get_jcr_by_id(uint32_t JobId)
         P(jcr->mutex);
         jcr->use_count++;
         V(jcr->mutex);
-         Dmsg2(200, "Inc jcr 0x%x use_count=%d\n", jcr, jcr->use_count);
+         Dmsg2(200, "Inc get_jcr 0x%x use_count=%d\n", jcr, jcr->use_count);
         break;
       }
    }
@@ -317,7 +326,7 @@ JCR *get_jcr_by_session(uint32_t SessionId, uint32_t SessionTime)
         P(jcr->mutex);
         jcr->use_count++;
         V(jcr->mutex);
-         Dmsg2(200, "Inc jcr 0x%x use_count=%d\n", jcr, jcr->use_count);
+         Dmsg2(200, "Inc get_jcr 0x%x use_count=%d\n", jcr, jcr->use_count);
         break;
       }
    }
@@ -348,7 +357,7 @@ JCR *get_jcr_by_partial_name(char *Job)
         P(jcr->mutex);
         jcr->use_count++;
         V(jcr->mutex);
-         Dmsg2(200, "Inc jcr 0x%x use_count=%d\n", jcr, jcr->use_count);
+         Dmsg2(200, "Inc get_jcr 0x%x use_count=%d\n", jcr, jcr->use_count);
         break;
       }
    }
@@ -376,7 +385,7 @@ JCR *get_jcr_by_full_name(char *Job)
         P(jcr->mutex);
         jcr->use_count++;
         V(jcr->mutex);
-         Dmsg2(200, "Inc jcr 0x%x use_count=%d\n", jcr, jcr->use_count);
+         Dmsg2(200, "Inc get_jcr 0x%x use_count=%d\n", jcr, jcr->use_count);
         break;
       }
    }
@@ -419,27 +428,27 @@ void unlock_jcr_chain()
 }
 
 
-JCR *get_next_jcr(JCR *jcr)
+JCR *get_next_jcr(JCR *prev_jcr)
 {
-   JCR *rjcr;
+   JCR *jcr;
 
-   if (jcr == NULL) {
-      rjcr = jobs;
+   if (prev_jcr == NULL) {
+      jcr = jobs;
    } else {
-      rjcr = jcr->next;
+      jcr = prev_jcr->next;
    }
-   if (rjcr) {
-      P(rjcr->mutex);
-      rjcr->use_count++;
-      V(rjcr->mutex);
-      Dmsg1(200, "Inc jcr use_count=%d\n", rjcr->use_count);
+   if (jcr) {
+      P(jcr->mutex);
+      jcr->use_count++;
+      V(jcr->mutex);
+      Dmsg2(200, "Inc get_next_jcr 0x%x use_count=%d\n", jcr, jcr->use_count);
    }
-   return rjcr;
+   return jcr;
 }
 
 bool init_jcr_subsystem(void)
 {
-   watchdog_t *wd = watchdog_new();
+   watchdog_t *wd = new_watchdog();
 
    wd->one_shot = false;
    wd->interval = 30;  /* FIXME: should be configurable somewhere, even
@@ -457,7 +466,7 @@ static void jcr_timeout_check(watchdog_t *self)
    BSOCK *fd;
    time_t timer_start;
 
-   Dmsg0(200, "Start JCR timeout checks\n");
+   Dmsg0(400, "Start JCR timeout checks\n");
 
    /* Walk through all JCRs checking if any one is 
     * blocked for more than specified max time.