summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorChris Phlipot <cphlipot0@gmail.com>2016-05-10 20:26:49 -0700
committerArnaldo Carvalho de Melo <acme@redhat.com>2016-05-11 12:24:58 -0300
commit83302e79b18f75266e4a44281e8432f61d57d441 (patch)
tree778e9f5dc5b6b2144850bd8c20ef29c3b34089f5 /tools
parent7a2544c004a6c576b1e307f30925b165affe6a22 (diff)
downloadlinux-83302e79b18f75266e4a44281e8432f61d57d441.tar.gz
perf script: Fix export of callchains with recursion in db-export
When an IP with an unresolved symbol occurs in the callchain more than once (ie. recursion), then duplicate symbols can be created because the callchain nodes are never updated after they are first created. To fix this issue we call dso__find_symbol whenever we encounter a NULL symbol, in case we already added a symbol at that IP since we started traversing the callchain. This change prevents duplicate symbols from being exported when duplicate IPs are present in the callchain. Signed-off-by: Chris Phlipot <cphlipot0@gmail.com> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/1462937209-6032-5-git-send-email-cphlipot0@gmail.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/util/db-export.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/perf/util/db-export.c b/tools/perf/util/db-export.c
index 8ca4186bf31b..8d96c80cc67e 100644
--- a/tools/perf/util/db-export.c
+++ b/tools/perf/util/db-export.c
@@ -326,6 +326,10 @@ static struct call_path *call_path_from_sample(struct db_export *dbe,
al.machine = machine;
al.addr = node->ip;
+ if (al.map && !al.sym)
+ al.sym = dso__find_symbol(al.map->dso, MAP__FUNCTION,
+ al.addr);
+
db_ids_from_al(dbe, &al, &dso_db_id, &sym_db_id, &offset);
/* add node to the call path tree if it doesn't exist */