X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=zfs-log-parser;fp=zfs-log-parser;h=26b05892f2bfd6be386751e5dd7456d666ee6c0a;hb=71ce0ed663bad1daec6a3471c188a110c271235a;hp=d43e650e1d64d328d17e7f8ee407ec43662ed978;hpb=c86dd7de4b6627ff5bccb105bb4c06f6cd70d602;p=zfs-nexenta%2F.git diff --git a/zfs-log-parser b/zfs-log-parser index d43e650..26b0589 100755 --- a/zfs-log-parser +++ b/zfs-log-parser @@ -100,8 +100,8 @@ sub parse_snapshot_totals_logfile { $month = $month2num{$month}; if($daynum < 10) { $daynum = "0".$daynum; } $date="$month-$daynum-$year"; - if(!defined $dates{$date}) { $header .= $date . " "; } - $dates{$date} = 1; + if(!defined $founddates{$date}) { $header .= $date . " "; } + $founddates{$date} = 1; } if(($in_totals == 1) && ($line =~ /^\s+$/)) { $in_totals = 0; @@ -129,15 +129,21 @@ sub parse_snapshot_totals_logfile { if($date !~ /(\d+)-(\d+)-(\d+)/) { next; } $date_data=adjust_data($totals{$filesystem}{$date}{data}); $data .= sprintf("%10s",$date_data). " "; + $date_totals{$date}{data} += $totals{$filesystem}{$date}{data}; } $data_total=adjust_data($data_total); $total_delta+=$totals{$filesystem}{delta}; $delta=adjust_data($totals{$filesystem}{delta}); printf("%-${maxlen}s %s %10s\n",$filesystem,$data,$delta); } + $data=""; $data_len=length($data); $total_delta=adjust_data($total_delta); - printf("%-${maxlen}s %-${data_len}s %10s\n","Totals:","",$total_delta); + foreach $date (sort keys %date_totals) { + $date_data=adjust_data($date_totals{$date}{data}); + $data .= sprintf("%10s",$date_data). " "; + } + printf("%-${maxlen}s %-${data_len}s %10s\n","Totals:",$data,$total_delta); } #########