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

Commit 64226bcf authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf top: Do not convert address for perf_top__record_precise_ip() 



We call map->unmap_ip() before the function and call map->map_ip()
inside the function.  This is meaningless and look strange since only
one of the two checks 'map'.  Let's use al->addr directly.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1449802616-16170-1-git-send-email-namhyung@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent e7a7865c

tools/perf/builtin-top.c

+2 −10
Original line number Diff line number Diff line
@@ -189,8 +189,6 @@ static void perf_top__record_precise_ip(struct perf_top *top, 
	if (pthread_mutex_trylock(&notes->lock))

		return;



	ip = he->ms.map->map_ip(he->ms.map, ip);



	if (ui__has_annotation())

		err = hist_entry__inc_addr_samples(he, counter, ip);
@@ -687,14 +685,8 @@ static int hist_iter__top_callback(struct hist_entry_iter *iter, 
	struct hist_entry *he = iter->he;

	struct perf_evsel *evsel = iter->evsel;



	if (sort__has_sym && single) {

		u64 ip = al->addr;



		if (al->map)

			ip = al->map->unmap_ip(al->map, ip);



		perf_top__record_precise_ip(top, he, evsel->idx, ip);

	}

	if (sort__has_sym && single)

		perf_top__record_precise_ip(top, he, evsel->idx, al->addr);



	hist__account_cycles(iter->sample->branch_stack, al, iter->sample,

		     !(top->record_opts.branch_stack & PERF_SAMPLE_BRANCH_ANY));