X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fread.c;h=bdf870052c742e8e4a80a32d62c287e746e42b9d;hb=f553411233af16f6e6ba5d97253f517a312e5267;hp=9a363885191774ee2b10e1f7dbff4b50de697244;hpb=5ff92994cf19da2fc01de499e489529a1ad7a222;p=bacula%2Fbacula

diff --git a/bacula/src/stored/read.c b/bacula/src/stored/read.c
index 9a36388519..bdf870052c 100644
--- a/bacula/src/stored/read.c
+++ b/bacula/src/stored/read.c
@@ -6,7 +6,7 @@
  *   Version $Id$
  */
 /*
-   Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+   Copyright (C) 2000-2004 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
@@ -29,64 +29,38 @@
 #include "stored.h"
 
 /* Forward referenced subroutines */
-static void get_session_record(DEVICE *dev, DEV_RECORD *rec, SESSION_LABEL *sessrec);
-
-/* Variables used by Child process */
-/* Global statistics */
-/* Note, these probably should be in shared memory so that 
- * they are truly global for all processes
- */
-extern struct s_shm *shm;	      /* shared memory structure */
-extern int  FiledDataChan;	      /* File daemon data channel (port) */
+static bool record_cb(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec);
 
 
 /* Responses sent to the File daemon */
 static char OK_data[]    = "3000 OK data\n";
+static char FD_error[]   = "3000 error\n";
 static char rec_header[] = "rechdr %ld %ld %ld %ld %ld";
 
-
 /* 
  *  Read Data and send to File Daemon
- *   Returns: 0 on failure
- *	      1 on success
+ *   Returns: false on failure
+ *	      true  on success
  */
-int do_read_data(JCR *jcr) 
+bool do_read_data(JCR *jcr) 
 {
-   BSOCK *ds;
-   BSOCK *fd_sock = jcr->file_bsock;
-   int ok = TRUE;
-   DEVICE *dev;
-   DEV_RECORD *rec;
-   DEV_BLOCK *block;
-   POOLMEM *hdr; 
-   SESSION_LABEL sessrec;	       /* session record */
+   BSOCK *fd = jcr->file_bsock;
+   bool ok = true;
+   DCR *dcr;
    
    Dmsg0(20, "Start read data.\n");
 
-   dev = jcr->device->dev;
-   memset(&sessrec, 0, sizeof(sessrec));
-
-   /* Tell File daemon we will send data */
-   bnet_fsend(fd_sock, OK_data);
-   Dmsg1(10, "bstored>filed: %s\n", fd_sock->msg);
-
-   ds = fd_sock;
-
-   if (!bnet_set_buffer_size(ds, MAX_NETWORK_BUFFER_SIZE, BNET_SETBUF_READ)) {
-      return 0;
+   if (!bnet_set_buffer_size(fd, jcr->device->max_network_buffer_size, BNET_SETBUF_WRITE)) {
+      return false;
    }
 
 
-   Dmsg1(20, "Begin read device=%s\n", dev_name(dev));
-
-   block = new_block(dev);
-
    create_vol_list(jcr);
    if (jcr->NumVolumes == 0) {
       Jmsg(jcr, M_FATAL, 0, _("No Volume names found for restore.\n"));
-      free_block(block);
       free_vol_list(jcr);
-      return 0;
+      bnet_fsend(fd, FD_error);
+      return false;
    }
 
    Dmsg2(200, "Found %d volumes names to restore. First=%s\n", jcr->NumVolumes, 
@@ -97,175 +71,69 @@ int do_read_data(JCR *jcr)
    /* 
     * Ready device for reading, and read records
     */
-   if (!acquire_device_for_read(jcr, dev, block)) {
-      free_block(block);
+   if (!(dcr=acquire_device_for_read(jcr))) {
       free_vol_list(jcr);
-      return 0;
+      return false;
    }
 
-   rec = new_record();
-   free_pool_memory(rec->data);
-   rec->data = ds->msg; 	       /* use socket message buffer */
-   hdr = get_pool_memory(PM_MESSAGE);
-
-   /*
-    *	Read records, apply BSR filtering, and return any that are 
-    *	 matched.
-    */
-   for ( ;ok; ) {
-      if (job_cancelled(jcr)) {
-	 ok = FALSE;
-	 break;
-      }
-      /* Read Record */
-      Dmsg1(500, "Main read_record. rem=%d\n", rec->remainder);
-
-      if (!read_block_from_device(dev, block)) {
-         Dmsg1(500, "Main read record failed. rem=%d\n", rec->remainder);
-	 if (dev->state & ST_EOT) {
-	    DEV_RECORD *record;
-	    if (!mount_next_read_volume(jcr, dev, block)) {
-	       break;
-	    }
-	    record = new_record();
-	    read_block_from_device(dev, block);
-	    read_record_from_block(block, record);
-	    get_session_record(dev, record, &sessrec);
-	    free_record(record);
-	 }
-	 if (dev->state & ST_EOF) {
-            Dmsg0(90, "Got End of File. Trying again ...\n");
-	    continue;		      /* End of File */
-	 }
-	 if (dev->state & ST_SHORT) {
-	    continue;
-	 }
-      }
-
-      for (rec->state=0; !is_block_empty(rec); ) {
-
-	 if (!read_record_from_block(block, rec)) {
-	    break;
-	 }
-	 /*
-	  * At this point, we have at least a record header.
-	  *  Now decide if we want this record or not, but remember
-	  *  before accessing the record, we may need to read again to
-	  *  get all the data.
-	  */
-
-	 if (rec->FileIndex == EOM_LABEL) { /* end of tape? */
-            Dmsg0(40, "Get EOM LABEL\n");
-	    rec->remainder = 0;
-	    break;			   /* yes, get out */
-	 }
-
-	 /* Some sort of label? */ 
-	 if (rec->FileIndex < 0) {
-	    get_session_record(dev, rec, &sessrec);
-	    continue;
-	 } /* end if label record */
-
-
-	 /* Match BSR against current record */
-	 if (jcr->bsr) {
-	    int stat = match_bsr(jcr->bsr, rec, &dev->VolHdr, &sessrec);
-	    if (stat == -1) {	      /* no more possible matches */
-	       ok = FALSE;
-	       break;
-	    } else if (stat == 0) {   /* no match */
-               Dmsg0(50, "BSR rejected record\n");
-	       rec->remainder = 0;
-	       continue;
-	    }
-	 } else { 
-	    /* Old way, deprecated */
-	    if (rec->VolSessionId != jcr->read_VolSessionId ||
-		rec->VolSessionTime != jcr->read_VolSessionTime) {
-               Dmsg0(50, "Ignore record ids not equal\n");
-	       rec->remainder = 0;
-	       continue;		    /* ignore */
-	    }
-	 }
-
-	 if (is_partial_record(rec)) {
-	    break;		      /* Go read full record */
-	 }
-	  
-	 /* Generate Header parameters and send to File daemon
-	  * Note, we build header in hdr buffer to avoid wiping
-	  * out the data record
-	  */
-	 ds->msg = hdr;
-	 if (!bnet_fsend(ds, rec_header, rec->VolSessionId, rec->VolSessionTime,
-		rec->FileIndex, rec->Stream, rec->data_len)) {
-            Dmsg1(30, ">filed: Error Hdr=%s\n", ds->msg);
-	    hdr = ds->msg;
-	    ds->msg = rec->data;
-	    ok = FALSE;
-	    break;
-	 } else {
-            Dmsg1(30, ">filed: Hdr=%s\n", ds->msg);
-	 }
-
-	 hdr = ds->msg; 	      /* restore hdr buffer */
-	 ds->msg = rec->data;	      /* restore data record address */
+   /* Tell File daemon we will send data */
+   bnet_fsend(fd, OK_data);
+   ok = read_records(dcr, record_cb, mount_next_read_volume);
 
-	 /* Send data record to File daemon */
-	 ds->msglen = rec->data_len;
-         Dmsg1(40, ">filed: send %d bytes data.\n", ds->msglen);
-	 if (!bnet_send(ds)) {
-            Pmsg1(000, "Error sending to FD. ERR=%s\n", bnet_strerror(ds));
-            Dmsg1(100, "Hdr=%s\n", hdr);
-            Dmsg1(100, "data=%s\n", ds->msg);
-            Jmsg1(jcr, M_FATAL, 0, _("Error sending to File daemon. ERR=%s\n"),
-	       bnet_strerror(ds));
-	    ok = FALSE;
-	    break;
-	 }
-      }
-   }
    /* Send end of data to FD */
-   bnet_sig(ds, BNET_EOD);
+   bnet_sig(fd, BNET_EOD);
 
-   if (!release_device(jcr, dev)) {
-      ok = FALSE;
+   if (!release_device(jcr)) {
+      ok = false;
    }
-   free_pool_memory(hdr);
-   free_block(block);
-   rec->data = NULL;		      /* previously released */
-   free_record(rec);
+   
    free_vol_list(jcr);
    Dmsg0(30, "Done reading.\n");
-   return ok ? 1 : 0;
+   return ok;
 }
 
-static void get_session_record(DEVICE *dev, DEV_RECORD *rec, SESSION_LABEL *sessrec)
+/*
+ * Called here for each record from read_records()
+ *  Returns: true if OK
+ *	     false if error
+ */
+static bool record_cb(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec)
 {
-   char *rtype;
-   memset(sessrec, 0, sizeof(sessrec));
-   switch (rec->FileIndex) {
-      case PRE_LABEL:
-         rtype = "Fresh Volume Label";   
-	 break;
-      case VOL_LABEL:
-         rtype = "Volume Label";
-	 unser_volume_label(dev, rec);
-	 break;
-      case SOS_LABEL:
-         rtype = "Begin Session";
-	 unser_session_label(sessrec, rec);
-	 break;
-      case EOS_LABEL:
-         rtype = "End Session";
-	 break;
-      case EOM_LABEL:
-         rtype = "End of Media";
-	 break;
-      default:
-         rtype = "Unknown";
-	 break;
+   BSOCK *fd = jcr->file_bsock;
+   bool ok = true;
+   POOLMEM *save_msg;
+
+   if (rec->FileIndex < 0) {
+      return true;
+   }
+   Dmsg5(100, "Send to FD: SessId=%u SessTim=%u FI=%d Strm=%d, len=%d\n",
+      rec->VolSessionId, rec->VolSessionTime, rec->FileIndex, rec->Stream,
+      rec->data_len);
+
+   /* Send record header to File daemon */
+   if (!bnet_fsend(fd, rec_header, rec->VolSessionId, rec->VolSessionTime,
+	  rec->FileIndex, rec->Stream, rec->data_len)) {
+      Dmsg1(30, ">filed: Error Hdr=%s\n", fd->msg);
+      Jmsg1(jcr, M_FATAL, 0, _("Error sending to File daemon. ERR=%s\n"),
+	 bnet_strerror(fd));
+      return false;
+   } else {
+      Dmsg1(30, ">filed: Hdr=%s\n", fd->msg);
+   }
+
+
+   /* Send data record to File daemon */
+   save_msg = fd->msg;		/* save fd message pointer */
+   fd->msg = rec->data; 	/* pass data directly to bnet_send */
+   fd->msglen = rec->data_len;
+   Dmsg1(30, ">filed: send %d bytes data.\n", fd->msglen);
+   if (!bnet_send(fd)) {
+      Pmsg1(000, "Error sending to FD. ERR=%s\n", bnet_strerror(fd));
+      Jmsg1(jcr, M_FATAL, 0, _("Error sending to File daemon. ERR=%s\n"),
+	 bnet_strerror(fd));
+
+      ok = false;
    }
-   Dmsg5(10, "%s Record: VolSessionId=%d VolSessionTime=%d JobId=%d DataLen=%d\n",
-	 rtype, rec->VolSessionId, rec->VolSessionTime, rec->Stream, rec->data_len);
+   fd->msg = save_msg;		      /* restore fd message pointer */
+   return ok;
 }