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: Namhyung 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: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
committed by
Arnaldo Carvalho de Melo
parent
e7a7865cc0
commit
64226bcf64
@@ -189,8 +189,6 @@ static void perf_top__record_precise_ip(struct perf_top *top,
|
|||||||
if (pthread_mutex_trylock(¬es->lock))
|
if (pthread_mutex_trylock(¬es->lock))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
ip = he->ms.map->map_ip(he->ms.map, ip);
|
|
||||||
|
|
||||||
if (ui__has_annotation())
|
if (ui__has_annotation())
|
||||||
err = hist_entry__inc_addr_samples(he, counter, ip);
|
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 hist_entry *he = iter->he;
|
||||||
struct perf_evsel *evsel = iter->evsel;
|
struct perf_evsel *evsel = iter->evsel;
|
||||||
|
|
||||||
if (sort__has_sym && single) {
|
if (sort__has_sym && single)
|
||||||
u64 ip = al->addr;
|
perf_top__record_precise_ip(top, he, evsel->idx, al->addr);
|
||||||
|
|
||||||
if (al->map)
|
|
||||||
ip = al->map->unmap_ip(al->map, ip);
|
|
||||||
|
|
||||||
perf_top__record_precise_ip(top, he, evsel->idx, ip);
|
|
||||||
}
|
|
||||||
|
|
||||||
hist__account_cycles(iter->sample->branch_stack, al, iter->sample,
|
hist__account_cycles(iter->sample->branch_stack, al, iter->sample,
|
||||||
!(top->record_opts.branch_stack & PERF_SAMPLE_BRANCH_ANY));
|
!(top->record_opts.branch_stack & PERF_SAMPLE_BRANCH_ANY));
|
||||||
|
|||||||
Reference in New Issue
Block a user