From 43f5fe89a53ffe8da2e1ff93f63d55851490d930 Mon Sep 17 00:00:00 2001
From: Robert Read <robert.read@intel.com>
Date: Wed, 6 Mar 2013 11:12:01 -0800
Subject: [PATCH] LU-2921 iokit: plot-obdfilter fixes
plot-obdfilter was mixing up objects and threads in its output.
Signed-off-by: Robert Read <robert.read@intel.com>
Change-Id: If6aa66943b88ea0d35b5a8ab4b61b8f80df67fd5
Reviewed-on: http://review.whamcloud.com/5618
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Minh Diep <minh.diep@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---
lustre-iokit/obdfilter-survey/plot-obdfilter | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/lustre-iokit/obdfilter-survey/plot-obdfilter b/lustre-iokit/obdfilter-survey/plot-obdfilter
index f61c55b741..ac0f83409e 100644
--- a/lustre-iokit/obdfilter-survey/plot-obdfilter
+++ b/lustre-iokit/obdfilter-survey/plot-obdfilter
@@ -93,7 +93,7 @@ sub write_scr_file() {
$i = 2;
$xrange = 1;
# generate instructions for gnuplot, with adjusting X-axes ranges
- for ($j = $first_thread; $j <= $thread ; $j = $j + $j) {
+ for ($j = $first_obj; $j <= $obj ; $j = $j + $j) {
printf SCRFILE "$plot \"$file-$rsz-$op.dat\" using 1:$i axes x%dy1 title \"$rwlabel-obj$j\" with line\n", $xrange;
$i++;
$plot = "replot";
@@ -114,12 +114,12 @@ sub write_dat_file() {
# Open .csv/.dat file for writing required columns from log file.
open ( DATAFILE, "> $file-$rsz-$op.dat" ) or die "Can't open csv file for writing";
printf DATAFILE "%-6s", "thrd";
- for ($j = $first_thread; $j <= $thread ; $j = $j + $j) {
+ for ($j = $first_obj; $j <= $obj; $j = $j + $j) {
printf DATAFILE "%-10s", "$op-obj$j";
}
- for ( $i = $first_obj; $i <= $obj; $i = $i + $i ) {
+ for ( $i = $first_thread; $i <= $thread; $i = $i + $i ) {
printf DATAFILE "\n%-6s", $i;
- for ($j = $first_thread; $j <= $thread ; $j = $j + $j) {
+ for ($j = $first_obj; $j <= $obj; $j = $j + $j) {
# switch-case can be used instead if else
if ($op eq "rd") {
if ( $ard{$i}{$j} ) {
@@ -227,7 +227,7 @@ LABEL: while ( <PFILE> ) {
}
}
}
- if ($rsz != $line[5]) {
+ if ($rsz ne $line[5]) {
&write_files();
$rsz = $line[5];
$first_obj = $line[7];
--
GitLab