Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c51fd639 authored by Andi Kleen's avatar Andi Kleen Committed by Arnaldo Carvalho de Melo
Browse files

perf stat: Add missing aggregation headers for --metric-only CSV 



When in CSV mode --metric-only outputs an header, unlike the other
modes. Previously it did not properly print headers for the aggregation
columns, so the headers were actually shifted against the real values.

Fix this here by outputting the correct headers for CSV.

v2: Indent array.

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Link: http://lkml.kernel.org/r/1464119559-17203-4-git-send-email-andi@firstfloor.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 41c8ca2a

tools/perf/builtin-stat.c

+14 −0
Original line number Diff line number Diff line
@@ -1316,6 +1316,14 @@ static int aggr_header_lens[] = { 
	[AGGR_GLOBAL] = 0,

};



static const char *aggr_header_csv[] = {

	[AGGR_CORE] 	= 	"core,cpus,",

	[AGGR_SOCKET] 	= 	"socket,cpus",

	[AGGR_NONE] 	= 	"cpu,",

	[AGGR_THREAD] 	= 	"comm-pid,",

	[AGGR_GLOBAL] 	=	""

};



static void print_metric_headers(const char *prefix, bool no_indent)

{

	struct perf_stat_output_ctx out;
@@ -1330,6 +1338,12 @@ static void print_metric_headers(const char *prefix, bool no_indent) 
	if (!csv_output && !no_indent)

		fprintf(stat_config.output, "%*s",

			aggr_header_lens[stat_config.aggr_mode], "");

	if (csv_output) {

		if (stat_config.interval)

			fputs("time,", stat_config.output);

		fputs(aggr_header_csv[stat_config.aggr_mode],

			stat_config.output);

	}



	/* Print metrics headers only */

	evlist__for_each(evsel_list, counter) {