From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753337AbcAWNc5 (ORCPT ); Sat, 23 Jan 2016 08:32:57 -0500 Received: from mail-pa0-f67.google.com ([209.85.220.67]:34141 "EHLO mail-pa0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753255AbcAWNcv (ORCPT ); Sat, 23 Jan 2016 08:32:51 -0500 From: Namhyung Kim To: Arnaldo Carvalho de Melo Cc: Ingo Molnar , Peter Zijlstra , Jiri Olsa , LKML , David Ahern Subject: [PATCH 4/4] perf hists browser: Check script context menu Date: Sat, 23 Jan 2016 22:31:42 +0900 Message-Id: <1453555902-18401-4-git-send-email-namhyung@kernel.org> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1453555902-18401-1-git-send-email-namhyung@kernel.org> References: <1453555902-18401-1-git-send-email-namhyung@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The script and data-switch context menu are only meaningful when it deals with a data file. So add a check so that it cannot be shown when perf-top is run. Signed-off-by: Namhyung Kim --- tools/perf/ui/browsers/hists.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c index 05e94feba3cb..0affffeed89c 100644 --- a/tools/perf/ui/browsers/hists.c +++ b/tools/perf/ui/browsers/hists.c @@ -2309,7 +2309,7 @@ skip_annotation: socked_id); } /* perf script support */ - if (browser->he_selection) { + if (is_report_browser(hbt) && browser->he_selection) { if (sort__has_thread) { nr_options += add_script_opt(browser, &actions[nr_options], @@ -2332,10 +2332,12 @@ skip_annotation: NULL, browser->selection->sym); } } - nr_options += add_script_opt(browser, &actions[nr_options], - &options[nr_options], NULL, NULL); - nr_options += add_switch_opt(browser, &actions[nr_options], - &options[nr_options]); + if (is_report_browser(hbt)) { + nr_options += add_script_opt(browser, &actions[nr_options], + &options[nr_options], NULL, NULL); + nr_options += add_switch_opt(browser, &actions[nr_options], + &options[nr_options]); + } nr_options += add_exit_opt(browser, &actions[nr_options], &options[nr_options]); -- 2.6.4