Our use of 'time' gives results along the lines of
0:01.04 0.67 0.02
That is, the realtime field is formatted as a H:M:S.CC time with the
hour field optional. Use a little perl magic to convert it to
seconds, too. This makes it easier to parse further downstream.
Signed-off-by: Thomas Rast <trast@xxxxxxxxxxxxxxx>
---
t/perf/aggregate.perl | 9 ++++-----
t/perf/perf-lib.sh | 3 ++-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/t/perf/aggregate.perl b/t/perf/aggregate.perl
index 4586840..b04d3a0 100755
--- a/t/perf/aggregate.perl
+++ b/t/perf/aggregate.perl
@@ -15,12 +15,11 @@ sub get_times {
my $sum_s = 0.0;
my $n = 0;
while (<$fh>) {
- /^(?:(\d+):)?(\d+):(\d+(?:\.\d+)?) (\d+(?:\.\d+)?) (\d+(?:\.\d+)?)$/
+ /^(\d+(?:\.\d+)?) (\d+(?:\.\d+)?) (\d+(?:\.\d+)?)$/
or die "bad input line: $_";
- my $rt = ((defined $1 ? $1 : 0.0)*60+$2)*60+$3;
- $sum_rt += $rt;
- $sum_u += $4;
- $sum_s += $5;
+ $sum_rt += $1;
+ $sum_u += $2;
+ $sum_s += $3;
$n++;
}
return undef if !$n;
diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh
index a13f105..bfc2926 100644
--- a/t/perf/perf-lib.sh
+++ b/t/perf/perf-lib.sh
@@ -185,7 +185,8 @@ test_perf () {
fi
base="$perf_results_dir"/"$perf_results_prefix$(basename "$0" .sh)"."$test_count"
rm test_time.0
- cat test_time.* >"$base".times
+ perl -pe 's/(?:(\d+):)?(\d+):(\d+(?:\.\d+)?)/((defined $1?$1:0)*60+$2)*60+$3/e' \
+ test_time.* >"$base".times
fi
echo >&3 ""
}
--
1.7.10.rc0.230.g16d90
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html