Commit 84d1b201 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf stat: Fix crash with --per-node --metric-only in CSV mode 



The following command will get segfault due to missing aggr_header_csv
for AGGR_NODE:

  $ sudo perf stat -a --per-node -x, --metric-only true

Committer testing:

Before this patch:

  # perf stat -a --per-node -x, --metric-only true
  Segmentation fault (core dumped)
  #

After:

  # gdb perf
  -bash: gdb: command not found
  # perf stat -a --per-node -x, --metric-only true
  node,Ghz,frontend cycles idle,backend cycles idle,insn per cycle,branch-misses of all branches,
  N0,32,0.335,2.10,0.65,0.69,0.03,1.92,
  #

Fixes: 86895b48 ("perf stat: Add --per-node agregation support")
Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Link: http://lore.kernel.org/lkml/20221107213314.3239159-2-namhyung@kernel.org


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

tools/perf/util/stat-display.c

+3 −1
Original line number Diff line number Diff line
@@ -559,7 +559,7 @@ static void printout(struct perf_stat_config *config, struct aggr_cpu_id id, int 
			[AGGR_CORE] = 2,

			[AGGR_THREAD] = 1,

			[AGGR_UNSET] = 0,

			[AGGR_NODE] = 0,

			[AGGR_NODE] = 1,

		};



		pm = config->metric_only ? print_metric_only_csv : print_metric_csv;
@@ -1124,6 +1124,7 @@ static int aggr_header_lens[] = { 
	[AGGR_SOCKET] = 12,

	[AGGR_NONE] = 6,

	[AGGR_THREAD] = 24,

	[AGGR_NODE] = 6,

	[AGGR_GLOBAL] = 0,

};
@@ -1133,6 +1134,7 @@ static const char *aggr_header_csv[] = { 
	[AGGR_SOCKET] 	= 	"socket,cpus",

	[AGGR_NONE] 	= 	"cpu,",

	[AGGR_THREAD] 	= 	"comm-pid,",

	[AGGR_NODE] 	= 	"node,",

	[AGGR_GLOBAL] 	=	""

};