From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756632AbbFSXRQ (ORCPT ); Fri, 19 Jun 2015 19:17:16 -0400 Received: from terminus.zytor.com ([198.137.202.10]:52755 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756596AbbFSXRF (ORCPT ); Fri, 19 Jun 2015 19:17:05 -0400 Date: Fri, 19 Jun 2015 16:16:49 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: tglx@linutronix.de, bp@suse.de, jolsa@redhat.com, fweisbec@gmail.com, adrian.hunter@intel.com, dzickus@redhat.com, acme@redhat.com, namhyung@kernel.org, mingo@kernel.org, dsahern@gmail.com, eranian@google.com, linux-kernel@vger.kernel.org, hpa@zytor.com Reply-To: tglx@linutronix.de, bp@suse.de, jolsa@redhat.com, fweisbec@gmail.com, adrian.hunter@intel.com, acme@redhat.com, dzickus@redhat.com, mingo@kernel.org, namhyung@kernel.org, dsahern@gmail.com, eranian@google.com, linux-kernel@vger.kernel.org, hpa@zytor.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf hists browser: Do not exit when 'f' is pressed in 'report' mode Git-Commit-ID: 516e536849d26a2bcacd9050f4a7222a14c0f9e4 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: 516e536849d26a2bcacd9050f4a7222a14c0f9e4 Gitweb: http://git.kernel.org/tip/516e536849d26a2bcacd9050f4a7222a14c0f9e4 Author: Arnaldo Carvalho de Melo AuthorDate: Fri, 19 Jun 2015 16:59:43 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 19 Jun 2015 16:59:43 -0300 perf hists browser: Do not exit when 'f' is pressed in 'report' mode The 'f' hotkey is only used when in 'top', dynamic mode, to enable/disable events, currently not making sense in the 'report', static mode, where we can't go from showing the histogram entries created from a perf.data file to adding more events after recreating the evlist created from the perf.data file, albeit possible, this is not implemented right now. Cc: Adrian Hunter Cc: Borislav Petkov Cc: David Ahern Cc: Don Zickus Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Namhyung Kim Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-lholzf472pu98dkkijggwx2m@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/ui/browsers/hists.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c index 764f7ca..79a093a7 100644 --- a/tools/perf/ui/browsers/hists.c +++ b/tools/perf/ui/browsers/hists.c @@ -1901,7 +1901,10 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, /* Fall thru */ case 'q': case CTRL('c'): + goto out_free_stack; case 'f': + if (is_report_browser(hbt)) + continue; goto out_free_stack; default: continue; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in Please read the FAQ at http://www.tux.org/lkml/