X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=server-src%2Famstatus.pl.in;h=db853d0091b7a29a98d38e77f24ce0a1f0fc4393;hb=d3b2175e084f88c8736ad7073eacbf4670147aec;hp=7edfb1065297e8033bd0fc842cfaeb7b182cc0d2;hpb=34197d9f46a5f4e944378cbb65fca32ee0eec7b9;p=debian%2Famanda

diff --git a/server-src/amstatus.pl.in b/server-src/amstatus.pl.in
index 7edfb10..db853d0 100644
--- a/server-src/amstatus.pl.in
+++ b/server-src/amstatus.pl.in
@@ -1,4 +1,4 @@
-#!@PERL@ -w
+#!@PERL@ -Tw
 #
 
 # Run perl.
@@ -302,7 +302,7 @@ while(<AMDUMP>) {
 			$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;
@@ -331,7 +331,7 @@ while(<AMDUMP>) {
 			$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;
@@ -407,7 +407,7 @@ while(<AMDUMP>) {
 		$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;
 	}
@@ -421,7 +421,7 @@ while(<AMDUMP>) {
 		$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;
 	}
@@ -552,9 +552,9 @@ while(<AMDUMP>) {
 		$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;
@@ -763,9 +763,9 @@ while(<AMDUMP>) {
 	}
 	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;
@@ -863,7 +863,7 @@ foreach $host (sort @hosts) {
 							(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";
@@ -884,7 +884,7 @@ foreach $host (sort @hosts) {
 					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;
@@ -914,7 +914,7 @@ foreach $host (sort @hosts) {
 							$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";
@@ -929,7 +929,7 @@ foreach $host (sort @hosts) {
 							$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 ) {
@@ -943,7 +943,7 @@ foreach $host (sort @hosts) {
 					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";
@@ -987,7 +987,7 @@ foreach $host (sort @hosts) {
 						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";
@@ -1020,7 +1020,7 @@ foreach $host (sort @hosts) {
 					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";
@@ -1048,7 +1048,7 @@ foreach $host (sort @hosts) {
 					}
 					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";
 					}
 				}
@@ -1056,7 +1056,7 @@ foreach $host (sort @hosts) {
 					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;
@@ -1068,7 +1068,7 @@ foreach $host (sort @hosts) {
 						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";
 							}
@@ -1083,7 +1083,7 @@ foreach $host (sort @hosts) {
 							$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}), ")";
@@ -1098,7 +1098,7 @@ foreach $host (sort @hosts) {
 							$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) {
@@ -1120,7 +1120,7 @@ foreach $host (sort @hosts) {
 							$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 ) {
@@ -1142,14 +1142,14 @@ foreach $host (sort @hosts) {
 					}
 					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) {
@@ -1163,7 +1163,7 @@ foreach $host (sort @hosts) {
 				}
 				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";
 				}
 			}