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>
Subject: Re: [PATCH 2/3] perf hists browser: Allow thread filtering for comm sort key
Date: Wed, 9 Mar 2016 11:26:03 -0300 [thread overview]
Message-ID: <20160309142603.GC3529@kernel.org> (raw)
In-Reply-To: <1457533253-21419-2-git-send-email-namhyung@kernel.org>
Em Wed, Mar 09, 2016 at 11:20:52PM +0900, Namhyung Kim escreveu:
> The commit 2eafd410e669 ("perf hists browser: Only 'Zoom into thread'
> only when sort order has 'pid'") disabled thread filtering in hist
> browser for the default sort key. However the he->thread is still valid
> even if 'pid' sort key is not given. Only thing it should not use is
> the pid (or tid) of the thread. So allow to filter by thread when
> 'comm' sort key is given and show pid only if 'pid' sort key is given.
>
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> ---
> tools/perf/ui/browsers/hists.c | 39 +++++++++++++++++++++++++++++----------
> 1 file changed, 29 insertions(+), 10 deletions(-)
>
> diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
> index aed9c8f011f7..69b0d23ffaaa 100644
> --- a/tools/perf/ui/browsers/hists.c
> +++ b/tools/perf/ui/browsers/hists.c
> @@ -2136,11 +2136,17 @@ static int hists__browser_title(struct hists *hists,
> if (hists->uid_filter_str)
> printed += snprintf(bf + printed, size - printed,
> ", UID: %s", hists->uid_filter_str);
> - if (thread)
> - printed += scnprintf(bf + printed, size - printed,
> + if (thread) {
> + if (sort__has_thread)
Please use { } for multi-line if blocks.
> + printed += scnprintf(bf + printed, size - printed,
> ", Thread: %s(%d)",
> (thread->comm_set ? thread__comm_str(thread) : ""),
> thread->tid);
> + else
> + printed += scnprintf(bf + printed, size - printed,
> + ", Thread: %s",
> + (thread->comm_set ? thread__comm_str(thread) : ""));
> + }
> if (dso)
> printed += scnprintf(bf + printed, size - printed,
> ", DSO: %s", dso->short_name);
> @@ -2321,9 +2327,14 @@ do_zoom_thread(struct hist_browser *browser, struct popup_action *act)
> thread__zput(browser->hists->thread_filter);
> ui_helpline__pop();
> } else {
> - ui_helpline__fpush("To zoom out press ESC or ENTER + \"Zoom out of %s(%d) thread\"",
> - thread->comm_set ? thread__comm_str(thread) : "",
> - thread->tid);
> + if (sort__has_thread)
> + ui_helpline__fpush("To zoom out press ESC or ENTER + \"Zoom out of %s(%d) thread\"",
> + thread->comm_set ? thread__comm_str(thread) : "",
> + thread->tid);
> + else
> + ui_helpline__fpush("To zoom out press ESC or ENTER + \"Zoom out of %s thread\"",
> + thread->comm_set ? thread__comm_str(thread) : "");
> +
> browser->hists->thread_filter = thread__get(thread);
> perf_hpp__set_elide(HISTC_THREAD, false);
> pstack__push(browser->pstack, &browser->hists->thread_filter);
> @@ -2338,13 +2349,21 @@ static int
> add_thread_opt(struct hist_browser *browser, struct popup_action *act,
> char **optstr, struct thread *thread)
> {
> - if (!sort__has_thread || thread == NULL)
> + int ret;
> +
> + if ((!sort__has_thread && !sort__has_comm) || thread == NULL)
> return 0;
>
> - if (asprintf(optstr, "Zoom %s %s(%d) thread",
> - browser->hists->thread_filter ? "out of" : "into",
> - thread->comm_set ? thread__comm_str(thread) : "",
> - thread->tid) < 0)
> + if (sort__has_thread)
Ditto
> + ret = asprintf(optstr, "Zoom %s %s(%d) thread",
> + browser->hists->thread_filter ? "out of" : "into",
> + thread->comm_set ? thread__comm_str(thread) : "",
> + thread->tid);
> + else
ditto
> + ret = asprintf(optstr, "Zoom %s %s thread",
> + browser->hists->thread_filter ? "out of" : "into",
> + thread->comm_set ? thread__comm_str(thread) : "");
> + if (ret < 0)
> return 0;
>
> act->thread = thread;
> --
> 2.7.2
next prev parent reply other threads:[~2016-03-09 14:26 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-09 14:20 [PATCH 1/3] perf tools: Add sort__has_comm variable Namhyung Kim
2016-03-09 14:20 ` [PATCH 2/3] perf hists browser: Allow thread filtering for comm sort key Namhyung Kim
2016-03-09 14:26 ` Arnaldo Carvalho de Melo [this message]
2016-03-09 15:14 ` [PATCH v2 " Namhyung Kim
2016-03-11 8:51 ` [tip:perf/core] " tip-bot for Namhyung Kim
2016-03-09 14:20 ` [PATCH 3/3] perf hists browser: Check sort keys before hot key actions Namhyung Kim
2016-03-11 8:51 ` [tip:perf/core] " tip-bot for Namhyung Kim
2016-03-11 8:50 ` [tip:perf/core] perf tools: Add sort__has_comm variable tip-bot for 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=20160309142603.GC3529@kernel.org \
--to=acme@kernel.org \
--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