提交 6e427ab0 编写于 作者: A Adrian Hunter 提交者: Arnaldo Carvalho de Melo

perf annotate: Find kcore symbols on other maps

Use the new map_groups__find_ams() method to find kcore symbols on other
maps.
Signed-off-by: NAdrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1381747424-3557-4-git-send-email-adrian.hunter@intel.comSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
上级 231486a5
...@@ -825,20 +825,16 @@ static int symbol__parse_objdump_line(struct symbol *sym, struct map *map, ...@@ -825,20 +825,16 @@ static int symbol__parse_objdump_line(struct symbol *sym, struct map *map,
dl->ops.target.offset = dl->ops.target.addr - dl->ops.target.offset = dl->ops.target.addr -
map__rip_2objdump(map, sym->start); map__rip_2objdump(map, sym->start);
/* /* kcore has no symbols, so add the call target name */
* kcore has no symbols, so add the call target name if it is on the
* same map.
*/
if (dl->ins && ins__is_call(dl->ins) && !dl->ops.target.name) { if (dl->ins && ins__is_call(dl->ins) && !dl->ops.target.name) {
struct symbol *s; struct addr_map_symbol target = {
u64 ip = dl->ops.target.addr; .map = map,
.addr = 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 (!map_groups__find_ams(&target, NULL) &&
if (s && s->start == ip) target.sym->start == target.al_addr)
dl->ops.target.name = strdup(s->name); dl->ops.target.name = strdup(target.sym->name);
}
} }
disasm__add(&notes->src->source, dl); disasm__add(&notes->src->source, dl);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册