Skip to content

L
linux
Commit f3ca50e6 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files
Options

perf stat: Pass 'struct perf_stat_config' argument to local print functions 

Add 'struct perf_stat_config' argument to print functions, so that those
functions can be moved out of the 'perf stat' command to a generic class
in the following patches.
Signed-off-by: default avatarJiri 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-19-jolsa@kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent b64df7f3
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 69 deletions
tools/perf/builtin-stat.c
View file @ f3ca50e6
......@@ -660,30 +660,33 @@ static int run_perf_stat(int argc, const char **argv, int run_idx)
return ret;
}
static void print_running(u64 run, u64 ena)
static void print_running(struct perf_stat_config *config,
u64 run, u64 ena)
{
if (csv_output) {
fprintf(stat_config.output, "%s%" PRIu64 "%s%.2f",
fprintf(config->output, "%s%" PRIu64 "%s%.2f",
csv_sep,
run,
csv_sep,
ena ? 100.0 * run / ena : 100.0);
} else if (run != ena) {
fprintf(stat_config.output, " (%.2f%%)", 100.0 * run / ena);
fprintf(config->output, " (%.2f%%)", 100.0 * run / ena);
}
}
static void print_noise_pct(double total, double avg)
static void print_noise_pct(struct perf_stat_config *config,
double total, double avg)
{
double pct = rel_stddev_stats(total, avg);
if (csv_output)
fprintf(stat_config.output, "%s%.2f%%", csv_sep, pct);
fprintf(config->output, "%s%.2f%%", csv_sep, pct);
else if (pct)
fprintf(stat_config.output, " ( +-%6.2f%% )", pct);
fprintf(config->output, " ( +-%6.2f%% )", pct);
}
static void print_noise(struct perf_evsel *evsel, double avg)
static void print_noise(struct perf_stat_config *config,
struct perf_evsel *evsel, double avg)
{
struct perf_stat_evsel *ps;
......@@ -691,7 +694,7 @@ static void print_noise(struct perf_evsel *evsel, double avg)
return;
ps = evsel->stats;
print_noise_pct(stddev_stats(&ps->res_stats[0]), avg);
print_noise_pct(config, stddev_stats(&ps->res_stats[0]), avg);
}
static void aggr_printout(struct perf_evsel *evsel, int id, int nr)
......@@ -987,13 +990,14 @@ static bool is_mixed_hw_group(struct perf_evsel *counter)
return false;
}
static void printout(int id, int nr, struct perf_evsel *counter, double uval,
static void printout(struct perf_stat_config *config, int id, int nr,
struct perf_evsel *counter, double uval,
char *prefix, u64 run, u64 ena, double noise,
struct runtime_stat *st)
{
struct perf_stat_output_ctx out;
struct outstate os = {
.fh = stat_config.output,
.fh = config->output,
.prefix = prefix ? prefix : "",
.id = id,
.nr = nr,
......@@ -1023,7 +1027,7 @@ static void printout(int id, int nr, struct perf_evsel *counter, double uval,
pm = print_metric_csv;
nl = new_line_csv;
os.nfields = 3;
os.nfields += aggr_fields[stat_config.aggr_mode];
os.nfields += aggr_fields[config->aggr_mode];
if (counter->cgrp)
os.nfields++;
}
......@@ -1034,7 +1038,7 @@ static void printout(int id, int nr, struct perf_evsel *counter, double uval,
}
aggr_printout(counter, id, nr);
fprintf(stat_config.output, "%*s%s",
fprintf(config->output, "%*s%s",
csv_output ? 0 : 18,
counter->supported ? CNTR_NOT_COUNTED : CNTR_NOT_SUPPORTED,
csv_sep);
......@@ -1045,22 +1049,22 @@ static void printout(int id, int nr, struct perf_evsel *counter, double uval,
print_mixed_hw_group_error = 1;
}
fprintf(stat_config.output, "%-*s%s",
fprintf(config->output, "%-*s%s",
csv_output ? 0 : unit_width,
counter->unit, csv_sep);
fprintf(stat_config.output, "%*s",
fprintf(config->output, "%*s",
csv_output ? 0 : -25,
perf_evsel__name(counter));
if (counter->cgrp)
fprintf(stat_config.output, "%s%s",
fprintf(config->output, "%s%s",
csv_sep, counter->cgrp->name);
if (!csv_output)
pm(&os, NULL, NULL, "", 0);
print_noise(counter, noise);
print_running(run, ena);
print_noise(config, counter, noise);
print_running(config, run, ena);
if (csv_output)
pm(&os, NULL, NULL, "", 0);
return;
......@@ -1075,16 +1079,16 @@ static void printout(int id, int nr, struct perf_evsel *counter, double uval,
out.force_header = false;
if (csv_output && !metric_only) {
print_noise(counter, noise);
print_running(run, ena);
print_noise(config, counter, noise);
print_running(config, run, ena);
}
perf_stat__print_shadow_stats(counter, uval,
first_shadow_cpu(counter, id),
&out, &metric_events, st);
if (!csv_output && !metric_only) {
print_noise(counter, noise);
print_running(run, ena);
print_noise(config, counter, noise);
print_running(config, run, ena);
}
}
......@@ -1211,9 +1215,10 @@ static void aggr_cb(struct perf_evsel *counter, void *data, bool first)
}
}
static void print_aggr(char *prefix)
static void print_aggr(struct perf_stat_config *config,
char *prefix)
{
FILE *output = stat_config.output;
FILE *output = config->output;
struct perf_evsel *counter;
int s, id, nr;
double uval;
......@@ -1256,8 +1261,8 @@ static void print_aggr(char *prefix)
fprintf(output, "%s", prefix);
uval = val * counter->scale;
printout(id, nr, counter, uval, prefix, run, ena, 1.0,
&rt_stat);
printout(config, id, nr, counter, uval, prefix,
run, ena, 1.0, &rt_stat);
if (!metric_only)
fputc('\n', output);
}
......@@ -1320,9 +1325,10 @@ static struct perf_aggr_thread_value *sort_aggr_thread(
return buf;
}
static void print_aggr_thread(struct perf_evsel *counter, char *prefix)
static void print_aggr_thread(struct perf_stat_config *config,
struct perf_evsel *counter, char *prefix)
{
FILE *output = stat_config.output;
FILE *output = config->output;
int nthreads = thread_map__nr(counter->threads);
int ncpus = cpu_map__nr(counter->cpus);
int thread, sorted_threads, id;
......@@ -1339,12 +1345,12 @@ static void print_aggr_thread(struct perf_evsel *counter, char *prefix)
fprintf(output, "%s", prefix);
id = buf[thread].id;
if (stat_config.stats)
printout(id, 0, buf[thread].counter, buf[thread].uval,
if (config->stats)
printout(config, id, 0, buf[thread].counter, buf[thread].uval,
prefix, buf[thread].run, buf[thread].ena, 1.0,
&stat_config.stats[id]);
&config->stats[id]);
else
printout(id, 0, buf[thread].counter, buf[thread].uval,
printout(config, id, 0, buf[thread].counter, buf[thread].uval,
prefix, buf[thread].run, buf[thread].ena, 1.0,
&rt_stat);
fputc('\n', output);
......@@ -1372,9 +1378,10 @@ static void counter_aggr_cb(struct perf_evsel *counter, void *data,
* Print out the results of a single counter:
* aggregated counts in system-wide mode
*/
static void print_counter_aggr(struct perf_evsel *counter, char *prefix)
static void print_counter_aggr(struct perf_stat_config *config,
struct perf_evsel *counter, char *prefix)
{
FILE *output = stat_config.output;
FILE *output = config->output;
double uval;
struct caggr_data cd = { .avg = 0.0 };
......@@ -1385,7 +1392,7 @@ static void print_counter_aggr(struct perf_evsel *counter, char *prefix)
fprintf(output, "%s", prefix);
uval = cd.avg * counter->scale;
printout(-1, 0, counter, uval, prefix, cd.avg_running, cd.avg_enabled,
printout(config, -1, 0, counter, uval, prefix, cd.avg_running, cd.avg_enabled,
cd.avg, &rt_stat);
if (!metric_only)
fprintf(output, "\n");
......@@ -1405,9 +1412,10 @@ static void counter_cb(struct perf_evsel *counter, void *data,
* Print out the results of a single counter:
* does not use aggregated count in system-wide
*/
static void print_counter(struct perf_evsel *counter, char *prefix)
static void print_counter(struct perf_stat_config *config,
struct perf_evsel *counter, char *prefix)
{
FILE *output = stat_config.output;
FILE *output = config->output;
u64 ena, run, val;
double uval;
int cpu;
......@@ -1425,14 +1433,15 @@ static void print_counter(struct perf_evsel *counter, char *prefix)
fprintf(output, "%s", prefix);
uval = val * counter->scale;
printout(cpu, 0, counter, uval, prefix, run, ena, 1.0,
printout(config, cpu, 0, counter, uval, prefix, run, ena, 1.0,
&rt_stat);
fputc('\n', output);
}
}
static void print_no_aggr_metric(char *prefix)
static void print_no_aggr_metric(struct perf_stat_config *config,
char *prefix)
{
int cpu;
int nrcpus = 0;
......@@ -1445,7 +1454,7 @@ static void print_no_aggr_metric(char *prefix)
bool first = true;
if (prefix)
fputs(prefix, stat_config.output);
fputs(prefix, config->output);
evlist__for_each_entry(evsel_list, counter) {
if (is_duration_time(counter))
continue;
......@@ -1458,10 +1467,10 @@ static void print_no_aggr_metric(char *prefix)
run = perf_counts(counter->counts, cpu, 0)->run;
uval = val * counter->scale;
printout(cpu, 0, counter, uval, prefix, run, ena, 1.0,
printout(config, cpu, 0, counter, uval, prefix, run, ena, 1.0,
&rt_stat);
}
fputc('\n', stat_config.output);
fputc('\n', config->output);
}
}
......@@ -1481,25 +1490,25 @@ static const char *aggr_header_csv[] = {
[AGGR_GLOBAL] = ""
};
static void print_metric_headers(const char *prefix, bool no_indent)
static void print_metric_headers(struct perf_stat_config *config,
const char *prefix, bool no_indent)
{
struct perf_stat_output_ctx out;
struct perf_evsel *counter;
struct outstate os = {
.fh = stat_config.output
.fh = config->output
};
if (prefix)
fprintf(stat_config.output, "%s", prefix);
fprintf(config->output, "%s", prefix);
if (!csv_output && !no_indent)
fprintf(stat_config.output, "%*s",
aggr_header_lens[stat_config.aggr_mode], "");
fprintf(config->output, "%*s",
aggr_header_lens[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);
if (config->interval)
fputs("time,", config->output);
fputs(aggr_header_csv[config->aggr_mode], config->output);
}
/* Print metrics headers only */
......@@ -1518,12 +1527,13 @@ static void print_metric_headers(const char *prefix, bool no_indent)
&metric_events,
&rt_stat);
}
fputc('\n', stat_config.output);
fputc('\n', config->output);
}
static void print_interval(char *prefix, struct timespec *ts)
static void print_interval(struct perf_stat_config *config,
char *prefix, struct timespec *ts)
{
FILE *output = stat_config.output;
FILE *output = config->output;
static int num_print_interval;
if (interval_clear)
......@@ -1532,7 +1542,7 @@ static void print_interval(char *prefix, struct timespec *ts)
sprintf(prefix, "%6lu.%09lu%s", ts->tv_sec, ts->tv_nsec, csv_sep);
if ((num_print_interval == 0 && !csv_output) || interval_clear) {
switch (stat_config.aggr_mode) {
switch (config->aggr_mode) {
case AGGR_SOCKET:
fprintf(output, "# time socket cpus");
if (!metric_only)
......@@ -1564,14 +1574,15 @@ static void print_interval(char *prefix, struct timespec *ts)
}
if ((num_print_interval == 0 || interval_clear) && metric_only)
print_metric_headers(" ", true);
print_metric_headers(config, " ", true);
if (++num_print_interval == 25)
num_print_interval = 0;
}
static void print_header(int argc, const char **argv)
static void print_header(struct perf_stat_config *config,
int argc, const char **argv)
{
FILE *output = stat_config.output;
FILE *output = config->output;
int i;
fflush(stdout);
......@@ -1639,10 +1650,10 @@ static double timeval2double(struct timeval *t)
return t->tv_sec + (double) t->tv_usec/USEC_PER_SEC;
}
static void print_footer(void)
static void print_footer(struct perf_stat_config *config)
{
double avg = avg_stats(&walltime_nsecs_stats) / NSEC_PER_SEC;
FILE *output = stat_config.output;
FILE *output = config->output;
int n;
if (!null_run)
......@@ -1673,7 +1684,7 @@ static void print_footer(void)
fprintf(output, " %17.*f +- %.*f seconds time elapsed",
precision, avg, precision, sd);
print_noise_pct(sd, avg);
print_noise_pct(config, sd, avg);
}
fprintf(output, "\n\n");
......@@ -1703,15 +1714,15 @@ perf_evlist__print_counters(struct perf_evlist *evlist,
char buf[64], *prefix = NULL;
if (interval)
print_interval(prefix = buf, ts);
print_interval(config, prefix = buf, ts);
else
print_header(argc, argv);
print_header(config, argc, argv);
if (metric_only) {
static int num_print_iv;
if (num_print_iv == 0 && !interval)
print_metric_headers(prefix, false);
print_metric_headers(config, prefix, false);
if (num_print_iv++ == 25)
num_print_iv = 0;
if (config->aggr_mode == AGGR_GLOBAL && prefix)
......@@ -1721,32 +1732,32 @@ perf_evlist__print_counters(struct perf_evlist *evlist,
switch (config->aggr_mode) {
case AGGR_CORE:
case AGGR_SOCKET:
print_aggr(prefix);
print_aggr(config, prefix);
break;
case AGGR_THREAD:
evlist__for_each_entry(evlist, counter) {
if (is_duration_time(counter))
continue;
print_aggr_thread(counter, prefix);
print_aggr_thread(config, counter, prefix);
}
break;
case AGGR_GLOBAL:
evlist__for_each_entry(evlist, counter) {
if (is_duration_time(counter))
continue;
print_counter_aggr(counter, prefix);
print_counter_aggr(config, counter, prefix);
}
if (metric_only)
fputc('\n', config->output);
break;
case AGGR_NONE:
if (metric_only)
print_no_aggr_metric(prefix);
print_no_aggr_metric(config, prefix);
else {
evlist__for_each_entry(evlist, counter) {
if (is_duration_time(counter))
continue;
print_counter(counter, prefix);
print_counter(config, counter, prefix);
}
}
break;
......@@ -1756,7 +1767,7 @@ perf_evlist__print_counters(struct perf_evlist *evlist,
}
if (!interval && !csv_output)
print_footer();
print_footer(config);
fflush(config->output);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7