From: Jiri Olsa <jolsa@redhat.com>
To: Namhyung Kim <namhyung@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>,
Ingo Molnar <mingo@kernel.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Jiri Olsa <jolsa@kernel.org>, LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 1/2] perf diff: Fix segfault on perf diff -o N option
Date: Wed, 18 Jan 2017 19:20:12 +0100 [thread overview]
Message-ID: <20170118182012.GB19212@krava> (raw)
In-Reply-To: <20170118051457.30946-1-namhyung@kernel.org>
On Wed, Jan 18, 2017 at 02:14:56PM +0900, Namhyung Kim wrote:
> The -o/--order option is to select column number to sort a diff result.
> It does the job by adding a hpp field at the beginning of the sort list.
> But it should not be added to the output field list as it has no
> callbacks required by a output field.
>
> During the setup_sorting(), the perf_hpp__setup_output_field() appends
> given sort keys to the output field if it's not there already.
>
> Originally it was checked by the fmt->list being non-empty. But commit
> 3f931f2c4274 changed it to check the ->equal callback. Anyway we don't
> need to add the pseudo hpp field to the output field list since it won't
> be used for output. So just skip fields if they have no ->color or
> ->entry callbacks.
>
> Fixes: 3f931f2c4274 ("perf hists: Make hpp setup function generic")
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Jiri Olsa <jolsa@kernel.org>
thanks,
jirka
> ---
> tools/perf/ui/hist.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
> index 37388397b5bc..4ec79b2f9416 100644
> --- a/tools/perf/ui/hist.c
> +++ b/tools/perf/ui/hist.c
> @@ -560,6 +560,10 @@ void perf_hpp__setup_output_field(struct perf_hpp_list *list)
> perf_hpp_list__for_each_sort_list(list, fmt) {
> struct perf_hpp_fmt *pos;
>
> + /* skip sort-only fields ("sort_compute" in perf diff) */
> + if (!fmt->entry && !fmt->color)
> + continue;
> +
> perf_hpp_list__for_each_format(list, pos) {
> if (fmt_equal(fmt, pos))
> goto next;
> --
> 2.11.0
>
next prev parent reply other threads:[~2017-01-18 18:20 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-18 5:14 [PATCH 1/2] perf diff: Fix segfault on perf diff -o N option Namhyung Kim
2017-01-18 5:14 ` [PATCH 2/2] perf diff: Fix -o/--order option behavior (again) Namhyung Kim
2017-01-18 18:26 ` Jiri Olsa
2017-02-03 19:47 ` [tip:perf/urgent] " tip-bot for Namhyung Kim
2017-01-18 18:20 ` Jiri Olsa [this message]
2017-02-02 2:43 ` [PATCH 1/2] perf diff: Fix segfault on perf diff -o N option Namhyung Kim
2017-02-02 14:34 ` Arnaldo Carvalho de Melo
2017-02-03 19:46 ` [tip:perf/urgent] perf diff: Fix segfault on 'perf diff -o N' option 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=20170118182012.GB19212@krava \
--to=jolsa@redhat.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=jolsa@kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).