Fix for reused thread ids by FreeBSD + qfill command

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

diff --git a/bacula/src/stored/read_record.c b/bacula/src/stored/read_record.c
index b324bf01f859519b169d63570c0676886b2c2072..273be3d2d9f4ea7de2e9a2d6fe35d4bed80aebb9 100644 (file)
--- a/bacula/src/stored/read_record.c
+++ b/bacula/src/stored/read_record.c
@@ -6,10 +6,12 @@
  *    as well as a callback for mounting the next tape.  It takes
  *    care of reading blocks, applying the bsr, ...
  *
+ *    Kern E. Sibbald, August MMII
+ *
  *   Version $Id$
  */
 /*
-   Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+   Copyright (C) 2000-2003 Kern Sibbald and John Walker
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -32,8 +34,9 @@
 #include "stored.h"
 
 static void get_session_record(DEVICE *dev, DEV_RECORD *rec, SESSION_LABEL *sessrec);
+#ifdef DEBUG
 static char *rec_state_to_str(DEV_RECORD *rec);
-
+#endif
 
 int read_records(JCR *jcr,  DEVICE *dev, 
        void record_cb(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec),
@@ -42,18 +45,18 @@ int read_records(JCR *jcr,  DEVICE *dev,
    DEV_BLOCK *block;
    DEV_RECORD *rec;
    uint32_t record, num_files = 0;
-   int verbose = FALSE;
    int ok = TRUE;
+   int done = FALSE;
    SESSION_LABEL sessrec;
 
    block = new_block(dev);
    rec = new_record();
-   for ( ;ok; ) {
-      if (job_cancelled(jcr)) {
+   for ( ; ok && !done; ) {
+      if (job_canceled(jcr)) {
         ok = FALSE;
         break;
       }
-      if (!read_block_from_device(dev, block)) {
+      if (!read_block_from_device(jcr, dev, block, CHECK_BLOCK_NUMBERS)) {
          Dmsg0(20, "!read_record()\n");
         if (dev->state & ST_EOT) {
            DEV_RECORD *trec = new_record();
@@ -83,26 +86,27 @@ int read_records(JCR *jcr,  DEVICE *dev,
             *  and pass it off to the callback routine, then continue
             *  most likely reading the previous record.
             */
-           read_block_from_device(dev, block);
+           read_block_from_device(jcr, dev, block, NO_BLOCK_NUMBER_CHECK);
            read_record_from_block(block, trec);
            get_session_record(dev, trec, &sessrec);
-           trec->File = dev->file;
            record_cb(jcr, dev, block, trec);
            free_record(trec);
-           goto next_record;
-        }
-        if (dev->state & ST_EOF) {
-            Emsg1(M_INFO, 0, "Got EOF on device %s\n", dev_name(dev));
+           goto next_record;         /* go read new tape */
+
+        } else if (dev->state & ST_EOF) {
+            Jmsg(jcr, M_INFO, 0, "Got EOF at file %u  on device %s, Volume \"%s\"\n", 
+                 dev->file, dev_name(dev), jcr->VolumeName);
             Dmsg0(20, "read_record got eof. try again\n");
            continue;
-        }
-        if (dev->state & ST_SHORT) {
-           Emsg0(M_INFO, 0, dev->errmsg);
+        } else if (dev->state & ST_SHORT) {
+            Jmsg(jcr, M_INFO, 0, "%s", dev->errmsg);
            continue;
+        } else {
+           /* I/O error or strange end of tape */
+           display_tape_error_status(jcr, dev);
+           ok = FALSE;
+           break;
         }
-//      display_error_status();
-        ok = FALSE;
-        break;
       }
       if (verbose) {
          Dmsg2(10, "Block: %d blen=%d\n", block->BlockNumber, block->block_len);
@@ -116,7 +120,6 @@ next_record:
                  block->BlockNumber, rec->remainder);
            break;
         }
-        rec->File = dev->file;
          Dmsg3(10, "read-OK. stat=%s blk=%d rem=%d\n", rec_state_to_str(rec), 
                  block->BlockNumber, rec->remainder);
         /*
@@ -154,14 +157,20 @@ next_record:
         /* 
          * Apply BSR filter
          */
-        if (jcr->bsr && !match_bsr(jcr->bsr, rec, &dev->VolHdr, &sessrec)) {
-           if (verbose) {
-               Dmsg5(10, "BSR no match rec=%d block=%d SessId=%d SessTime=%d FI=%d\n",
-                 record, block->BlockNumber, rec->VolSessionId, rec->VolSessionTime, 
-                 rec->FileIndex);
+        if (jcr->bsr) {
+           int stat = match_bsr(jcr->bsr, rec, &dev->VolHdr, &sessrec);
+           if (stat == -1) { /* no more possible matches */
+              done = TRUE;   /* all items found, stop */
+              break;
+           } else if (stat == 0) {  /* no match */
+              if (verbose) {
+                  Dmsg5(10, "BSR no match rec=%d block=%d SessId=%d SessTime=%d FI=%d\n",
+                    record, block->BlockNumber, rec->VolSessionId, rec->VolSessionTime, 
+                    rec->FileIndex);
+              }
+              rec->remainder = 0;
+               continue;              /* we don't want record, read next one */
            }
-           rec->remainder = 0;
-            continue;              /* we don't want record, read next one */
         }
         if (is_partial_record(rec)) {
             Dmsg6(10, "Partial, break. recno=%d state=%s blk=%d SI=%d ST=%d FI=%d\n", record,
@@ -211,6 +220,7 @@ static void get_session_record(DEVICE *dev, DEV_RECORD *rec, SESSION_LABEL *sess
         rtype, rec->VolSessionId, rec->VolSessionTime, rec->Stream, rec->data_len);
 }
 
+#ifdef DEBUG
 static char *rec_state_to_str(DEV_RECORD *rec)
 {
    static char buf[200]; 
@@ -235,3 +245,4 @@ static char *rec_state_to_str(DEV_RECORD *rec)
    }
    return buf;
 }
+#endif