mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-03 23:58:05 +00:00
Code Issues Releases Wiki Activity

perf stat: Move csv_* to 'struct perf_stat_config'

Browse source 
Move the static csv_* variables to 'struct perf_stat_config', so that it
can be passed around and used outside the 'perf stat' command.

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-21-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:29 +02:00 committed by Arnaldo Carvalho de Melo
parent 6ca9a082b1
commit fa7070a386
2 changed files with 58 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

114
tools/perf/builtin-stat.c
View file

@ -157,8 +157,6 @@ static bool smi_cost = false;
static bool smi_reset = false; static bool smi_reset = false;
static bool big_num = true; static bool big_num = true;
static int big_num_opt = -1; static int big_num_opt = -1;
static const char *csv_sep = NULL;
static bool csv_output = false;
static bool group = false; static bool group = false;
static const char *pre_cmd = NULL; static const char *pre_cmd = NULL;
static const char *post_cmd = NULL; static const char *post_cmd = NULL;
@ -663,11 +661,11 @@ static int run_perf_stat(int argc, const char **argv, int run_idx)
static void print_running(struct perf_stat_config *config, static void print_running(struct perf_stat_config *config,
u64 run, u64 ena) u64 run, u64 ena)
{ {
if (csv_output) { if (config->csv_output) {
fprintf(config->output, "%s%" PRIu64 "%s%.2f", fprintf(config->output, "%s%" PRIu64 "%s%.2f",
csv_sep, config->csv_sep,
run, run,
csv_sep, config->csv_sep,
ena ? 100.0 * run / ena : 100.0); ena ? 100.0 * run / ena : 100.0);
} else if (run != ena) { } else if (run != ena) {
fprintf(config->output, " (%.2f%%)", 100.0 * run / ena); fprintf(config->output, " (%.2f%%)", 100.0 * run / ena);
@ -679,8 +677,8 @@ static void print_noise_pct(struct perf_stat_config *config,
{ {
double pct = rel_stddev_stats(total, avg); double pct = rel_stddev_stats(total, avg);
if (csv_output) if (config->csv_output)
fprintf(config->output, "%s%.2f%%", csv_sep, pct); fprintf(config->output, "%s%.2f%%", config->csv_sep, pct);
else if (pct) else if (pct)
fprintf(config->output, " ( +-%6.2f%% )", pct); fprintf(config->output, " ( +-%6.2f%% )", pct);
} }
@ -704,34 +702,34 @@ static void aggr_printout(struct perf_stat_config *config,
case AGGR_CORE: case AGGR_CORE:
fprintf(config->output, "S%d-C%*d%s%*d%s", fprintf(config->output, "S%d-C%*d%s%*d%s",
cpu_map__id_to_socket(id), cpu_map__id_to_socket(id),
csv_output ? 0 : -8, config->csv_output ? 0 : -8,
cpu_map__id_to_cpu(id), cpu_map__id_to_cpu(id),
csv_sep, config->csv_sep,
csv_output ? 0 : 4, config->csv_output ? 0 : 4,
nr, nr,
csv_sep); config->csv_sep);
break; break;
case AGGR_SOCKET: case AGGR_SOCKET:
fprintf(config->output, "S%*d%s%*d%s", fprintf(config->output, "S%*d%s%*d%s",
csv_output ? 0 : -5, config->csv_output ? 0 : -5,
id, id,
csv_sep, config->csv_sep,
csv_output ? 0 : 4, config->csv_output ? 0 : 4,
nr, nr,
csv_sep); config->csv_sep);
break; break;
case AGGR_NONE: case AGGR_NONE:
fprintf(config->output, "CPU%*d%s", fprintf(config->output, "CPU%*d%s",
csv_output ? 0 : -4, config->csv_output ? 0 : -4,
perf_evsel__cpus(evsel)->map[id], csv_sep); perf_evsel__cpus(evsel)->map[id], config->csv_sep);
break; break;
case AGGR_THREAD: case AGGR_THREAD:
fprintf(config->output, "%*s-%*d%s", fprintf(config->output, "%*s-%*d%s",
csv_output ? 0 : 16, config->csv_output ? 0 : 16,
thread_map__comm(evsel->threads, id), thread_map__comm(evsel->threads, id),
csv_output ? 0 : -8, config->csv_output ? 0 : -8,
thread_map__pid(evsel->threads, id), thread_map__pid(evsel->threads, id),
csv_sep); config->csv_sep);
break; break;
case AGGR_GLOBAL: case AGGR_GLOBAL:
case AGGR_UNSET: case AGGR_UNSET:
@ -804,10 +802,10 @@ static void new_line_csv(struct perf_stat_config *config, void *ctx)
fputc('\n', os->fh); fputc('\n', os->fh);
if (os->prefix) if (os->prefix)
fprintf(os->fh, "%s%s", os->prefix, csv_sep); fprintf(os->fh, "%s%s", os->prefix, config->csv_sep);
aggr_printout(config, os->evsel, os->id, os->nr); aggr_printout(config, os->evsel, os->id, os->nr);
for (i = 0; i < os->nfields; i++) for (i = 0; i < os->nfields; i++)
fputs(csv_sep, os->fh); fputs(config->csv_sep, os->fh);
} }
static void print_metric_csv(struct perf_stat_config *config __maybe_unused, static void print_metric_csv(struct perf_stat_config *config __maybe_unused,
@ -820,7 +818,7 @@ static void print_metric_csv(struct perf_stat_config *config __maybe_unused,
char buf[64], *vals, *ends; char buf[64], *vals, *ends;
if (unit == NULL || fmt == NULL) { if (unit == NULL || fmt == NULL) {
fprintf(out, "%s%s", csv_sep, csv_sep); fprintf(out, "%s%s", config->csv_sep, config->csv_sep);
return; return;
} }
snprintf(buf, sizeof(buf), fmt, val); snprintf(buf, sizeof(buf), fmt, val);
@ -830,7 +828,7 @@ static void print_metric_csv(struct perf_stat_config *config __maybe_unused,
*ends = 0; *ends = 0;
while (isspace(*unit)) while (isspace(*unit))
unit++; unit++;
fprintf(out, "%s%s%s%s", csv_sep, vals, csv_sep, unit); fprintf(out, "%s%s%s%s", config->csv_sep, vals, config->csv_sep, unit);
} }
/* Filter out some columns that don't work well in metrics only mode */ /* Filter out some columns that don't work well in metrics only mode */
@ -898,7 +896,7 @@ static void print_metric_only_csv(struct perf_stat_config *config __maybe_unused
while (isdigit(*ends) || *ends == '.') while (isdigit(*ends) || *ends == '.')
ends++; ends++;
*ends = 0; *ends = 0;
fprintf(out, "%s%s", vals, csv_sep); fprintf(out, "%s%s", vals, config->csv_sep);
} }
static void new_line_metric(struct perf_stat_config *config __maybe_unused, static void new_line_metric(struct perf_stat_config *config __maybe_unused,
@ -917,8 +915,8 @@ static void print_metric_header(struct perf_stat_config *config __maybe_unused,
if (!valid_only_metric(unit)) if (!valid_only_metric(unit))
return; return;
unit = fixunit(tbuf, os->evsel, unit); unit = fixunit(tbuf, os->evsel, unit);
if (csv_output) if (config->csv_output)
fprintf(os->fh, "%s%s", unit, csv_sep); fprintf(os->fh, "%s%s", unit, config->csv_sep);
else else
fprintf(os->fh, "%*s ", metric_only_len, unit); fprintf(os->fh, "%*s ", metric_only_len, unit);
} }
@ -952,7 +950,7 @@ static void abs_printout(struct perf_stat_config *config,
double sc = evsel->scale; double sc = evsel->scale;
const char *fmt; const char *fmt;
if (csv_output) { if (config->csv_output) {
fmt = floor(sc) != sc ? "%.2f%s" : "%.0f%s"; fmt = floor(sc) != sc ? "%.2f%s" : "%.0f%s";
} else { } else {
if (big_num) if (big_num)
@ -963,17 +961,17 @@ static void abs_printout(struct perf_stat_config *config,
aggr_printout(config, evsel, id, nr); aggr_printout(config, evsel, id, nr);
fprintf(output, fmt, avg, csv_sep); fprintf(output, fmt, avg, config->csv_sep);
if (evsel->unit) if (evsel->unit)
fprintf(output, "%-*s%s", fprintf(output, "%-*s%s",
csv_output ? 0 : unit_width, config->csv_output ? 0 : unit_width,
evsel->unit, csv_sep); evsel->unit, config->csv_sep);
fprintf(output, "%-*s", csv_output ? 0 : 25, perf_evsel__name(evsel)); fprintf(output, "%-*s", config->csv_output ? 0 : 25, perf_evsel__name(evsel));
if (evsel->cgrp) if (evsel->cgrp)
fprintf(output, "%s%s", csv_sep, evsel->cgrp->name); fprintf(output, "%s%s", config->csv_sep, evsel->cgrp->name);
} }
static bool is_mixed_hw_group(struct perf_evsel *counter) static bool is_mixed_hw_group(struct perf_evsel *counter)
@ -1018,14 +1016,14 @@ static void printout(struct perf_stat_config *config, int id, int nr,
if (metric_only) { if (metric_only) {
nl = new_line_metric; nl = new_line_metric;
if (csv_output) if (config->csv_output)
pm = print_metric_only_csv; pm = print_metric_only_csv;
else else
pm = print_metric_only; pm = print_metric_only;
} else } else
nl = new_line_std; nl = new_line_std;
if (csv_output && !metric_only) { if (config->csv_output && !metric_only) {
static int aggr_fields[] = { static int aggr_fields[] = {
[AGGR_GLOBAL] = 0, [AGGR_GLOBAL] = 0,
[AGGR_THREAD] = 1, [AGGR_THREAD] = 1,
@ -1049,9 +1047,9 @@ static void printout(struct perf_stat_config *config, int id, int nr,
aggr_printout(config, counter, id, nr); aggr_printout(config, counter, id, nr);
fprintf(config->output, "%*s%s", fprintf(config->output, "%*s%s",
csv_output ? 0 : 18, config->csv_output ? 0 : 18,
counter->supported ? CNTR_NOT_COUNTED : CNTR_NOT_SUPPORTED, counter->supported ? CNTR_NOT_COUNTED : CNTR_NOT_SUPPORTED,
csv_sep); config->csv_sep);
if (counter->supported) { if (counter->supported) {
print_free_counters_hint = 1; print_free_counters_hint = 1;
@ -1060,22 +1058,22 @@ static void printout(struct perf_stat_config *config, int id, int nr,
} }
fprintf(config->output, "%-*s%s", fprintf(config->output, "%-*s%s",
csv_output ? 0 : unit_width, config->csv_output ? 0 : unit_width,
counter->unit, csv_sep); counter->unit, config->csv_sep);
fprintf(config->output, "%*s", fprintf(config->output, "%*s",
csv_output ? 0 : -25, config->csv_output ? 0 : -25,
perf_evsel__name(counter)); perf_evsel__name(counter));
if (counter->cgrp) if (counter->cgrp)
fprintf(config->output, "%s%s", fprintf(config->output, "%s%s",
csv_sep, counter->cgrp->name); config->csv_sep, counter->cgrp->name);
if (!csv_output) if (!config->csv_output)
pm(config, &os, NULL, NULL, "", 0); pm(config, &os, NULL, NULL, "", 0);
print_noise(config, counter, noise); print_noise(config, counter, noise);
print_running(config, run, ena); print_running(config, run, ena);
if (csv_output) if (config->csv_output)
pm(config, &os, NULL, NULL, "", 0); pm(config, &os, NULL, NULL, "", 0);
return; return;
} }
@ -1088,7 +1086,7 @@ static void printout(struct perf_stat_config *config, int id, int nr,
out.ctx = &os; out.ctx = &os;
out.force_header = false; out.force_header = false;
if (csv_output && !metric_only) { if (config->csv_output && !metric_only) {
print_noise(config, counter, noise); print_noise(config, counter, noise);
print_running(config, run, ena); print_running(config, run, ena);
} }
@ -1096,7 +1094,7 @@ static void printout(struct perf_stat_config *config, int id, int nr,
perf_stat__print_shadow_stats(config, counter, uval, perf_stat__print_shadow_stats(config, counter, uval,
first_shadow_cpu(counter, id), first_shadow_cpu(counter, id),
&out, &metric_events, st); &out, &metric_events, st);
if (!csv_output && !metric_only) { if (!config->csv_output && !metric_only) {
print_noise(config, counter, noise); print_noise(config, counter, noise);
print_running(config, run, ena); print_running(config, run, ena);
} }
@ -1512,10 +1510,10 @@ static void print_metric_headers(struct perf_stat_config *config,
if (prefix) if (prefix)
fprintf(config->output, "%s", prefix); fprintf(config->output, "%s", prefix);
if (!csv_output && !no_indent) if (!config->csv_output && !no_indent)
fprintf(config->output, "%*s", fprintf(config->output, "%*s",
aggr_header_lens[config->aggr_mode], ""); aggr_header_lens[config->aggr_mode], "");
if (csv_output) { if (config->csv_output) {
if (config->interval) if (config->interval)
fputs("time,", config->output); fputs("time,", config->output);
fputs(aggr_header_csv[config->aggr_mode], config->output); fputs(aggr_header_csv[config->aggr_mode], config->output);
@ -1549,9 +1547,9 @@ static void print_interval(struct perf_stat_config *config,
if (interval_clear) if (interval_clear)
puts(CONSOLE_CLEAR); puts(CONSOLE_CLEAR);
sprintf(prefix, "%6lu.%09lu%s", ts->tv_sec, ts->tv_nsec, csv_sep); sprintf(prefix, "%6lu.%09lu%s", ts->tv_sec, ts->tv_nsec, config->csv_sep);
if ((num_print_interval == 0 && !csv_output) || interval_clear) { if ((num_print_interval == 0 && !config->csv_output) || interval_clear) {
switch (config->aggr_mode) { switch (config->aggr_mode) {
case AGGR_SOCKET: case AGGR_SOCKET:
fprintf(output, "# time socket cpus"); fprintf(output, "# time socket cpus");
@ -1597,7 +1595,7 @@ static void print_header(struct perf_stat_config *config,
fflush(stdout); fflush(stdout);
if (!csv_output) { if (!config->csv_output) {
fprintf(output, "\n"); fprintf(output, "\n");
fprintf(output, " Performance counter stats for "); fprintf(output, " Performance counter stats for ");
if (target.system_wide) if (target.system_wide)
@ -1776,7 +1774,7 @@ perf_evlist__print_counters(struct perf_evlist *evlist,
break; break;
} }
if (!interval && !csv_output) if (!interval && !config->csv_output)
print_footer(config); print_footer(config);
fflush(config->output); fflush(config->output);
@ -1896,7 +1894,7 @@ static const struct option stat_options[] = {
OPT_SET_UINT('A', "no-aggr", &stat_config.aggr_mode, OPT_SET_UINT('A', "no-aggr", &stat_config.aggr_mode,
"disable CPU count aggregation", AGGR_NONE), "disable CPU count aggregation", AGGR_NONE),
OPT_BOOLEAN(0, "no-merge", &no_merge, "Do not merge identical named events"), OPT_BOOLEAN(0, "no-merge", &no_merge, "Do not merge identical named events"),
OPT_STRING('x', "field-separator", &csv_sep, "separator", OPT_STRING('x', "field-separator", &stat_config.csv_sep, "separator",
"print counts with custom separator"), "print counts with custom separator"),
OPT_CALLBACK('G', "cgroup", &evsel_list, "name", OPT_CALLBACK('G', "cgroup", &evsel_list, "name",
"monitor event in cgroup name only", parse_cgroups), "monitor event in cgroup name only", parse_cgroups),
@ -2749,12 +2747,12 @@ int cmd_stat(int argc, const char **argv)
perf_stat__collect_metric_expr(evsel_list); perf_stat__collect_metric_expr(evsel_list);
perf_stat__init_shadow_stats(); perf_stat__init_shadow_stats();
if (csv_sep) { if (stat_config.csv_sep) {
csv_output = true; stat_config.csv_output = true;
if (!strcmp(csv_sep, "\\t")) if (!strcmp(stat_config.csv_sep, "\\t"))
csv_sep = "\t"; stat_config.csv_sep = "\t";
} else } else
csv_sep = DEFAULT_SEPARATOR; stat_config.csv_sep = DEFAULT_SEPARATOR;
if (argc && !strncmp(argv[0], "rec", 3)) { if (argc && !strncmp(argv[0], "rec", 3)) {
argc = __cmd_record(argc, argv); argc = __cmd_record(argc, argv);
@ -2827,7 +2825,7 @@ int cmd_stat(int argc, const char **argv)
/* /*
* let the spreadsheet do the pretty-printing * let the spreadsheet do the pretty-printing
*/ */
if (csv_output) { if (stat_config.csv_output) {
/* User explicitly passed -B? */ /* User explicitly passed -B? */
if (big_num_opt == 1) { if (big_num_opt == 1) {
fprintf(stderr, "-B option not supported with -x\n"); fprintf(stderr, "-B option not supported with -x\n");

2
tools/perf/util/stat.h
View file

@ -91,6 +91,7 @@ struct perf_stat_config {
bool scale; bool scale;
bool no_inherit; bool no_inherit;
bool identifier; bool identifier;
bool csv_output;
FILE *output; FILE *output;
unsigned int interval; unsigned int interval;
unsigned int timeout; unsigned int timeout;
@ -98,6 +99,7 @@ struct perf_stat_config {
int times; int times;
struct runtime_stat *stats; struct runtime_stat *stats;
int stats_num; int stats_num;
const char *csv_sep;
}; };
void update_stats(struct stats *stats, u64 val); void update_stats(struct stats *stats, u64 val);