Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754126AbcKIOqJ (ORCPT ); Wed, 9 Nov 2016 09:46:09 -0500 Received: from mail.kernel.org ([198.145.29.136]:34926 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750938AbcKIOp5 (ORCPT ); Wed, 9 Nov 2016 09:45:57 -0500 Date: Wed, 9 Nov 2016 11:45:51 -0300 From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Peter Zijlstra , Jiri Olsa , LKML , Markus Trippelsdorf Subject: Re: [PATCH 3/4] perf hist browser: Fix column indentation on --hierarchy Message-ID: <20161109144550.GJ12125@kernel.org> References: <20161108130833.9263-1-namhyung@kernel.org> <20161108130833.9263-4-namhyung@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20161108130833.9263-4-namhyung@kernel.org> 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 Content-Length: 2188 Lines: 62 Em Tue, Nov 08, 2016 at 10:08:32PM +0900, Namhyung Kim escreveu: > When horizontall scrolling is used in hierarchy mode, the the right most > column has unnecessary indentation. Actually it's needed only if some > of left (overhead) columns were shown. I see, here is the fix, thanks, testing it now... - Arnaldo > Signed-off-by: Namhyung Kim > --- > tools/perf/ui/browsers/hists.c | 19 +++++++++++++------ > 1 file changed, 13 insertions(+), 6 deletions(-) > > diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c > index 7722ad311318..15b29a79a69b 100644 > --- a/tools/perf/ui/browsers/hists.c > +++ b/tools/perf/ui/browsers/hists.c > @@ -1361,8 +1361,10 @@ static int hist_browser__show_hierarchy_entry(struct hist_browser *browser, > width -= hpp.buf - s; > } > > - ui_browser__write_nstring(&browser->b, "", hierarchy_indent); > - width -= hierarchy_indent; > + if (!first) { > + ui_browser__write_nstring(&browser->b, "", hierarchy_indent); > + width -= hierarchy_indent; > + } > > if (column >= browser->b.horiz_scroll) { > char s[2048]; > @@ -1565,6 +1567,7 @@ static int hists_browser__scnprintf_hierarchy_headers(struct hist_browser *brows > if (advance_hpp_check(&dummy_hpp, ret)) > return ret; > > + first_node = true; > /* the first hpp_list_node is for overhead columns */ > fmt_node = list_first_entry(&hists->hpp_formats, > struct perf_hpp_list_node, list); > @@ -1579,12 +1582,16 @@ static int hists_browser__scnprintf_hierarchy_headers(struct hist_browser *brows > ret = scnprintf(dummy_hpp.buf, dummy_hpp.size, " "); > if (advance_hpp_check(&dummy_hpp, ret)) > break; > + > + first_node = false; > } > > - ret = scnprintf(dummy_hpp.buf, dummy_hpp.size, "%*s", > - indent * HIERARCHY_INDENT, ""); > - if (advance_hpp_check(&dummy_hpp, ret)) > - return ret; > + if (!first_node) { > + ret = scnprintf(dummy_hpp.buf, dummy_hpp.size, "%*s", > + indent * HIERARCHY_INDENT, ""); > + if (advance_hpp_check(&dummy_hpp, ret)) > + return ret; > + } > > first_node = true; > list_for_each_entry_continue(fmt_node, &hists->hpp_formats, list) { > -- > 2.10.1