From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752410AbcISOtq (ORCPT ); Mon, 19 Sep 2016 10:49:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48954 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752116AbcISOti (ORCPT ); Mon, 19 Sep 2016 10:49:38 -0400 Date: Mon, 19 Sep 2016 16:49:34 +0200 From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: Jiri Olsa , lkml , Don Zickus , Joe Mario , Ingo Molnar , Peter Zijlstra , Namhyung Kim , David Ahern , Andi Kleen Subject: Re: [PATCH 61/61] perf tools: Fix width computation for srcline sort entry Message-ID: <20160919144934.GA27543@krava> References: <1474290610-23241-1-git-send-email-jolsa@kernel.org> <1474290610-23241-62-git-send-email-jolsa@kernel.org> <20160919143319.GB7534@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160919143319.GB7534@kernel.org> User-Agent: Mutt/1.7.0 (2016-08-17) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 19 Sep 2016 14:49:38 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Sep 19, 2016 at 11:33:19AM -0300, Arnaldo Carvalho de Melo wrote: > Em Mon, Sep 19, 2016 at 03:10:10PM +0200, Jiri Olsa escreveu: > > Adding header size to width computation for srcline sort entry, > > because it's possible to get empty data with ':0' which set width > > of 2 which is lower than width needed to display column header. > > Thanks, cherry-picked, looking at the larger patchset. oops, it's on this side of the patchset because it needs sort_srcline to be global, which is done within the patchset.. I can separate that for v4 if it's needed ;-) thanks, jirka > > - Arnaldo > > > Link: http://lkml.kernel.org/n/tip-twbp391v8v9f5idp584hlfov@git.kernel.org > > Signed-off-by: Jiri Olsa > > --- > > tools/perf/util/hist.c | 6 ++++-- > > 1 file changed, 4 insertions(+), 2 deletions(-) > > > > diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c > > index 020efa9d3d74..e1be4132054d 100644 > > --- a/tools/perf/util/hist.c > > +++ b/tools/perf/util/hist.c > > @@ -177,8 +177,10 @@ void hists__calc_col_len(struct hists *hists, struct hist_entry *h) > > hists__new_col_len(hists, HISTC_LOCAL_WEIGHT, 12); > > hists__new_col_len(hists, HISTC_GLOBAL_WEIGHT, 12); > > > > - if (h->srcline) > > - hists__new_col_len(hists, HISTC_SRCLINE, strlen(h->srcline)); > > + if (h->srcline) { > > + len = MAX(strlen(h->srcline), strlen(sort_srcline.se_header)); > > + hists__new_col_len(hists, HISTC_SRCLINE, len); > > + } > > > > if (h->srcfile) > > hists__new_col_len(hists, HISTC_SRCFILE, strlen(h->srcfile)); > > -- > > 2.7.4