Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e427ab0 authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

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: default avatarAdrian 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 231486a5

tools/perf/util/annotate.c

+9 −13
Original line number Diff line number Diff line
@@ -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;

		struct addr_map_symbol target = {

			.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 (s && s->start == ip)

				dl->ops.target.name = strdup(s->name);

		}

		if (!map_groups__find_ams(&target, NULL) &&

		    target.sym->start == target.al_addr)

			dl->ops.target.name = strdup(target.sym->name);

	}



	disasm__add(&notes->src->source, dl);