|
From: <sv...@va...> - 2006-09-12 21:07:57
|
Author: sewardj
Date: 2006-09-12 22:07:53 +0100 (Tue, 12 Sep 2006)
New Revision: 6055
Log:
Merge r6043 (callgrind: fix warning about malformed creator line)
(JosefW)
Modified:
branches/VALGRIND_3_2_BRANCH/callgrind/callgrind_annotate.in
Modified: branches/VALGRIND_3_2_BRANCH/callgrind/callgrind_annotate.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_2_BRANCH/callgrind/callgrind_annotate.in 2006-09-=
12 21:05:48 UTC (rev 6054)
+++ branches/VALGRIND_3_2_BRANCH/callgrind/callgrind_annotate.in 2006-09-=
12 21:07:53 UTC (rev 6055)
@@ -100,6 +100,7 @@
my $cmd =3D "";
=20
# Info on the profiled process.
+my $creator =3D "";
my $pid =3D "";
my $part =3D "";
my $thread =3D "";
@@ -310,10 +311,12 @@
}
=20
if ($input_file eq "") {
- $input_file =3D (<cachegrind.out*>)[0];
+ $input_file =3D (<callgrind.out*>)[0];
if (!defined $input_file) {
- $input_file =3D "cachegrind.out";
+ $input_file =3D (<cachegrind.out*>)[0];
}
+
+ (defined $input_file) or die($usage);
print "Reading data from '$input_file'...\n";
}
}
@@ -403,6 +406,7 @@
else { $desc .=3D "$dline\n"; }
}
elsif (/^cmd:\s+(.*)$/) { $cmd =3D $1; }
+ elsif (/^creator:\s+(.*)$/) { $creator =3D $1; }
elsif (/^positions:\s+(.*)$/) {
my $positions =3D $1;
$has_line =3D ($positions =3D~ /line/);
@@ -670,6 +674,11 @@
sub print_options ()
{
print($fancy);
+ print "Profile data file '$input_file'";
+ if ($creator ne "") { print " (creator: $creator)"; }
+ print "\n";
+
+ print($fancy);
print($desc);
my $target =3D $cmd;
if ($pid ne "") {
|