Merge r6207:
Make vg_perf work on AIX, by using the POSIX-portability flag for
/usr/bin/time.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@6304 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/perf/vg_perf.in b/perf/vg_perf.in
index 0ee0015..d1de2cb 100644
--- a/perf/vg_perf.in
+++ b/perf/vg_perf.in
@@ -240,7 +240,8 @@
}
}
-# Run program N times, return the best user time.
+# Run program N times, return the best user time. Use the POSIX
+# -p flag on /usr/bin/time so as to get something parseable on AIX.
sub time_prog($$)
{
my ($cmd, $n) = @_;
@@ -252,9 +253,9 @@
die "\n*** Command returned non-zero ($retval)"
. "\n*** See perf.{cmd,stdout,stderr} to determine what went wrong.\n";
my $out = `cat perf.stderr`;
- ($out =~ /usertime: ([\d\.]+)s/) or
+ ($out =~ /[Uu]ser([ ]+)([\d\.]+)/) or
die "\n*** missing usertime in perf.stderr\n";
- $tmin = $1 if ($1 < $tmin);
+ $tmin = $2 if ($2 < $tmin);
}
# Avoid divisions by zero!
return (0 == $tmin ? 0.01 : $tmin);
@@ -277,7 +278,7 @@
}
}
- my $timecmd = "/usr/bin/time -f 'usertime: %Us'";
+ my $timecmd = "/usr/bin/time -p";
# Do the native run(s).
printf("-- $name --\n") if (@vgdirs > 1);