2012-10-20 00:59:56

by Namhyung Kim

[permalink] [raw]
Subject: [tip:perf/urgent] perf hists browser: Fix off-by-two bug on the first column

Commit-ID: 63a1a3d820c619a4dab1781cc16c110a284efded
Gitweb: http://git.kernel.org/tip/63a1a3d820c619a4dab1781cc16c110a284efded
Author: Namhyung Kim <[email protected]>
AuthorDate: Mon, 15 Oct 2012 18:14:35 -0300
Committer: Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Tue, 16 Oct 2012 13:06:05 -0300

perf hists browser: Fix off-by-two bug on the first column

The commit 5395a04841fc ("perf hists: Separate overhead and baseline
columns") makes the "Overhead" column no more the first one. So it
resulted in the mis-aligned column in the normal (non-diff) output.

Signed-off-by: Namhyung Kim <[email protected]>
Reported-by: Markus Trippelsdorf <[email protected]>
Acked-by: Jiri Olsa <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Link: http://lkml.kernel.org/r/None
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
tools/perf/ui/browsers/hists.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index 0568536..fe4430a 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -610,6 +610,7 @@ static int hist_browser__show_entry(struct hist_browser *browser,
char folded_sign = ' ';
bool current_entry = ui_browser__is_current_entry(&browser->b, row);
off_t row_offset = entry->row_offset;
+ bool first = true;

if (current_entry) {
browser->he_selection = entry;
@@ -633,10 +634,11 @@ static int hist_browser__show_entry(struct hist_browser *browser,
if (!perf_hpp__format[i].cond)
continue;

- if (i) {
+ if (!first) {
slsmg_printf(" ");
width -= 2;
}
+ first = false;

if (perf_hpp__format[i].color) {
hpp.ptr = &percent;