From: Namhyung Kim <namhyung@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Jiri Olsa <jolsa@kernel.org>, LKML <linux-kernel@vger.kernel.org>,
Markus Trippelsdorf <markus@trippelsdorf.de>
Subject: [PATCH 3/4] perf hist browser: Fix column indentation on --hierarchy
Date: Tue, 8 Nov 2016 22:08:32 +0900 [thread overview]
Message-ID: <20161108130833.9263-4-namhyung@kernel.org> (raw)
In-Reply-To: <20161108130833.9263-1-namhyung@kernel.org>
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.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
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
next prev parent reply other threads:[~2016-11-08 13:09 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-08 13:08 [PATCH 0/4] perf tools: Assorted fixes for hierarchy mode Namhyung Kim
2016-11-08 13:08 ` [PATCH 1/4] perf hist browser: Fix indentation of folded sign on --hierarchy Namhyung Kim
2016-11-12 10:53 ` [tip:perf/urgent] perf hists " tip-bot for Namhyung Kim
2016-11-08 13:08 ` [PATCH 2/4] perf hist browser: Show folded sign properly " Namhyung Kim
2016-11-09 14:28 ` Arnaldo Carvalho de Melo
2016-11-09 14:29 ` Arnaldo Carvalho de Melo
2016-11-12 10:53 ` [tip:perf/urgent] perf hists " tip-bot for Namhyung Kim
2016-11-08 13:08 ` Namhyung Kim [this message]
2016-11-09 14:45 ` [PATCH 3/4] perf hist browser: Fix column indentation " Arnaldo Carvalho de Melo
2016-11-12 10:54 ` [tip:perf/urgent] perf hists " tip-bot for Namhyung Kim
2016-11-08 13:08 ` [PATCH 4/4] perf hists: Fix column length " Namhyung Kim
2016-11-12 10:54 ` [tip:perf/urgent] " tip-bot for Namhyung Kim
2016-11-08 13:21 ` [PATCH 0/4] perf tools: Assorted fixes for hierarchy mode Markus Trippelsdorf
2016-11-09 13:11 ` Arnaldo Carvalho de Melo
2016-11-09 13:15 ` Markus Trippelsdorf
2016-11-08 13:43 ` Markus Trippelsdorf
2016-11-08 15:05 ` Namhyung Kim
2016-11-08 15:10 ` Markus Trippelsdorf
2016-11-09 13:10 ` Arnaldo Carvalho de Melo
2016-11-09 13:15 ` Markus Trippelsdorf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161108130833.9263-4-namhyung@kernel.org \
--to=namhyung@kernel.org \
--cc=acme@kernel.org \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=markus@trippelsdorf.de \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).