X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=zfs-log-parser;h=dbb3c15a88a8e533a05ad30593c35755d84a0c7b;hb=e868864af07febc5755735d451d74d9bc3ba170d;hp=26b05892f2bfd6be386751e5dd7456d666ee6c0a;hpb=71ce0ed663bad1daec6a3471c188a110c271235a;p=zfs-ubuntu%2F.git

diff --git a/zfs-log-parser b/zfs-log-parser
index 26b0589..dbb3c15 100755
--- a/zfs-log-parser
+++ b/zfs-log-parser
@@ -37,9 +37,9 @@ sub adjust_duration {
 
 sub adjust_data {
     my ($data) = @_;
-    if($data > ($giga)) { $data = $data / $giga; $data = sprintf("%2.2fGb",$data); }
-    elsif($data > ($mega)) { $data = int($data / $mega); $data = "$data"."Mb"; }
-    elsif($data > ($kilo)) { $data = int($data / $kilo); $data = "$data"."Kb"; }
+    if(abs($data) > ($giga)) { $data = $data / $giga; $data = sprintf("%2.2fGb",$data); }
+    elsif(abs($data) > ($mega)) { $data = int($data / $mega); $data = "$data"."Mb"; }
+    elsif(abs($data) > ($kilo)) { $data = int($data / $kilo); $data = "$data"."Kb"; }
     return $data;
 }
 
@@ -94,6 +94,7 @@ sub parse_snapshot_totals_logfile {
     $header="";
     while(<FILE>) {
 	$line = $_;
+        if($line =~ /logfile turned over/) { next; }
 	if(($in_totals == 0) && ($line =~ /(\S+)\s+(\S+)\s+(\d+)\s+(\d+):(\d+):(\d+)\s+(\S+)\s+(\S+)/)) {
 	    $dayname=$1; $month=$2; $daynum=$3; $hour=$4; $minute=$5; $sec=$6; $year=$8;
 	    $in_totals = 1;
@@ -103,10 +104,10 @@ sub parse_snapshot_totals_logfile {
 	    if(!defined $founddates{$date}) { $header .= $date . " "; }
 	    $founddates{$date} = 1;
 	}
-	if(($in_totals == 1) && ($line =~ /^\s+$/)) {
+	elsif(($in_totals == 1) && ($line =~ /^\s+$/)) {
 	    $in_totals = 0;
 	}
-	if(($in_totals == 1) && ($line =~ /(\S+)\s+([\d\.]+)(\w+)\s+(\d+)/)) {
+	elsif(($in_totals == 1) && ($line =~ /(\S+)\s+([\d\.]+)(\w+)\s+(\d+)/)) {
 	    $filesystem = $1; $data = $2; $size = $3; $num_snaps = $4;
 	    if($filesystem =~ /Snapshots/) { next; }
 	    if($filesystem =~ /$backup_pool/) { next; }