iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf stat: Factor out print_metric_{begin,end}()

Browse Source 
For the metric-only case, add new functions to handle the start and the
end of each metric display.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Athira Jajeev <atrajeev@linux.vnet.ibm.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@kernel.org>
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: https://lore.kernel.org/r/20221114230227.1255976-18-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Namhyung Kim 2022-11-14 15:02:25 -08:00 committed by Arnaldo Carvalho de Melo
parent 2cf38236d9
commit 78670daefd
1 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
tools/perf/util/stat-display.c
View File

@ -836,12 +836,39 @@ static void print_counter_aggrdata(struct perf_stat_config *config,
fputc('\n', output); fputc('\n', output);
} }
static void print_metric_begin(struct perf_stat_config *config,
struct evlist *evlist,
char *prefix, int aggr_idx)
{
struct perf_stat_aggr *aggr;
struct aggr_cpu_id id;
struct evsel *evsel;
if (!config->metric_only)
return;
if (prefix)
fprintf(config->output, "%s", prefix);
evsel = evlist__first(evlist);
id = config->aggr_map->map[aggr_idx];
aggr = &evsel->stats->aggr[aggr_idx];
aggr_printout(config, evsel, id, aggr->nr);
}
static void print_metric_end(struct perf_stat_config *config)
{
if (!config->metric_only)
return;
fputc('\n', config->output);
}
static void print_aggr(struct perf_stat_config *config, static void print_aggr(struct perf_stat_config *config,
struct evlist *evlist, struct evlist *evlist,
char *prefix) char *prefix)
{ {
bool metric_only = config->metric_only; bool metric_only = config->metric_only;
FILE *output = config->output;
struct evsel *counter; struct evsel *counter;
int s; int s;
@ -853,17 +880,7 @@ static void print_aggr(struct perf_stat_config *config,
* Without each counter has its own line. * Without each counter has its own line.
*/ */
for (s = 0; s < config->aggr_map->nr; s++) { for (s = 0; s < config->aggr_map->nr; s++) {
if (metric_only) { print_metric_begin(config, evlist, prefix, s);
struct perf_stat_aggr *aggr;
struct aggr_cpu_id id = config->aggr_map->map[s];
if (prefix)
fprintf(output, "%s", prefix);
counter = evlist__first(evlist);
aggr = &counter->stats->aggr[s];
aggr_printout(config, counter, id, aggr->nr);
}
evlist__for_each_entry(evlist, counter) { evlist__for_each_entry(evlist, counter) {
if (counter->merged_stat) if (counter->merged_stat)
@ -872,8 +889,7 @@ static void print_aggr(struct perf_stat_config *config,
print_counter_aggrdata(config, counter, s, prefix, print_counter_aggrdata(config, counter, s, prefix,
metric_only); metric_only);
} }
if (metric_only) print_metric_end(config);
fputc('\n', output);
} }
} }
@ -919,9 +935,7 @@ static void print_no_aggr_metric(struct perf_stat_config *config,
id = aggr_cpu_id__cpu(cpu, /*data=*/NULL); id = aggr_cpu_id__cpu(cpu, /*data=*/NULL);
if (first) { if (first) {
if (prefix) print_metric_begin(config, evlist, prefix, counter_idx);
fputs(prefix, config->output);
aggr_printout(config, counter, id, 0);
first = false; first = false;
} }
val = ps->aggr[counter_idx].counts.val; val = ps->aggr[counter_idx].counts.val;
@ -933,7 +947,7 @@ static void print_no_aggr_metric(struct perf_stat_config *config,
run, ena, 1.0, &rt_stat, counter_idx); run, ena, 1.0, &rt_stat, counter_idx);
} }
if (!first) if (!first)
fputc('\n', config->output); print_metric_end(config);
} }
} }
@ -1322,13 +1336,11 @@ void evlist__print_counters(struct evlist *evlist, struct perf_stat_config *conf
iostat_print_counters(evlist, config, ts, prefix = buf, iostat_print_counters(evlist, config, ts, prefix = buf,
print_counter); print_counter);
else { else {
if (prefix && metric_only) print_metric_begin(config, evlist, prefix, /*aggr_idx=*/0);
fprintf(config->output, "%s", prefix);
evlist__for_each_entry(evlist, counter) { evlist__for_each_entry(evlist, counter) {
print_counter(config, counter, prefix); print_counter(config, counter, prefix);
} }
if (metric_only) print_metric_end(config);
fputc('\n', config->output);
} }
break; break;
case AGGR_NONE: case AGGR_NONE: