Groups > linux.kernel > #1562048

Re: [PATCH 1/2] perf diff: Fix segfault on perf diff -o N option

Path	csiph.com!feeder.erje.net!2.eu.feeder.erje.net!news.szaf.org!news.unit0.net!news.panservice.it!bofh.it!news.nic.it!robomod
From	Jiri Olsa <jolsa@redhat.com>
Newsgroups	linux.kernel
Subject	Re: [PATCH 1/2] perf diff: Fix segfault on perf diff -o N option
Date	Wed, 18 Jan 2017 19:30:03 +0100
Message-ID	<t139F-7wu-29@gated-at.bofh.it> (permalink)
References	<t0QP8-8h6-3@gated-at.bofh.it>
MIME-Version	1.0
Content-Type	text/plain; charset=us-ascii
Content-Disposition	inline
User-Agent	Mutt/1.7.1 (2016-10-04)
X-Scanned-By	MIMEDefang 2.74 on 10.5.11.28
X-Greylist	Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 18 Jan 2017 18:20:17 +0000 (UTC)
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	45
Organization	linux.* mail to news gateway
X-Original-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>
X-Original-Date	Wed, 18 Jan 2017 19:20:12 +0100
X-Original-Message-ID	<20170118182012.GB19212@krava>
X-Original-References	<20170118051457.30946-1-namhyung@kernel.org>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1562048

Show key headers only | View raw

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
>

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH 1/2] perf diff: Fix segfault on perf diff -o N option Namhyung Kim <namhyung@kernel.org> - 2017-01-18 06:20 +0100
  Re: [PATCH 1/2] perf diff: Fix segfault on perf diff -o N option Jiri Olsa <jolsa@redhat.com> - 2017-01-18 19:30 +0100

csiph-web