linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Namhyung Kim <namhyung@kernel.org>,
	David Ahern <dsahern@gmail.com>, Jiri Olsa <jolsa@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 16/19] perf hists browser: Check sort keys before hot key actions
Date: Thu, 10 Mar 2016 18:04:37 -0300	[thread overview]
Message-ID: <1457643880-4908-17-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1457643880-4908-1-git-send-email-acme@kernel.org>

From: Namhyung Kim <namhyung@kernel.org>

The context menu in TUI hists browser checks corresponding sort keys
when creating the menu item.  But hotkey actions lacks these checks so
it can filter using incorrect info.

For example, default sort key of 'perf top' doesn't contain 'comm' or
'pid' sort key so each hist entry's thread info is not reliable.  Thus
it should prohibit using thread filter on 't' key.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1457533253-21419-3-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/ui/browsers/hists.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index cb4191bf6cec..4b9816555946 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -2322,6 +2322,9 @@ do_zoom_thread(struct hist_browser *browser, struct popup_action *act)
 {
 	struct thread *thread = act->thread;
 
+	if ((!sort__has_thread && !sort__has_comm) || thread == NULL)
+		return 0;
+
 	if (browser->hists->thread_filter) {
 		pstack__remove(browser->pstack, &browser->hists->thread_filter);
 		perf_hpp__set_elide(HISTC_THREAD, false);
@@ -2379,6 +2382,9 @@ do_zoom_dso(struct hist_browser *browser, struct popup_action *act)
 {
 	struct map *map = act->ms.map;
 
+	if (!sort__has_dso || map == NULL)
+		return 0;
+
 	if (browser->hists->dso_filter) {
 		pstack__remove(browser->pstack, &browser->hists->dso_filter);
 		perf_hpp__set_elide(HISTC_DSO, false);
@@ -2530,6 +2536,9 @@ add_exit_opt(struct hist_browser *browser __maybe_unused,
 static int
 do_zoom_socket(struct hist_browser *browser, struct popup_action *act)
 {
+	if (!sort__has_socket || act->socket < 0)
+		return 0;
+
 	if (browser->hists->socket_filter > -1) {
 		pstack__remove(browser->pstack, &browser->hists->socket_filter);
 		browser->hists->socket_filter = -1;
-- 
2.5.0

  parent reply	other threads:[~2016-03-10 21:05 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-10 21:04 [GIT PULL 00/19] perf/core improvements and fixes Arnaldo Carvalho de Melo
2016-03-10 21:04 ` [PATCH 01/19] perf jitdump: DWARF is also needed Arnaldo Carvalho de Melo
2016-03-10 21:04 ` [PATCH 02/19] perf tools: Fix perf script python database export crash Arnaldo Carvalho de Melo
2016-03-10 21:04 ` [PATCH 03/19] perf tools: Pass perf_hpp_list all the way through setup_sort_list Arnaldo Carvalho de Melo
2016-03-10 21:04 ` [PATCH 04/19] perf tools: Omit unnecessary cast in perf_pmu__parse_scale Arnaldo Carvalho de Melo
2016-03-10 21:04 ` [PATCH 05/19] tools lib traceevent: Add '~' operation within arg_num_eval() Arnaldo Carvalho de Melo
2016-03-10 21:04 ` [PATCH 06/19] perf jitdump: Build only on supported archs Arnaldo Carvalho de Melo
2016-03-10 21:04 ` [PATCH 07/19] perf tools: Fix hist_entry__filter() for hierarchy Arnaldo Carvalho de Melo
2016-03-10 21:04 ` [PATCH 08/19] perf tools: Add more sort entry check functions Arnaldo Carvalho de Melo
2016-03-10 21:04 ` [PATCH 09/19] perf tools: Fix command line filters in hierarchy mode Arnaldo Carvalho de Melo
2016-03-10 21:04 ` [PATCH 10/19] perf tools: Remove hist_entry->fmt field Arnaldo Carvalho de Melo
2016-03-10 21:04 ` [PATCH 11/19] perf hists browser: Cleanup hist_browser__fprintf_hierarchy_entry() Arnaldo Carvalho de Melo
2016-03-10 21:04 ` [PATCH 12/19] perf tools: Remove nr_sort_keys field Arnaldo Carvalho de Melo
2016-03-10 21:04 ` [PATCH 13/19] perf tools: Recalc total periods using top-level entries in hierarchy Arnaldo Carvalho de Melo
2016-03-10 21:04 ` [PATCH 14/19] perf tools: Add sort__has_comm variable Arnaldo Carvalho de Melo
2016-03-10 21:04 ` [PATCH 15/19] perf hists browser: Allow thread filtering for comm sort key Arnaldo Carvalho de Melo
2016-03-10 21:04 ` Arnaldo Carvalho de Melo [this message]
2016-03-10 21:04 ` [PATCH 17/19] perf stat: Document CSV format in manpage Arnaldo Carvalho de Melo
2016-03-10 21:04 ` [PATCH 18/19] perf stat: Implement --metric-only mode Arnaldo Carvalho de Melo
2016-03-10 21:04 ` [PATCH 19/19] perf stat: Add --metric-only support for -A Arnaldo Carvalho de Melo
2016-03-11  8:43 ` [GIT PULL 00/19] 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=1457643880-4908-17-git-send-email-acme@kernel.org \
    --to=acme@kernel.org \
    --cc=acme@redhat.com \
    --cc=dsahern@gmail.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=peterz@infradead.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;
as well as URLs for NNTP newsgroup(s).