From: tip-bot for Chris Phlipot <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: adrian.hunter@intel.com, tglx@linutronix.de, hpa@zytor.com,
mingo@kernel.org, linux-kernel@vger.kernel.org, acme@redhat.com,
cphlipot0@gmail.com, peterz@infradead.org
Subject: [tip:perf/core] perf script: Fix export of callchains with recursion in db-export
Date: Thu, 12 May 2016 03:23:15 -0700 [thread overview]
Message-ID: <tip-83302e79b18f75266e4a44281e8432f61d57d441@git.kernel.org> (raw)
In-Reply-To: <1462937209-6032-5-git-send-email-cphlipot0@gmail.com>
Commit-ID: 83302e79b18f75266e4a44281e8432f61d57d441
Gitweb: http://git.kernel.org/tip/83302e79b18f75266e4a44281e8432f61d57d441
Author: Chris Phlipot <cphlipot0@gmail.com>
AuthorDate: Tue, 10 May 2016 20:26:49 -0700
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 11 May 2016 12:24:58 -0300
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>
---
tools/perf/util/db-export.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tools/perf/util/db-export.c b/tools/perf/util/db-export.c
index 8ca4186..8d96c80 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 */
prev parent reply other threads:[~2016-05-12 10:23 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-11 3:26 [PATCH v2 0/4] perf script: fix duplicate symbols in db-export Chris Phlipot
2016-05-11 3:26 ` [PATCH v2 1/4] perf symbols: add dso__insert_symbol function Chris Phlipot
2016-05-12 10:22 ` [tip:perf/core] perf symbols: Add " tip-bot for Chris Phlipot
2016-05-11 3:26 ` [PATCH v2 2/4] perf script: fix symbol insertion behavior in db-export Chris Phlipot
2016-05-12 10:22 ` [tip:perf/core] perf script: Fix " tip-bot for Chris Phlipot
2016-05-11 3:26 ` [PATCH v2 3/4] perf script: fix callchain addresses " Chris Phlipot
2016-05-12 10:22 ` [tip:perf/core] perf script: Fix " tip-bot for Chris Phlipot
2016-05-11 3:26 ` [PATCH v2 4/4] perf script: fix export of callchains with recursion " Chris Phlipot
2016-05-12 10:23 ` tip-bot for Chris Phlipot [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-83302e79b18f75266e4a44281e8432f61d57d441@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=cphlipot0@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox