UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Adrian 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.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Adrian Hunter 2013-10-14 13:43:40 +03:00 committed by Arnaldo Carvalho de Melo
parent 231486a522
commit 6e427ab02c
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/perf/util/annotate.c
View File

@ -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) { if (!map_groups__find_ams(&target, NULL) &&
ip = map->map_ip(map, ip); target.sym->start == target.al_addr)
s = map__find_symbol(map, ip, NULL); dl->ops.target.name = strdup(target.sym->name);
if (s && s->start == ip)
dl->ops.target.name = strdup(s->name);
}
} }
disasm__add(&notes->src->source, dl); disasm__add(&notes->src->source, dl);