From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752818AbbLNIgs (ORCPT ); Mon, 14 Dec 2015 03:36:48 -0500 Received: from terminus.zytor.com ([198.137.202.10]:52523 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752346AbbLNIgq (ORCPT ); Mon, 14 Dec 2015 03:36:46 -0500 Date: Mon, 14 Dec 2015 00:36:32 -0800 From: tip-bot for Namhyung Kim Message-ID: Cc: linux-kernel@vger.kernel.org, a.p.zijlstra@chello.nl, acme@redhat.com, hpa@zytor.com, mingo@kernel.org, namhyung@kernel.org, dsahern@gmail.com, tglx@linutronix.de, jolsa@redhat.com Reply-To: jolsa@redhat.com, tglx@linutronix.de, dsahern@gmail.com, namhyung@kernel.org, mingo@kernel.org, a.p.zijlstra@chello.nl, linux-kernel@vger.kernel.org, hpa@zytor.com, acme@redhat.com In-Reply-To: <1449802616-16170-1-git-send-email-namhyung@kernel.org> References: <1449802616-16170-1-git-send-email-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf top: Do not convert address for perf_top__record_precise_ip() Git-Commit-ID: 64226bcf64629996948dc03c38594f00511bfc2b X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 64226bcf64629996948dc03c38594f00511bfc2b Gitweb: http://git.kernel.org/tip/64226bcf64629996948dc03c38594f00511bfc2b Author: Namhyung Kim AuthorDate: Fri, 11 Dec 2015 11:56:53 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 11 Dec 2015 08:33:18 -0300 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 Cc: David Ahern Cc: Jiri Olsa Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1449802616-16170-1-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-top.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index 785aa2d..3b0978e 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c @@ -189,8 +189,6 @@ static void perf_top__record_precise_ip(struct perf_top *top, if (pthread_mutex_trylock(¬es->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));