From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751776AbdBBOeX (ORCPT ); Thu, 2 Feb 2017 09:34:23 -0500 Received: from mail.kernel.org ([198.145.29.136]:45186 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751726AbdBBOeW (ORCPT ); Thu, 2 Feb 2017 09:34:22 -0500 Date: Thu, 2 Feb 2017 11:34:16 -0300 From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Peter Zijlstra , Jiri Olsa , LKML Subject: Re: [PATCH 1/2] perf diff: Fix segfault on perf diff -o N option Message-ID: <20170202143416.GA5302@kernel.org> References: <20170118051457.30946-1-namhyung@kernel.org> <20170202024303.GD12990@sejong> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170202024303.GD12990@sejong> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.7.1 (2016-10-04) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Thu, Feb 02, 2017 at 11:43:03AM +0900, Namhyung Kim escreveu: > Hi Arnaldo, > > Could you please consider merging it to the perf/urgent? Fell thru the cracks, applied to perf/urgent, thanks for the reminder! - Arnaldo > Thanks, > Namhyung > > > 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 > > --- > > 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 > >