-#!@PERL@ -w
+#!@PERL@ -Tw
#
# Run perl.
$degr_level{$hostpart}=-1;
}
}
- elsif(/^DUMP (\S+) (\S+) (\S+) (\S+) (\d+) (\d+) \d+:\d+:\d+:\d+:\d+:\d+ (\d+) \d+/) {
+ elsif(/^DUMP (\S+) (\S+) (\S+) (\S+) (\d+) (\d+) \d+:\d+:\d+:\d+:\d+:\d+ \d+ (\d+) \d+/) {
if($generating_schedule == 1 ) {
$host=$1;
$features=$2;
$degr_size{$hostpart}=32 if ($7 < 32);
}
}
- elsif(/^DUMP (\S+) (\S+) (\S+) (\d+) (\d+) \d+:\d+:\d+:\d+:\d+:\d+ (\d+) \d+ (\d+) \d+:\d+:\d+:\d+:\d+:\d+ ([-]*\d+) \d+/) {
+ elsif(/^DUMP (\S+) (\S+) (\S+) (\d+) (\d+) \d+:\d+:\d+:\d+:\d+:\d+ \d+ (\d+) \d+ (\d+) \d+:\d+:\d+:\d+:\d+:\d+ [-]*\d+ ([-]*\d+) \d+/) {
if($generating_schedule == 1 ) {
$host=$1;
$partition=$2;
$serial=$4;
$serial{$serial}=$hostpart;
#$chunk_started{$hostpart}=1;
- #$chunk_time{$hostpart}=$1;
+ $chunk_time{$hostpart}=$1;
#$chunk_finished{$hostpart}=0;
$holding_file{$hostpart}=$5;
}
$serial=$4;
$serial{$serial}=$hostpart;
#$chunk_started{$hostpart}=1;
- #$chunk_time{$hostpart}=$1;
+ $chunk_time{$hostpart}=$1;
#$chunk_finished{$hostpart}=0;
$holding_file{$hostpart}=$5;
}
$hostpart=$serial{$serial};
$size{$hostpart}=$outputsize;
$dump_finished{$hostpart}=1;
- $busy_time{$2}+=($1-$dump_time{$hostpart});
+ $busy_time{$2}+=($1-$chunk_time{$hostpart});
$running_dumper{$2} = "0";
- $dump_time{$hostpart}=$1;
+ $chunk_time{$hostpart}=$1;
$error{$hostpart}="";
if ($3 eq "PARTIAL") {
$partial{$hostpart} = 1;
}
elsif(/splitting chunk that started at \d*kb after (\d*)kb/) {
$ntchunk{$nb_tape}++;
- $ntsize{$nb_tape} += $1;
- $ntesize{$nb_tape} += $1;
- $ntchunk_size += $1;
+ $ntsize{$nb_tape} += $1 / $unitdivisor;
+ $ntesize{$nb_tape} += $1 / $unitdivisor;
+ $ntchunk_size += $1 / $unitdivisor;
}
elsif(/driver: FINISHED/) {
$driver_finished = 1;
(defined $opt_gestimate && $partialestimate{$hostpart} == 1)) {
printf "%8s ", $datestamp if defined $opt_date;
printf "%-${maxnamelength}s", "$host:$partition";
- printf "%2d", $level{$hostpart};
+ printf "%2d ", $level{$hostpart};
printf "%9d$unit", $esize{$hostpart};
if($partialestimate{$hostpart} == 1) {
print " partial";
elsif (!defined $dump_started{$hostpart} || $dump_started{$hostpart} == 0) {
if( defined $opt_failed) {
printf "%8s ", $datestamp if defined $opt_date;
- printf "%-${maxnamelength}s%2d", "$host:$partition", $level{$hostpart};
+ printf "%-${maxnamelength}s%2d ", "$host:$partition", $level{$hostpart};
printf " no estimate\n";
}
$exit_status |= $STATUS_FAILED;
$dump_finished{$hostpart} == -1) {
if(defined $opt_failed) {
printf "%8s ", $datestamp if defined $opt_date;
- printf "%-${maxnamelength}s%2d", "$host:$partition", $level{$hostpart};
+ printf "%-${maxnamelength}s%2d ", "$host:$partition", $level{$hostpart};
printf "%9d$unit", $esize{$hostpart};
print " dump to tape failed: " . $error{$hostpart};
print "\n";
$taper_started{$hostpart} == 1) {
if( defined $opt_dumpingtape ) {
printf "%8s ", $datestamp if defined $opt_date;
- printf "%-${maxnamelength}s%2d", "$host:$partition", $level{$hostpart};
+ printf "%-${maxnamelength}s%2d ", "$host:$partition", $level{$hostpart};
printf "%9d$unit", $esize{$hostpart};
print " dumping to tape";
if( defined $starttime ) {
elsif($taper_finished{$hostpart} == 0) {
if( defined $opt_writingtape ) {
printf "%8s ", $datestamp if defined $opt_date;
- printf "%-${maxnamelength}s%2d", "$host:$partition", $level{$hostpart};
+ printf "%-${maxnamelength}s%2d ", "$host:$partition", $level{$hostpart};
printf "%9d$unit", $size{$hostpart};
if($in_flush == 0) {
print " writing to tape";
if( defined $opt_failed ||
(defined $opt_waittaper && ($taper_finished{$hostpart} == -1))) {
printf "%8s ", $datestamp if defined $opt_date;
- printf "%-${maxnamelength}s%2d", "$host:$partition", $level{$hostpart};
+ printf "%-${maxnamelength}s%2d ", "$host:$partition", $level{$hostpart};
printf "%9d$unit", $xsize;
if($in_flush == 0) {
print " failed to tape";
elsif($taper_finished{$hostpart} == 1) {
if( defined $opt_finished ) {
printf "%8s ", $datestamp if defined $opt_date;
- printf "%-${maxnamelength}s%2d", "$host:$partition", $level{$hostpart};
+ printf "%-${maxnamelength}s%2d ", "$host:$partition", $level{$hostpart};
printf "%9d$unit", $size{$hostpart};
if($in_flush == 0) {
print " finished";
}
else {
printf "%8s ", $datestamp if defined $opt_date;
- printf "%-${maxnamelength}s%2d", "$host:$partition", $level{$hostpart};
+ printf "%-${maxnamelength}s%2d ", "$host:$partition", $level{$hostpart};
print " unknown state TAPER\n";
}
}
if($dump_started{$hostpart} == -1) {
if( defined $opt_failed ) {
printf "%8s ", $datestamp if defined $opt_date;
- printf "%-${maxnamelength}s%2d", "$host:$partition", $level{$hostpart};
+ printf "%-${maxnamelength}s%2d ", "$host:$partition", $level{$hostpart};
printf " " . $error{$hostpart} . "\n";
}
$exit_status |= $STATUS_FAILED;
if($estimate{$hostpart} == 1) {
if( defined $opt_waitdumping ) {
printf "%8s ", $datestamp if defined $opt_date;
- printf "%-${maxnamelength}s%2d", "$host:$partition", $level{$hostpart};
+ printf "%-${maxnamelength}s%2d ", "$host:$partition", $level{$hostpart};
printf "%9d$unit", $esize{$hostpart};
print " wait for dumping $error{$hostpart}\n";
}
$dump_finished{$hostpart} == -1) {
if( defined $opt_failed ) {
printf "%8s ", $datestamp if defined $opt_date;
- printf "%-${maxnamelength}s%2d", "$host:$partition", $level{$hostpart};
+ printf "%-${maxnamelength}s%2d ", "$host:$partition", $level{$hostpart};
print " ", $error{$hostpart};
if( defined $starttime ) {
print " (", &showtime($dump_time{$hostpart}), ")";
$dump_finished{$hostpart} != 1) {
if( defined $opt_dumping ) {
printf "%8s ", $datestamp if defined $opt_date;
- printf "%-${maxnamelength}s%2d", "$host:$partition", $level{$hostpart};
+ printf "%-${maxnamelength}s%2d ", "$host:$partition", $level{$hostpart};
printf "%9d$unit", $esize{$hostpart};
printf " dumping %8d$unit", $size{$hostpart};
if($size{$hostpart} != 0) {
$taper_started{$hostpart} != 1) {
if( defined $opt_waittaper ) {
printf "%8s ", $datestamp if defined $opt_date;
- printf "%-${maxnamelength}s%2d", "$host:$partition", $level{$hostpart};
+ printf "%-${maxnamelength}s%2d ", "$host:$partition", $level{$hostpart};
printf "%9d$unit", $size{$hostpart};
print " dump done";
if( defined $starttime ) {
}
else {
printf "%8s ", $datestamp if defined $opt_date;
- printf "%-${maxnamelength}s%2d", "$host:$partition", $level{$hostpart};
+ printf "%-${maxnamelength}s%2d ", "$host:$partition", $level{$hostpart};
print " unknown state DUMPER\n";
}
}
elsif(defined $flush{$hostpart}) {
if( defined $opt_waittaper ) {
printf "%8s ", $datestamp if defined $opt_date;
- printf "%-${maxnamelength}s%2d", "$host:$partition", $level{$hostpart};
+ printf "%-${maxnamelength}s%2d ", "$host:$partition", $level{$hostpart};
printf "%9d$unit", $size{$hostpart};
print " waiting to flush";
if(defined $partial{$hostpart} && $partial{$hostpart} == 1) {
}
elsif(defined $level{$hostpart}) {
printf "%8s ", $datestamp if defined $opt_date;
- printf "%-${maxnamelength}s%2d", "$host:$partition", $level{$hostpart};
+ printf "%-${maxnamelength}s%2d ", "$host:$partition", $level{$hostpart};
print " unknown state\n";
}
}