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

perf stat: Add 'struct perf_stat_config' argument to perf_evlist__print_counters()

Browse Source 
Add a 'struct perf_stat_config' argument to perf_evlist__print_counters(),
so that it can be moved out of the 'perf stat' command to generic object
in the following patches.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20180830063252.23729-18-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa 2018-08-30 08:32:26 +02:00 committed by Arnaldo Carvalho de Melo
parent 0174820a8b
commit b64df7f337
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/perf/builtin-stat.c
View File

@ -1694,10 +1694,11 @@ static void print_footer(void)
static void static void
perf_evlist__print_counters(struct perf_evlist *evlist, perf_evlist__print_counters(struct perf_evlist *evlist,
struct perf_stat_config *config,
struct timespec *ts, struct timespec *ts,
int argc, const char **argv) int argc, const char **argv)
{ {
int interval = stat_config.interval; int interval = config->interval;
struct perf_evsel *counter; struct perf_evsel *counter;
char buf[64], *prefix = NULL; char buf[64], *prefix = NULL;
@ -1713,11 +1714,11 @@ perf_evlist__print_counters(struct perf_evlist *evlist,
print_metric_headers(prefix, false); print_metric_headers(prefix, false);
if (num_print_iv++ == 25) if (num_print_iv++ == 25)
num_print_iv = 0; num_print_iv = 0;
if (stat_config.aggr_mode == AGGR_GLOBAL && prefix) if (config->aggr_mode == AGGR_GLOBAL && prefix)
fprintf(stat_config.output, "%s", prefix); fprintf(config->output, "%s", prefix);
} }
switch (stat_config.aggr_mode) { switch (config->aggr_mode) {
case AGGR_CORE: case AGGR_CORE:
case AGGR_SOCKET: case AGGR_SOCKET:
print_aggr(prefix); print_aggr(prefix);
@ -1736,7 +1737,7 @@ perf_evlist__print_counters(struct perf_evlist *evlist,
print_counter_aggr(counter, prefix); print_counter_aggr(counter, prefix);
} }
if (metric_only) if (metric_only)
fputc('\n', stat_config.output); fputc('\n', config->output);
break; break;
case AGGR_NONE: case AGGR_NONE:
if (metric_only) if (metric_only)
@ -1757,7 +1758,7 @@ perf_evlist__print_counters(struct perf_evlist *evlist,
if (!interval && !csv_output) if (!interval && !csv_output)
print_footer(); print_footer();
fflush(stat_config.output); fflush(config->output);
} }
static void print_counters(struct timespec *ts, int argc, const char **argv) static void print_counters(struct timespec *ts, int argc, const char **argv)
@ -1766,7 +1767,8 @@ static void print_counters(struct timespec *ts, int argc, const char **argv)
if (STAT_RECORD && perf_stat.data.is_pipe) if (STAT_RECORD && perf_stat.data.is_pipe)
return; return;
perf_evlist__print_counters(evsel_list, ts, argc, argv); perf_evlist__print_counters(evsel_list, &stat_config,
ts, argc, argv);
} }
static volatile int signr = -1; static volatile int signr = -1;