Commit c72ab446 authored Nov 08, 2016 by Namhyung Kim Committed by Arnaldo Carvalho de Melo Nov 09, 2016

perf hists: Fix column length on --hierarchy



Markus reported that there's a weird behavior on perf top --hierarchy
regarding the column length.

Looking at the code, I found a dubious code which affects the symptoms.
When --hierarchy option is used, the last column length might be
inaccurate since it skips to update the length on leaf entries.

I cannot remember why it did and looks like a leftover from previous
version during the development.

Anyway, updating the column length often is not harmful.  So let's move
the code out.

Reported-and-Tested-by: Markus Trippelsdorf <markus@trippelsdorf.de>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Fixes: 1a3906a7 ("perf hists: Resort hist entries with hierarchy")
Link: http://lkml.kernel.org/r/20161108130833.9263-5-namhyung@kernel.org


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent b9bf911e

tools/perf/util/hist.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -1600,18 +1600,18 @@ static void hists__hierarchy_output_resort(struct hists *hists,
		if (prog)
		ui_progress__update(prog, 1);

		if (!he->leaf) {
		hists__hierarchy_output_resort(hists, prog,
		&he->hroot_in,
		&he->hroot_out,
		min_callchain_hits,
		use_callchain);
		hists->nr_entries++;
		if (!he->filtered) {
		hists->nr_non_filtered_entries++;
		hists__calc_col_len(hists, he);
		}

		if (!he->leaf) {
		hists__hierarchy_output_resort(hists, prog,
		&he->hroot_in,
		&he->hroot_out,
		min_callchain_hits,
		use_callchain);
		continue;
		}