From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932262AbcBCKMp (ORCPT ); Wed, 3 Feb 2016 05:12:45 -0500 Received: from terminus.zytor.com ([198.137.202.10]:54476 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755046AbcBCKMl (ORCPT ); Wed, 3 Feb 2016 05:12:41 -0500 Date: Wed, 3 Feb 2016 02:11:58 -0800 From: tip-bot for Namhyung Kim Message-ID: Cc: acme@redhat.com, namhyung@kernel.org, wangnan0@huawei.com, eranian@google.com, tglx@linutronix.de, mingo@kernel.org, dsahern@gmail.com, peterz@infradead.org, linux-kernel@vger.kernel.org, andi@firstfloor.org, hpa@zytor.com Reply-To: mingo@kernel.org, tglx@linutronix.de, dsahern@gmail.com, peterz@infradead.org, linux-kernel@vger.kernel.org, hpa@zytor.com, andi@firstfloor.org, acme@redhat.com, namhyung@kernel.org, wangnan0@huawei.com, eranian@google.com In-Reply-To: <1452960197-5323-9-git-send-email-namhyung@kernel.org> References: <1452960197-5323-9-git-send-email-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf hists browser: Offer 'Zoom into DSO'/' Map details' only when sort order has 'dso' Git-Commit-ID: b1447a54f5b41eaf1cc469d9bd3834caa2ff9afb 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: b1447a54f5b41eaf1cc469d9bd3834caa2ff9afb Gitweb: http://git.kernel.org/tip/b1447a54f5b41eaf1cc469d9bd3834caa2ff9afb Author: Namhyung Kim AuthorDate: Fri, 22 Jan 2016 11:22:41 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 26 Jan 2016 11:52:50 -0300 perf hists browser: Offer 'Zoom into DSO'/'Map details' only when sort order has 'dso' We can't offer a zoom into DSO when a bucket (struct hist_entry) may have samples for more than one DSO, i.e. when 'dso' is not part of the sort order, ditto for 'Map details', fix it. Signed-off-by: Namhyung Kim Tested-by: Arnaldo Carvalho de Melo Cc: Andi Kleen Cc: David Ahern Cc: Jiri Olsa , Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Wang Nan Link: http://lkml.kernel.org/r/1452960197-5323-9-git-send-email-namhyung@kernel.org [ Carved out from a larger patch, moved check to add_{dso,map}_opt() ] Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/ui/browsers/hists.c | 4 ++-- tools/perf/util/sort.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c index 2801d80..e892106 100644 --- a/tools/perf/ui/browsers/hists.c +++ b/tools/perf/ui/browsers/hists.c @@ -1825,7 +1825,7 @@ static int add_dso_opt(struct hist_browser *browser, struct popup_action *act, char **optstr, struct map *map) { - if (map == NULL) + if (!sort__has_dso || map == NULL) return 0; if (asprintf(optstr, "Zoom %s %s DSO", @@ -1850,7 +1850,7 @@ static int add_map_opt(struct hist_browser *browser __maybe_unused, struct popup_action *act, char **optstr, struct map *map) { - if (map == NULL) + if (!sort__has_dso || map == NULL) return 0; if (asprintf(optstr, "Browse map details") < 0) diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h index 09616f0..89a1273 100644 --- a/tools/perf/util/sort.h +++ b/tools/perf/util/sort.h @@ -32,6 +32,7 @@ extern const char default_sort_order[]; extern regex_t ignore_callees_regex; extern int have_ignore_callees; extern int sort__need_collapse; +extern int sort__has_dso; extern int sort__has_parent; extern int sort__has_sym; extern int sort__has_socket;