Use rentrant mysql lib, eliminate race in sql_list, Win32 streams, misc see kes-1.31

[bacula/bacula] / bacula / src / stored / parse_bsr.c

diff --git a/bacula/src/stored/parse_bsr.c b/bacula/src/stored/parse_bsr.c
index f0dc3a62e2f6496173cec43d19458430eb0270af..270747760047d0f0fd5321863a11266ad20ee2d8 100755 (executable)
--- a/bacula/src/stored/parse_bsr.c
+++ b/bacula/src/stored/parse_bsr.c
@@ -41,6 +41,7 @@ static BSR *store_joblevel(LEX *lc, BSR *bsr);
 static BSR *store_findex(LEX *lc, BSR *bsr);
 static BSR *store_sessid(LEX *lc, BSR *bsr);
 static BSR *store_volfile(LEX *lc, BSR *bsr);
+static BSR *store_volblock(LEX *lc, BSR *bsr);
 static BSR *store_sesstime(LEX *lc, BSR *bsr);
 static BSR *store_include(LEX *lc, BSR *bsr);
 static BSR *store_exclude(LEX *lc, BSR *bsr);
@@ -69,6 +70,7 @@ struct kw_items items[] = {
    {"include", store_include},
    {"exclude", store_exclude},
    {"volfile", store_volfile},
+   {"volblock", store_volblock},
    {"stream",  store_stream},
    {"slot",    store_slot},
    {NULL, NULL}
@@ -399,6 +401,41 @@ static BSR *store_volfile(LEX *lc, BSR *bsr)
 }
 
 
+/*
+ * Routine to handle Volume start/end Block  
+ */
+static BSR *store_volblock(LEX *lc, BSR *bsr)
+{
+   int token;
+   BSR_VOLBLOCK *volblock;
+
+   for (;;) {
+      token = lex_get_token(lc, T_PINT32_RANGE);
+      if (token == T_ERROR) {
+        return NULL;
+      }
+      volblock = (BSR_VOLBLOCK *)malloc(sizeof(BSR_VOLBLOCK));
+      memset(volblock, 0, sizeof(BSR_VOLBLOCK));
+      volblock->sblock = lc->pint32_val;
+      volblock->eblock = lc->pint32_val2;
+      /* Add it to the end of the chain */
+      if (!bsr->volblock) {
+        bsr->volblock = volblock;
+      } else {
+        /* Add to end of chain */
+        BSR_VOLBLOCK *bs = bsr->volblock;
+        for ( ;bs->next; bs=bs->next)
+           {  }
+        bs->next = volblock;
+      }
+      token = lex_get_token(lc, T_ALL);
+      if (token != T_COMMA) {
+        break;
+      }
+   }
+   return bsr;
+}
+
 
 static BSR *store_sessid(LEX *lc, BSR *bsr)
 {
@@ -528,6 +565,15 @@ void dump_volfile(BSR_VOLFILE *volfile)
    }
 }
 
+void dump_volblock(BSR_VOLBLOCK *volblock)
+{
+   if (volblock) {
+      Dmsg2(-1, "VolBlock    : %u-%u\n", volblock->sblock, volblock->eblock);
+      dump_volblock(volblock->next);
+   }
+}
+
+
 void dump_findex(BSR_FINDEX *FileIndex)
 {
    if (FileIndex) {
@@ -613,6 +659,7 @@ void dump_bsr(BSR *bsr)
    dump_sessid(bsr->sessid);
    dump_sesstime(bsr->sesstime);
    dump_volfile(bsr->volfile);
+   dump_volblock(bsr->volblock);
    dump_client(bsr->client);
    dump_jobid(bsr->JobId);
    dump_job(bsr->job);
@@ -654,6 +701,7 @@ void free_bsr(BSR *bsr)
    free_bsr_item((BSR *)bsr->sessid);
    free_bsr_item((BSR *)bsr->sesstime);
    free_bsr_item((BSR *)bsr->volfile);
+   free_bsr_item((BSR *)bsr->volblock);
    free_bsr_item((BSR *)bsr->JobId);
    free_bsr_item((BSR *)bsr->job);
    free_bsr_item((BSR *)bsr->FileIndex);
@@ -690,10 +738,16 @@ int add_vol(JCR *jcr, VOL_LIST *vol)
    } else {
       for ( ; next->next; next=next->next) {
         if (strcmp(vol->VolumeName, next->VolumeName) == 0) {
+           if (vol->start_file < next->start_file) {
+              next->start_file = vol->start_file;
+           }
            return 0;                 /* already in list */
         }
       }
       if (strcmp(vol->VolumeName, next->VolumeName) == 0) {
+        if (vol->start_file < next->start_file) {
+           next->start_file = vol->start_file;
+        }
         return 0;                    /* already in list */
       }
       next->next = vol;              /* add volume */
@@ -711,29 +765,44 @@ void free_vol_list(JCR *jcr)
       free(next);
       next = tmp;
    }
+   jcr->VolList = NULL;
 }
 
+/*
+ * Create a list of Volumes (and Slots and Start positions) to be
+ *  used in the current restore job.
+ */
 void create_vol_list(JCR *jcr)
 {
    char *p, *n;
    VOL_LIST *vol;
 
    /* 
-    * Build a list of volume to be processed
+    * Build a list of volumes to be processed
     */
    jcr->NumVolumes = 0;
-   jcr->CurVolume = 1;
+   jcr->CurVolume = 0;
    if (jcr->bsr) {
       BSR *bsr = jcr->bsr;
       if (!bsr->volume || !bsr->volume->VolumeName) {
         return;
       }
-      strcpy(jcr->VolumeName, bsr->volume->VolumeName); /* setup first volume */
       for ( ; bsr; bsr=bsr->next) {
-        BSR_VOLUME *bsrvol = bsr->volume;
-        for ( ; bsrvol; bsrvol=bsrvol->next) {
+        BSR_VOLUME *bsrvol;
+        BSR_VOLFILE *volfile;
+        uint32_t sfile = UINT32_MAX;
+
+        /* Find minimum start file so that we can forward space to it */
+        for (volfile = bsr->volfile; volfile; volfile=volfile->next) {
+           if (volfile->sfile < sfile) {
+              sfile = volfile->sfile;
+           }
+        }
+        /* Now add volumes for this bsr */
+        for (bsrvol = bsr->volume; bsrvol; bsrvol=bsrvol->next) {
            vol = new_vol();
            strcpy(vol->VolumeName, bsrvol->VolumeName);
+           vol->start_file = sfile;
            if (add_vol(jcr, vol)) {
               jcr->NumVolumes++;
                Dmsg1(400, "Added volume %s\n", vol->VolumeName);
@@ -741,6 +810,7 @@ void create_vol_list(JCR *jcr)
                Dmsg1(400, "Duplicate volume %s\n", vol->VolumeName);
               free((char *)vol);
            }
+           sfile = 0;                /* start at beginning of second volume */
         }
       }
    } else {