arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

monshow rmcmon -s command optimize

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8353 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
xq2005 2010-12-08 08:14:17 +00:00
parent 6ea31621d3
commit d1080ccbbd
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
xCAT-rmc/plugin/rmcmetrix.pm
View File

@ -353,6 +353,7 @@ sub get_sum_metrix
my $nodename = undef;
my $time = undef;
# my $end:shared;
my %summetrix = {};
my $end = undef;
$end = xCAT::Utils->runcmd("date +%s", 0);
# my $step:shared;
@ -420,8 +421,8 @@ sub get_sum_metrix
# $summary{$a}{$n}{$timestamp} = &share({});
# $summary{$a}{$n}{$timestamp}{sum} = &share({});
# $summary{$a}{$n}{$timestamp}{num} = &share({});
$summary{$a}{$n}{$timestamp}{sum} = $sum;
$summary{$a}{$n}{$timestamp}{num} = $num;
$summetrix{$a}{$timestamp}{sum} += $sum * $num;
$summetrix{$a}{$timestamp}{num} += $num;
}
}
}
@ -435,18 +436,18 @@ sub get_sum_metrix
# }
# }
my %summetrix = {};
foreach $attribute (keys %summary){
foreach $nodename (keys %{$summary{$attribute}}){
foreach $time (keys %{$summary{$attribute}{$nodename}}){
print "$attribute.$nodename.$time $summary{$attribute}{$nodename}{$time}{sum} $summary{$attribute}{$nodename}{$time}{num}\n";
$temp = $summary{$attribute}{$nodename}{$time}{sum} * $summary{$attribute}{$nodename}{$time}{num};
$summetrix{$attribute}{$time}{sum} += $temp;
$summetrix{$attribute}{$time}{num} += $summary{$attribute}{$nodename}{$time}{num};
}
}
# my %summetrix = {};
# foreach $attribute (keys %summary){
# foreach $nodename (keys %{$summary{$attribute}}){
# foreach $time (keys %{$summary{$attribute}{$nodename}}){
# print "$attribute.$nodename.$time $summary{$attribute}{$nodename}{$time}{sum} $summary{$attribute}{$nodename}{$time}{num}\n";
# $temp = $summary{$attribute}{$nodename}{$time}{sum} * $summary{$attribute}{$nodename}{$time}{num};
# $summetrix{$attribute}{$time}{sum} += $temp;
# $summetrix{$attribute}{$time}{num} += $summary{$attribute}{$nodename}{$time}{num};
# }
# }
}
# }
my $rrdcluster = "/var/rrd/cluster";
if(! -d $rrdcluster){

2
xCAT-rmc/plugin/rmcmon.pm
View File

@ -1552,7 +1552,7 @@ sub showmetrix($rrddir, $attrs, $start_time, $end_time)
if(! grep {/$timestamp/} @timelist){
push @timelist, $timestamp;
}
$hash{$name}{$timestamp} = sprintf "%.4f", $sum/$num;
$hash{$name}{$timestamp} = sprintf "%.4f", $sum;
} elsif ($line =~ /^(\d+): (\S+)/){
$timestamp = $1;
$sum = $2;