callgrind: Fix warning about malformed creator line in annotate script
This also changes the default filename (if not given) to callgrind.out.*
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@6043 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/callgrind/callgrind_annotate.in b/callgrind/callgrind_annotate.in
index 6d36f06..617354d 100644
--- a/callgrind/callgrind_annotate.in
+++ b/callgrind/callgrind_annotate.in
@@ -100,6 +100,7 @@
my $cmd = "";
# Info on the profiled process.
+my $creator = "";
my $pid = "";
my $part = "";
my $thread = "";
@@ -310,10 +311,12 @@
}
if ($input_file eq "") {
- $input_file = (<cachegrind.out*>)[0];
+ $input_file = (<callgrind.out*>)[0];
if (!defined $input_file) {
- $input_file = "cachegrind.out";
+ $input_file = (<cachegrind.out*>)[0];
}
+
+ (defined $input_file) or die($usage);
print "Reading data from '$input_file'...\n";
}
}
@@ -403,6 +406,7 @@
else { $desc .= "$dline\n"; }
}
elsif (/^cmd:\s+(.*)$/) { $cmd = $1; }
+ elsif (/^creator:\s+(.*)$/) { $creator = $1; }
elsif (/^positions:\s+(.*)$/) {
my $positions = $1;
$has_line = ($positions =~ /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 = $cmd;
if ($pid ne "") {