From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752508AbdARSUS (ORCPT ); Wed, 18 Jan 2017 13:20:18 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39406 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751646AbdARSUR (ORCPT ); Wed, 18 Jan 2017 13:20:17 -0500 Date: Wed, 18 Jan 2017 19:20:12 +0100 From: Jiri Olsa To: Namhyung Kim Cc: Arnaldo Carvalho de Melo , Ingo Molnar , Peter Zijlstra , Jiri Olsa , LKML Subject: Re: [PATCH 1/2] perf diff: Fix segfault on perf diff -o N option Message-ID: <20170118182012.GB19212@krava> References: <20170118051457.30946-1-namhyung@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170118051457.30946-1-namhyung@kernel.org> User-Agent: Mutt/1.7.1 (2016-10-04) 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: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.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 Acked-by: Jiri Olsa 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 >