From: tip-bot for Namhyung Kim <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: namhyung@kernel.org, jolsa@redhat.com, dsahern@gmail.com,
mingo@kernel.org, acme@redhat.com, hpa@zytor.com,
a.p.zijlstra@chello.nl, tglx@linutronix.de,
linux-kernel@vger.kernel.org
Subject: [tip:perf/core] perf hists browser: Simplify zooming code using pstack_peek()
Date: Tue, 5 May 2015 20:22:29 -0700 [thread overview]
Message-ID: <tip-6422184b087ff4355951d72e0bb320f52e107185@git.kernel.org> (raw)
In-Reply-To: <1429838133-14001-2-git-send-email-namhyung@kernel.org>
Commit-ID: 6422184b087ff4355951d72e0bb320f52e107185
Gitweb: http://git.kernel.org/tip/6422184b087ff4355951d72e0bb320f52e107185
Author: Namhyung Kim <namhyung@kernel.org>
AuthorDate: Fri, 24 Apr 2015 10:15:33 +0900
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Tue, 5 May 2015 18:13:23 -0300
perf hists browser: Simplify zooming code using pstack_peek()
Now LEFT key press action can just use do_zoom_dso/thread() code to get
out of the current filter.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1429838133-14001-2-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/ui/browsers/hists.c | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index 9bd7b38..8733d57 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -1860,19 +1860,17 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
goto out_free_stack;
continue;
}
- top = pstack__pop(browser->pstack);
+ top = pstack__peek(browser->pstack);
if (top == &browser->hists->dso_filter) {
- perf_hpp__set_elide(HISTC_DSO, false);
- browser->hists->dso_filter = NULL;
- hists__filter_by_dso(browser->hists);
- }
- if (top == &browser->hists->thread_filter) {
- perf_hpp__set_elide(HISTC_THREAD, false);
- thread__zput(browser->hists->thread_filter);
- hists__filter_by_thread(browser->hists);
+ /*
+ * No need to set actions->dso here since
+ * it's just to remove the current filter.
+ * Ditto for thread below.
+ */
+ do_zoom_dso(browser, actions);
}
- ui_helpline__pop();
- hist_browser__reset(browser);
+ if (top == &browser->hists->thread_filter)
+ do_zoom_thread(browser, actions);
continue;
}
case K_ESC:
next prev parent reply other threads:[~2015-05-06 3:22 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-22 7:18 [PATCHSET 00/10] perf tools: Assorted cleanup for TUI (v3) Namhyung Kim
2015-04-22 7:18 ` [PATCH 01/10] perf tools: Move TUI-specific fields into unnamed union Namhyung Kim
2015-04-22 11:57 ` Arnaldo Carvalho de Melo
2015-05-06 3:19 ` [tip:perf/core] " tip-bot for Namhyung Kim
2015-04-22 7:18 ` [PATCH 02/10] perf tools: Move init_have_children field to the " Namhyung Kim
2015-05-06 3:20 ` [tip:perf/core] " tip-bot for Namhyung Kim
2015-04-22 7:18 ` [PATCH 03/10] perf hists browser: Fix possible memory leak Namhyung Kim
2015-05-06 3:20 ` [tip:perf/core] " tip-bot for Namhyung Kim
2015-04-22 7:18 ` [PATCH 04/10] perf hists browser: Save hist_browser_timer pointer in hist_browser Namhyung Kim
2015-05-06 3:20 ` [tip:perf/core] " tip-bot for Namhyung Kim
2015-04-22 7:18 ` [PATCH 05/10] perf hists browser: Save pstack in the hist_browser Namhyung Kim
2015-05-06 3:21 ` [tip:perf/core] " tip-bot for Namhyung Kim
2015-04-22 7:18 ` [PATCH 06/10] perf hists browser: Save perf_session_env " Namhyung Kim
2015-05-06 3:21 ` [tip:perf/core] " tip-bot for Namhyung Kim
2015-04-22 7:18 ` [PATCH 07/10] perf hists browser: Split popup menu actions Namhyung Kim
2015-05-06 3:21 ` [tip:perf/core] " tip-bot for Namhyung Kim
2015-04-22 7:18 ` [PATCH 08/10] perf hists browser: Split popup menu actions - part 2 Namhyung Kim
2015-04-22 10:54 ` Jiri Olsa
2015-04-22 13:03 ` Namhyung Kim
2015-04-22 13:25 ` Arnaldo Carvalho de Melo
2015-04-22 13:32 ` Namhyung Kim
2015-04-22 13:41 ` Jiri Olsa
2015-04-22 13:53 ` Namhyung Kim
2015-04-22 14:02 ` Jiri Olsa
2015-05-06 3:21 ` [tip:perf/core] " tip-bot for Namhyung Kim
2015-04-22 7:18 ` [PATCH 09/10] perf hists browser: Simplify zooming code a bit Namhyung Kim
2015-04-23 22:30 ` Arnaldo Carvalho de Melo
2015-04-24 1:15 ` [PATCH v2 9/10] perf tools: Introduce pstack_peek() Namhyung Kim
2015-04-24 1:15 ` [PATCH v2 9.5/10] perf hists browser: Simplify zooming code using pstack_peek() Namhyung Kim
2015-05-06 3:22 ` tip-bot for Namhyung Kim [this message]
2015-05-06 3:22 ` [tip:perf/core] perf tools: Introduce pstack_peek() tip-bot for Namhyung Kim
2015-04-22 7:18 ` [PATCH 10/10] perf tools: Move TUI-specific fields out of map_symbol Namhyung Kim
2015-04-27 17:20 ` Arnaldo Carvalho de Melo
2015-04-28 7:30 ` Namhyung Kim
2015-04-28 12:29 ` Arnaldo Carvalho de Melo
2015-05-04 15:42 ` Arnaldo Carvalho de Melo
2015-05-04 15:51 ` Arnaldo Carvalho de Melo
2015-05-05 1:12 ` Namhyung Kim
2015-05-05 14:07 ` Arnaldo Carvalho de Melo
2015-05-05 14:22 ` Namhyung Kim
2015-05-05 1:18 ` [PATCH v2 " Namhyung Kim
2015-05-05 14:22 ` Arnaldo Carvalho de Melo
2015-05-05 14:26 ` Arnaldo Carvalho de Melo
2015-05-05 14:40 ` Namhyung Kim
2015-05-05 14:55 ` [PATCH v3 " Namhyung Kim
2015-05-05 16:00 ` Arnaldo Carvalho de Melo
2015-05-06 3:22 ` [tip:perf/core] " tip-bot for Namhyung Kim
2015-04-22 11:12 ` [PATCHSET 00/10] perf tools: Assorted cleanup for TUI (v3) Jiri Olsa
2015-04-22 13:05 ` Namhyung Kim
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=tip-6422184b087ff4355951d72e0bb320f52e107185@git.kernel.org \
--to=tipbot@zytor.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=dsahern@gmail.com \
--cc=hpa@zytor.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=tglx@linutronix.de \
/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).