Commit 0ed35abc authored Jan 08, 2012 by Namhyung Kim Committed by Arnaldo Carvalho de Melo Jan 08, 2012

perf report: Fix --stdio output alignment when --showcpuutilization used

Current perf report output is broken if --showcpuutilization is used.
Combination with -n and/or --show-total-period make things worse.
This patch fixes it as follows:

before:
    48.25%    48.25%     0.00%    sleep  [kernel.kallsyms]  [k] trace_hardirqs_off
    34.99%    34.99%     0.00%    sleep  [kernel.kallsyms]  [k] __find_get_block_slow
    15.99%    15.99%     0.00%    sleep  [kernel.kallsyms]  [k] lock_release_holdtime
     0.77%     0.77%     0.00%    sleep  [kernel.kallsyms]  [k] native_write_msr_safe

after:
    48.25%    48.25%     0.00%    sleep  [kernel.kallsyms]  [k] trace_hardirqs_off
    34.99%    34.99%     0.00%    sleep  [kernel.kallsyms]  [k] __find_get_block_slow
    15.99%    15.99%     0.00%    sleep  [kernel.kallsyms]  [k] lock_release_holdtime
     0.77%     0.77%     0.00%    sleep  [kernel.kallsyms]  [k] native_write_msr_safe

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1325957132-10600-8-git-send-email-namhyung@gmail.com


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

parent 6714a041

tools/perf/util/hist.c

+18 −16

Original line number	Diff line number	Diff line
		@@ -919,20 +919,6 @@ size_t hists__fprintf(struct hists hists, struct hists pair,

		fprintf(fp, "# %s", pair ? "Baseline" : "Overhead");

		if (symbol_conf.show_nr_samples) {
		if (sep)
		fprintf(fp, "%cSamples", *sep);
		else
		fputs(" Samples ", fp);
		}

		if (symbol_conf.show_total_period) {
		if (sep)
		ret += fprintf(fp, "%cPeriod", *sep);
		else
		ret += fprintf(fp, " Period ");
		}

		if (symbol_conf.show_cpu_utilization) {
		if (sep) {
		ret += fprintf(fp, "%csys", *sep);
		@@ -951,6 +937,20 @@ size_t hists__fprintf(struct hists hists, struct hists pair,
		}
		}

		if (symbol_conf.show_nr_samples) {
		if (sep)
		fprintf(fp, "%cSamples", *sep);
		else
		fputs(" Samples ", fp);
		}

		if (symbol_conf.show_total_period) {
		if (sep)
		ret += fprintf(fp, "%cPeriod", *sep);
		else
		ret += fprintf(fp, " Period ");
		}

		if (pair) {
		if (sep)
		ret += fprintf(fp, "%cDelta", *sep);
		@@ -995,6 +995,8 @@ size_t hists__fprintf(struct hists hists, struct hists pair,
		goto print_entries;

		fprintf(fp, "# ........");
		if (symbol_conf.show_cpu_utilization)
		fprintf(fp, " ....... .......");
		if (symbol_conf.show_nr_samples)
		fprintf(fp, " ..........");
		if (symbol_conf.show_total_period)