From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org,
Arnaldo Carvalho de Melo <acme@redhat.com>,
Adrian Hunter <adrian.hunter@intel.com>,
Borislav Petkov <bp@suse.de>, David Ahern <dsahern@gmail.com>,
Don Zickus <dzickus@redhat.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>,
Stephane Eranian <eranian@google.com>
Subject: [PATCH 08/11] perf hists browser: React to unassigned hotkey pressing
Date: Fri, 19 Jun 2015 18:58:12 -0300 [thread overview]
Message-ID: <1434751095-29715-9-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1434751095-29715-1-git-send-email-acme@kernel.org>
From: Arnaldo Carvalho de Melo <acme@redhat.com>
When that happens we were just ignoring the key press, now this
message is presented in the bottom line (the help line):
"Press '?' for help on key bindings"
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-iyma2j5kj3q9i1stl4mfh90n@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/ui/browsers/hists.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index e2b500b26527..c42adb600091 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -1902,10 +1902,11 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
case CTRL('c'):
goto out_free_stack;
case 'f':
- if (is_report_browser(hbt))
- continue;
- goto out_free_stack;
+ if (!is_report_browser(hbt))
+ goto out_free_stack;
+ /* Fall thru */
default:
+ helpline = "Press '?' for help on key bindings";
continue;
}
--
2.1.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
Please read the FAQ at http://www.tux.org/lkml/
next prev parent reply other threads:[~2015-06-19 21:59 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-19 21:58 [GIT PULL 00/11] perf/core improvements and fixes Arnaldo Carvalho de Melo
2015-06-19 21:58 ` [PATCH 01/11] perf tools: Ensure thread-stack is flushed Arnaldo Carvalho de Melo
2015-06-19 21:58 ` [PATCH 02/11] perf annotate: Display total number of samples with --show-total-period Arnaldo Carvalho de Melo
2015-06-19 21:58 ` [PATCH 03/11] perf annotate: Rename source_line_percent to source_line_samples Arnaldo Carvalho de Melo
2015-06-19 21:58 ` [PATCH 04/11] perf top: Replace CTRL+z with 'f' as hotkey for enable/disable events Arnaldo Carvalho de Melo
2015-06-19 21:58 ` [PATCH 05/11] perf hists browser: Do not exit when 'f' is pressed in 'report' mode Arnaldo Carvalho de Melo
2015-06-19 21:58 ` [PATCH 06/11] perf hists browser: Honour the help line provided by builtin-{top,report}.c Arnaldo Carvalho de Melo
2015-06-19 21:58 ` [PATCH 07/11] perf top: Tell the user how to unfreeze events after pressing 'f' Arnaldo Carvalho de Melo
2015-06-19 21:58 ` Arnaldo Carvalho de Melo [this message]
2015-06-19 21:58 ` [PATCH 09/11] perf report: Fix sort__sym_cmp to also compare end of symbol Arnaldo Carvalho de Melo
2015-06-19 21:58 ` [PATCH 10/11] perf tools: Add time out to force stop proc map processing Arnaldo Carvalho de Melo
2015-06-19 21:58 ` [PATCH 11/11] perf tools: Configurable per thread proc map processing time out Arnaldo Carvalho de Melo
2015-06-19 23:12 ` [GIT PULL 00/11] perf/core improvements and fixes Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1434751095-29715-9-git-send-email-acme@kernel.org \
--to=acme@kernel.org \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=bp@suse.de \
--cc=dsahern@gmail.com \
--cc=dzickus@redhat.com \
--cc=eranian@google.com \
--cc=fweisbec@gmail.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome