tools/perf: Fix cpu check to use id.cpu.cpu in aggr_printout
PATCH 1/1 tools/perf: Fix cpu check to use id.cpu.cpu in aggr_printout
perf stat has options to aggregate the counts in different modes like per socket, per core etc. The function "aggr_printout" in util/stat-display.c which is used to print the aggregates, has a check for cpu in case of AGGR_NONE. This check was originally using condition : "if (id.cpu.cpu > -1)". But this got changed after commit df936cadfb58 ("perf stat: Add JSON output option"), which added option to output json format for different aggregation modes. After this commit, the check in "aggr_printout" is using "if (id.core > -1)".
The old code was using "id.cpu.cpu > -1" while the new code is using "id.core > -1". But since the value printed is id.cpu.cpu, fix this check to use cpu and not core.
---
Note: Details for discussion on this logic:
https://www.spinics.net/lists/linux-perf-users/msg22473.html
tools/perf/util/stat-display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/util/stat-display.c +2 -2
@@ -168,7 +168,7 @@ static void aggr_printout(struct perf_stat_config *config, id.socket, id.die, id.core); - }else if (id.core >-1 ) { + }else if (id.cpu.cpu >-1 ) {fprintf (config->output,"\"cpu\" : \"%d\", " , id.cpu.cpu); }
@@ -179,7 +179,7 @@ static void aggr_printout(struct perf_stat_config *config, id.die, config->csv_output ?0 :-3 , id.core, config->csv_sep); - }else if (id.core >-1 ) { + }else if (id.cpu.cpu >-1 ) {fprintf (config->output,"CPU%*d%s" , config->csv_output ?0 :-7 , id.cpu.cpu, config->csv_sep);
Signature · 1 line
2.31.1