From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Namhyung Kim <namhyung@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Jiri Olsa <jolsa@kernel.org>, LKML <linux-kernel@vger.kernel.org>,
David Ahern <dsahern@gmail.com>,
Stephane Eranian <eranian@google.com>,
Andi Kleen <andi@firstfloor.org>, Wang Nan <wangnan0@huawei.com>
Subject: Re: [PATCH 08/17] perf hists browser: Fix context menu item
Date: Wed, 20 Jan 2016 21:52:45 -0300 [thread overview]
Message-ID: <20160121005245.GM18367@kernel.org> (raw)
In-Reply-To: <1452960197-5323-9-git-send-email-namhyung@kernel.org>
Em Sun, Jan 17, 2016 at 01:03:08AM +0900, Namhyung Kim escreveu:
> When symbol sort key is not given, it doesn't show any item other than
> exit. Check sort key to select possible items. Also check items more
> strictly using sort key information.
So, without this patch when I press enter on 'perf top' I can zoom into
threads, with it I lose that option.
- Arnaldo
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> ---
> tools/perf/ui/browsers/hists.c | 50 ++++++++++++++++++++++++------------------
> tools/perf/util/sort.c | 3 +++
> tools/perf/util/sort.h | 2 ++
> 3 files changed, 34 insertions(+), 21 deletions(-)
>
> diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
> index 08c09ad755d2..cd6349ebd0d6 100644
> --- a/tools/perf/ui/browsers/hists.c
> +++ b/tools/perf/ui/browsers/hists.c
> @@ -2263,10 +2263,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
> continue;
> }
>
> - if (!sort__has_sym)
> - goto add_exit_option;
> -
> - if (browser->selection == NULL)
> + if (!sort__has_sym || browser->selection == NULL)
> goto skip_annotation;
>
> if (sort__mode == SORT_MODE__BRANCH) {
> @@ -2294,23 +2291,33 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
> browser->selection->sym);
> }
> skip_annotation:
> - nr_options += add_thread_opt(browser, &actions[nr_options],
> - &options[nr_options], thread);
> - nr_options += add_dso_opt(browser, &actions[nr_options],
> - &options[nr_options], map);
> - nr_options += add_map_opt(browser, &actions[nr_options],
> - &options[nr_options],
> - browser->selection ?
> - browser->selection->map : NULL);
> - nr_options += add_socket_opt(browser, &actions[nr_options],
> - &options[nr_options],
> - socked_id);
> + if (sort__has_thread) {
> + nr_options += add_thread_opt(browser, &actions[nr_options],
> + &options[nr_options], thread);
> + }
> + if (sort__has_dso) {
> + nr_options += add_dso_opt(browser, &actions[nr_options],
> + &options[nr_options], map);
> + nr_options += add_map_opt(browser, &actions[nr_options],
> + &options[nr_options],
> + browser->selection ?
> + browser->selection->map : NULL);
> + }
> + if (sort__has_socket) {
> + nr_options += add_socket_opt(browser, &actions[nr_options],
> + &options[nr_options],
> + socked_id);
> + }
> +
> /* perf script support */
> if (browser->he_selection) {
> - nr_options += add_script_opt(browser,
> - &actions[nr_options],
> - &options[nr_options],
> - thread, NULL);
> + if (sort__has_thread) {
> + nr_options += add_script_opt(browser,
> + &actions[nr_options],
> + &options[nr_options],
> + thread, NULL);
> + }
> +
> /*
> * Note that browser->selection != NULL
> * when browser->he_selection is not NULL,
> @@ -2320,16 +2327,17 @@ skip_annotation:
> *
> * See hist_browser__show_entry.
> */
> - nr_options += add_script_opt(browser,
> + if (sort__has_sym && browser->selection->sym) {
> + nr_options += add_script_opt(browser,
> &actions[nr_options],
> &options[nr_options],
> 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]);
> -add_exit_option:
> nr_options += add_exit_opt(browser, &actions[nr_options],
> &options[nr_options]);
>
> diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
> index 4632475bc5e4..8ff873ee39a8 100644
> --- a/tools/perf/util/sort.c
> +++ b/tools/perf/util/sort.c
> @@ -21,6 +21,7 @@ const char *field_order;
> regex_t ignore_callees_regex;
> int have_ignore_callees = 0;
> int sort__need_collapse = 0;
> +int sort__has_thread = 0;
> int sort__has_parent = 0;
> int sort__has_sym = 0;
> int sort__has_dso = 0;
> @@ -2249,6 +2250,8 @@ static int sort_dimension__add(const char *tok,
> sort__has_dso = 1;
> } else if (sd->entry == &sort_socket) {
> sort__has_socket = 1;
> + } else if (sd->entry == &sort_comm || sd->entry == &sort_thread) {
> + sort__has_thread = 1;
> }
>
> return __sort_dimension__add(sd);
> diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h
> index 051739615847..879513e61dba 100644
> --- a/tools/perf/util/sort.h
> +++ b/tools/perf/util/sort.h
> @@ -32,7 +32,9 @@ extern const char default_sort_order[];
> extern regex_t ignore_callees_regex;
> extern int have_ignore_callees;
> extern int sort__need_collapse;
> +extern int sort__has_thread;
> extern int sort__has_parent;
> +extern int sort__has_dso;
> extern int sort__has_sym;
> extern int sort__has_socket;
> extern enum sort_mode sort__mode;
> --
> 2.6.4
next prev parent reply other threads:[~2016-01-21 0:52 UTC|newest]
Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-16 16:03 [RFC/PATCHSET 00/17] perf tools: Add support for hierachy view (v2) Namhyung Kim
2016-01-16 16:03 ` [PATCH 01/17] perf hists: Basic support of hierarchical report view Namhyung Kim
2016-01-17 16:15 ` Jiri Olsa
2016-01-19 10:51 ` Namhyung Kim
2016-01-19 16:50 ` Arnaldo Carvalho de Melo
2016-01-20 17:00 ` Jiri Olsa
2016-01-20 17:09 ` Arnaldo Carvalho de Melo
2016-01-21 4:08 ` Namhyung Kim
2016-01-21 10:43 ` Jiri Olsa
2016-01-21 12:55 ` Namhyung Kim
2016-01-21 13:35 ` Jiri Olsa
2016-01-21 14:02 ` Arnaldo Carvalho de Melo
2016-01-22 10:44 ` Namhyung Kim
2016-01-22 10:43 ` Namhyung Kim
2016-01-22 11:37 ` Jiri Olsa
2016-01-21 11:35 ` Jiri Olsa
2016-01-21 13:01 ` Namhyung Kim
2016-01-16 16:03 ` [PATCH 02/17] perf hists: Resort hist entries with hierarchy Namhyung Kim
2016-01-21 11:41 ` Jiri Olsa
2016-01-21 13:03 ` Namhyung Kim
2016-01-16 16:03 ` [PATCH 03/17] perf hists: Add helper functions for hierarchy mode Namhyung Kim
2016-01-20 22:19 ` Arnaldo Carvalho de Melo
2016-01-21 3:59 ` Namhyung Kim
2016-01-21 4:19 ` [PATCH v2 " Namhyung Kim
2016-01-21 13:05 ` Namhyung Kim
2016-01-16 16:03 ` [PATCH 04/17] perf hists: Cleanup filtering functions Namhyung Kim
2016-01-19 20:39 ` Arnaldo Carvalho de Melo
2016-01-20 1:15 ` [PATCH v2 04.1/17] perf hists: Remove parent filter check in DSO filter function Namhyung Kim
2016-01-20 1:15 ` [PATCH v2 04.2/17] perf hists: Cleanup filtering functions Namhyung Kim
2016-01-21 12:02 ` Jiri Olsa
2016-02-03 10:08 ` [tip:perf/core] " tip-bot for Namhyung Kim
2016-01-21 12:02 ` [PATCH v2 04.1/17] perf hists: Remove parent filter check in DSO filter function Jiri Olsa
2016-02-03 10:07 ` [tip:perf/core] " tip-bot for Namhyung Kim
2016-01-16 16:03 ` [PATCH 05/17] perf hists: Support filtering in hierarchy mode Namhyung Kim
2016-01-16 16:03 ` [PATCH 06/17] perf ui/stdio: Implement hierarchy output mode Namhyung Kim
2016-01-16 16:03 ` [PATCH 07/17] perf ui/stdio: Align column header for hierarchy output Namhyung Kim
2016-01-20 22:40 ` Arnaldo Carvalho de Melo
2016-01-21 4:00 ` Namhyung Kim
2016-01-16 16:03 ` [PATCH 08/17] perf hists browser: Fix context menu item Namhyung Kim
2016-01-21 0:52 ` Arnaldo Carvalho de Melo [this message]
2016-01-21 4:07 ` Namhyung Kim
2016-01-21 23:51 ` Arnaldo Carvalho de Melo
2016-01-22 11:08 ` Namhyung Kim
2016-01-22 14:37 ` Dynamicly add/remove sort keys was: " Arnaldo Carvalho de Melo
2016-02-03 10:10 ` [tip:perf/core] perf sort: Provide a way to find out if per-thread bucketing is in place tip-bot for Namhyung Kim
2016-02-03 10:11 ` [tip:perf/core] perf hists browser: Only 'Zoom into thread' only when sort order has 'pid' tip-bot for Namhyung Kim
2016-02-03 10:11 ` [tip:perf/core] perf hists browser: Only offer symbol scripting when a symbol is under the cursor tip-bot for Namhyung Kim
2016-02-03 10:11 ` [tip:perf/core] perf hists browser: Offer 'Zoom into DSO'/' Map details' only when sort order has 'dso' tip-bot for Namhyung Kim
2016-02-03 10:12 ` [tip:perf/core] perf hists browser: Be a bit more strict about presenting CPU socket zoom tip-bot for Namhyung Kim
2016-02-03 10:12 ` [tip:perf/core] perf hists browser: Offer non-symbol specific menu options for --sort without 'sym' tip-bot for Namhyung Kim
2016-01-16 16:03 ` [PATCH 09/17] perf hists browser: Count number of hierarchy entries Namhyung Kim
2016-01-16 16:03 ` [PATCH 10/17] perf hists browser: Support collapsing/expanding whole entries in hierarchy Namhyung Kim
2016-01-16 16:03 ` [PATCH 11/17] perf hists browser: Factor out hist_browser__show_callchain() Namhyung Kim
2016-01-16 16:03 ` [PATCH 12/17] perf hists browser: Implement hierarchy output Namhyung Kim
2016-01-16 16:03 ` [PATCH 13/17] perf hists browser: Align column header in hierarchy mode Namhyung Kim
2016-01-16 16:03 ` [PATCH 14/17] perf ui/gtk: Implement hierarchy output mode Namhyung Kim
2016-01-16 16:03 ` [PATCH 15/17] perf report: Add --hierarchy option Namhyung Kim
2016-01-16 16:03 ` [PATCH 16/17] perf hists: Support decaying in hierarchy mode Namhyung Kim
2016-01-16 16:03 ` [PATCH 17/17] perf top: Add --hierarchy option Namhyung Kim
2016-01-17 10:25 ` [RFC/PATCHSET 00/17] perf tools: Add support for hierachy view (v2) Pekka Enberg
2016-01-19 10:42 ` Namhyung Kim
2016-01-17 19:31 ` Andi Kleen
2016-01-19 10:45 ` Namhyung Kim
2016-01-19 21:03 ` Arnaldo Carvalho de Melo
2016-01-19 21:07 ` Arnaldo Carvalho de Melo
2016-01-19 22:12 ` Andi Kleen
2016-01-19 22:24 ` Arnaldo Carvalho de Melo
2016-01-20 0:56 ` Namhyung Kim
2016-01-20 1:11 ` Andi Kleen
2016-01-20 1:36 ` Namhyung Kim
2016-01-20 1:43 ` Andi Kleen
2016-01-20 13:34 ` Arnaldo Carvalho de Melo
2016-01-19 20:00 ` Arnaldo Carvalho de Melo
2016-01-19 20:52 ` Arnaldo Carvalho de Melo
2016-01-20 0:19 ` Namhyung Kim
2016-01-19 20:59 ` Arnaldo Carvalho de Melo
2016-01-20 0:34 ` Namhyung Kim
2016-01-20 5:28 ` Andi Kleen
2016-01-20 7:49 ` Taeung Song
2016-01-20 15:08 ` Namhyung Kim
2016-01-20 16:34 ` Taeung Song
2016-01-21 4:17 ` Namhyung Kim
2016-01-21 4:58 ` Taeung Song
2016-01-20 13:32 ` Arnaldo Carvalho de Melo
2016-01-20 15:01 ` Namhyung Kim
2016-01-20 15:25 ` Arnaldo Carvalho de Melo
2016-01-20 15:29 ` Arnaldo Carvalho de Melo
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=20160121005245.GM18367@kernel.org \
--to=acme@kernel.org \
--cc=andi@firstfloor.org \
--cc=dsahern@gmail.com \
--cc=eranian@google.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=wangnan0@huawei.com \
/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).