From: Adrian Hunter <adrian.hunter@intel.com>
To: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>,
linux-kernel@vger.kernel.org, David Ahern <dsahern@gmail.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Jiri Olsa <jolsa@redhat.com>, Mike Galbraith <efault@gmx.de>,
Namhyung Kim <namhyung@gmail.com>,
Paul Mackerras <paulus@samba.org>,
Stephane Eranian <eranian@google.com>
Subject: [PATCH V7 3/7] perf tools: find kcore symbols on other maps
Date: Mon, 14 Oct 2013 13:43:40 +0300 [thread overview]
Message-ID: <1381747424-3557-4-git-send-email-adrian.hunter@intel.com> (raw)
In-Reply-To: <1381747424-3557-1-git-send-email-adrian.hunter@intel.com>
Use the new map__find_other_map_symbol() to
find kcore symbols on other maps.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
tools/perf/util/annotate.c | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 882bb86..cf6242c 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -825,20 +825,16 @@ static int symbol__parse_objdump_line(struct symbol *sym, struct map *map,
dl->ops.target.offset = dl->ops.target.addr -
map__rip_2objdump(map, sym->start);
- /*
- * kcore has no symbols, so add the call target name if it is on the
- * same map.
- */
+ /* kcore has no symbols, so add the call target name */
if (dl->ins && ins__is_call(dl->ins) && !dl->ops.target.name) {
- struct symbol *s;
- u64 ip = dl->ops.target.addr;
-
- if (ip >= map->start && ip <= map->end) {
- ip = map->map_ip(map, ip);
- s = map__find_symbol(map, ip, NULL);
- if (s && s->start == ip)
- dl->ops.target.name = strdup(s->name);
- }
+ struct addr_map_symbol target = {
+ .map = map,
+ .addr = dl->ops.target.addr,
+ };
+
+ if (!map_groups__find_ams(&target, NULL) &&
+ target.sym->start == target.al_addr)
+ dl->ops.target.name = strdup(target.sym->name);
}
disasm__add(¬es->src->source, dl);
--
1.7.11.7
next prev parent reply other threads:[~2013-10-14 10:45 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-14 10:43 [PATCH V7 0/7] perf tools: kcore improvements Adrian Hunter
2013-10-14 10:43 ` [PATCH V7 1/7] perf tools: Add map_groups__find_ams() Adrian Hunter
2013-10-15 5:33 ` [tip:perf/core] perf symbols: " tip-bot for Arnaldo Carvalho de Melo
2013-10-14 10:43 ` [PATCH V7 2/7] perf tools: fix annotate_browser__callq() Adrian Hunter
2013-10-15 5:35 ` [tip:perf/core] perf annotate: Fix annotate_browser__callq() tip-bot for Adrian Hunter
2013-10-14 10:43 ` Adrian Hunter [this message]
2013-10-15 5:34 ` [tip:perf/core] perf annotate: Find kcore symbols on other maps tip-bot for Adrian Hunter
2013-10-14 10:43 ` [PATCH V7 4/7] perf tools: add copyfile_mode() Adrian Hunter
2013-10-15 5:35 ` [tip:perf/core] perf tools: Add copyfile_mode() tip-bot for Adrian Hunter
2013-10-14 10:43 ` [PATCH V7 5/7] perf buildid-cache: add ability to add kcore to the cache Adrian Hunter
2013-10-14 13:13 ` Arnaldo Carvalho de Melo
2013-10-14 13:57 ` Adrian Hunter
2013-10-15 5:35 ` [tip:perf/core] perf buildid-cache: Add " tip-bot for Adrian Hunter
2013-10-14 10:43 ` [PATCH V7 6/7] perf tools: add ability to find kcore in build-id cache Adrian Hunter
2013-10-15 5:35 ` [tip:perf/core] perf symbols: Add " tip-bot for Adrian Hunter
2013-10-14 10:43 ` [PATCH V7 7/7] perf tools: another fix for annotate_browser__callq() Adrian Hunter
2013-10-15 5:35 ` [tip:perf/core] perf annotate: Another " tip-bot for Adrian Hunter
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=1381747424-3557-4-git-send-email-adrian.hunter@intel.com \
--to=adrian.hunter@intel.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@ghostprotocols.net \
--cc=dsahern@gmail.com \
--cc=efault@gmx.de \
--cc=eranian@google.com \
--cc=fweisbec@gmail.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=namhyung@gmail.com \
--cc=paulus@samba.org \
/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;
as well as URLs for NNTP newsgroup(s).