X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fbsr-read-test;h=5d0003d11a5499fff2b570a9cc0e6a87f08c2665;hb=38b243eb09f97315282dd31dd4f162fcbb6c6778;hp=81fdab58a3c92fe6e1a4af76843312d4b1080cea;hpb=e3a664989a109c0702cee241d8cd75d41450d39b;p=bacula%2Fbacula

diff --git a/regress/tests/bsr-read-test b/regress/tests/bsr-read-test
index 81fdab58a3..5d0003d11a 100755
--- a/regress/tests/bsr-read-test
+++ b/regress/tests/bsr-read-test
@@ -115,16 +115,20 @@ check_two_logs
 dstat=0
 
 perl -ne '
-sub check_bloc {   
-  $nb = $last_bloc - $last_bsr_bloc;
+sub check_block {
+  return unless ($last_block || $last_bsr_block);
+  $nb = $last_block - $last_bsr_block;
   if ($nb > 65000) {
-     print "ERROR: read too much bytes $nb\n";
+     print "ERROR: read too many bytes $nb\n";
   }
 }
 sub print_stat {
-     print "$last_job\nlast_bsr_bloc=$last_bsr_bloc last_bloc_read=$last_bloc\n";
-     check_bloc();
-     $last_bsr_bloc = $last_bloc=0;
+     if ($last_bsr_addr) {
+        $last_bsr_block = $last_bsr_addr & 0xFFFFFFFF;
+     }   
+     print "$last_job\nlast_bsr_block=$last_bsr_block last_block_read=$last_block\n";
+     check_block();
+     $last_bsr_block = $last_block=0;
 }
 
 if (/dircmd.c.+(JobId=\d+ job=\S+) .+client_name=.+-fd/) {
@@ -134,8 +138,9 @@ if (/dircmd.c.+(JobId=\d+ job=\S+) .+client_name=.+-fd/) {
 }
 
 $last_job=$1      if /dircmd.c.+(JobId=\d+ job=\S+)/;
-$last_bsr_bloc=$1 if /fd_cmds.c:.+VolBlock=\d+-(\d+)/;
-$last_bloc=$1     if /read_record.c.+file:block=\d+:(\d+)/;
+$last_bsr_addr=$1  if /fd_cmds.c:.+VolAddr=\d+-(\d+)/;
+$last_bsr_block=$1 if /fd_cmds.c:.+VolBlock=\d+-(\d+)/;
+$last_block=$1     if /read_record.c.+file:block=\d+:(\d+)/;
 END { 
   print_stat();
 }' working/*-sd.trace > tmp/result