From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753234AbbLNIht (ORCPT ); Mon, 14 Dec 2015 03:37:49 -0500 Received: from terminus.zytor.com ([198.137.202.10]:52557 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752672AbbLNIhr (ORCPT ); Mon, 14 Dec 2015 03:37:47 -0500 Date: Mon, 14 Dec 2015 00:37:33 -0800 From: tip-bot for Namhyung Kim Message-ID: Cc: namhyung@kernel.org, dsahern@gmail.com, acme@redhat.com, a.p.zijlstra@chello.nl, hpa@zytor.com, linux-kernel@vger.kernel.org, jolsa@redhat.com, tglx@linutronix.de, mingo@kernel.org Reply-To: namhyung@kernel.org, a.p.zijlstra@chello.nl, dsahern@gmail.com, acme@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com, jolsa@redhat.com, tglx@linutronix.de, mingo@kernel.org In-Reply-To: <1449802616-16170-4-git-send-email-namhyung@kernel.org> References: <1449802616-16170-4-git-send-email-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf top: Cleanup condition in perf_top__record_precise_ip() Git-Commit-ID: beefb8d0e556aaf3cb69168c5953e023ace6aa78 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: beefb8d0e556aaf3cb69168c5953e023ace6aa78 Gitweb: http://git.kernel.org/tip/beefb8d0e556aaf3cb69168c5953e023ace6aa78 Author: Namhyung Kim AuthorDate: Fri, 11 Dec 2015 11:56:56 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 11 Dec 2015 08:38:10 -0300 perf top: Cleanup condition in perf_top__record_precise_ip() The 'he' cannot be NULL since it's caller hist_iter__top_callback() is called only if iter->he is not NULL (see hist_entry_iter__add). So setting 'sym' before the condition to simplify the code. Also make it clearer that the top->symbol_filter_entry check is only meaningful on stdio mode (i.e. when use_browser is 0). Signed-off-by: Namhyung Kim Cc: David Ahern Cc: Jiri Olsa Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1449802616-16170-4-git-send-email-namhyung@kernel.org [ Complete the simplification replacing one more he->ms.sym with sym ] Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-top.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index f447e55..92fe963 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c @@ -175,15 +175,14 @@ static void perf_top__record_precise_ip(struct perf_top *top, int counter, u64 ip) { struct annotation *notes; - struct symbol *sym; + struct symbol *sym = he->ms.sym; int err = 0; - if (he == NULL || he->ms.sym == NULL || - ((top->sym_filter_entry == NULL || - top->sym_filter_entry->ms.sym != he->ms.sym) && use_browser != 1)) + if (sym == NULL || (use_browser == 0 && + (top->sym_filter_entry == NULL || + top->sym_filter_entry->ms.sym != sym))) return; - sym = he->ms.sym; notes = symbol__annotation(sym); if (pthread_mutex_trylock(¬es->lock))