From 2d6c37778b2f6c31f2cb86253a4ca841c51cc2a6 Mon Sep 17 00:00:00 2001 From: Josef Weidendorfer Date: Wed, 13 Sep 2006 22:57:38 +0000 Subject: [PATCH] callgrind_annotate: fix warnings with "--collect-jumps=yes" This callgrind option produces lines starting e.g. with "jfi" in the profile data files, which specifies a source file change between a jump source and jump target. This itself is meaningless for callgrind_annotate, as it can not show jump information in its annotation. However, such "jfi" lines can contain important mapping info for a (file ID, file name) tuple - which leads to further warnings and problems if ignored. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@6064 --- callgrind/callgrind_annotate.in | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/callgrind/callgrind_annotate.in b/callgrind/callgrind_annotate.in index 859d51a96..68703b163 100644 --- a/callgrind/callgrind_annotate.in +++ b/callgrind/callgrind_annotate.in @@ -634,6 +634,16 @@ sub read_input_file() } elsif (s/^(jump|jcnd)=//) { #ignore jump information + } elsif (s/^jfi=(.*)$//) { + # side effect needed: possibly add compression mapping + uncompressed_name("fl",$1); + # ignore jump information + + } elsif (s/^jfn=(.*)$//) { + # side effect needed: possibly add compression mapping + uncompressed_name("fn",$1); + # ignore jump information + } elsif (s/^totals:\s+//) { #ignore