Skip to content

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

perf stat: Pass a 'struct perf_stat_config' argument to global print functions 

Add 'struct perf_stat_config' argument to the global print functions, so
that these functions can be used out of the 'perf stat' command code.
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-20-jolsa@kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent f3ca50e6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 131 additions and 106 deletions
tools/perf/builtin-script.c
View file @ 6ca9a082
...@@ -1544,7 +1544,8 @@ struct metric_ctx { ...@@ -1544,7 +1544,8 @@ struct metric_ctx {
FILE *fp; FILE *fp;
}; };
static void script_print_metric(void *ctx, const char *color, static void script_print_metric(struct perf_stat_config *config __maybe_unused,
void *ctx, const char *color,
const char *fmt, const char *fmt,
const char *unit, double val) const char *unit, double val)
{ {
...@@ -1562,7 +1563,8 @@ static void script_print_metric(void *ctx, const char *color, ...@@ -1562,7 +1563,8 @@ static void script_print_metric(void *ctx, const char *color,
fprintf(mctx->fp, " %s\n", unit); fprintf(mctx->fp, " %s\n", unit);
} }
static void script_new_line(void *ctx) static void script_new_line(struct perf_stat_config *config __maybe_unused,
void *ctx)
{ {
struct metric_ctx *mctx = ctx; struct metric_ctx *mctx = ctx;
...@@ -1608,7 +1610,7 @@ static void perf_sample__fprint_metric(struct perf_script *script, ...@@ -1608,7 +1610,7 @@ static void perf_sample__fprint_metric(struct perf_script *script,
evsel_script(evsel)->val = val; evsel_script(evsel)->val = val;
if (evsel_script(evsel->leader)->gnum == evsel->leader->nr_members) { if (evsel_script(evsel->leader)->gnum == evsel->leader->nr_members) {
for_each_group_member (ev2, evsel->leader) { for_each_group_member (ev2, evsel->leader) {
perf_stat__print_shadow_stats(ev2, perf_stat__print_shadow_stats(&stat_config, ev2,
evsel_script(ev2)->val, evsel_script(ev2)->val,
sample->cpu, sample->cpu,
&ctx, &ctx,
......
tools/perf/builtin-stat.c
View file @ 6ca9a082
...@@ -697,11 +697,12 @@ static void print_noise(struct perf_stat_config *config, ...@@ -697,11 +697,12 @@ static void print_noise(struct perf_stat_config *config,
print_noise_pct(config, 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) static void aggr_printout(struct perf_stat_config *config,
struct perf_evsel *evsel, int id, int nr)
{ {
switch (stat_config.aggr_mode) { switch (config->aggr_mode) {
case AGGR_CORE: case AGGR_CORE:
fprintf(stat_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, csv_output ? 0 : -8,
cpu_map__id_to_cpu(id), cpu_map__id_to_cpu(id),
...@@ -711,7 +712,7 @@ static void aggr_printout(struct perf_evsel *evsel, int id, int nr) ...@@ -711,7 +712,7 @@ static void aggr_printout(struct perf_evsel *evsel, int id, int nr)
csv_sep); csv_sep);
break; break;
case AGGR_SOCKET: case AGGR_SOCKET:
fprintf(stat_config.output, "S%*d%s%*d%s", fprintf(config->output, "S%*d%s%*d%s",
csv_output ? 0 : -5, csv_output ? 0 : -5,
id, id,
csv_sep, csv_sep,
...@@ -720,12 +721,12 @@ static void aggr_printout(struct perf_evsel *evsel, int id, int nr) ...@@ -720,12 +721,12 @@ static void aggr_printout(struct perf_evsel *evsel, int id, int nr)
csv_sep); csv_sep);
break; break;
case AGGR_NONE: case AGGR_NONE:
fprintf(stat_config.output, "CPU%*d%s", fprintf(config->output, "CPU%*d%s",
csv_output ? 0 : -4, csv_output ? 0 : -4,
perf_evsel__cpus(evsel)->map[id], csv_sep); perf_evsel__cpus(evsel)->map[id], csv_sep);
break; break;
case AGGR_THREAD: case AGGR_THREAD:
fprintf(stat_config.output, "%*s-%*d%s", fprintf(config->output, "%*s-%*d%s",
csv_output ? 0 : 16, csv_output ? 0 : 16,
thread_map__comm(evsel->threads, id), thread_map__comm(evsel->threads, id),
csv_output ? 0 : -8, csv_output ? 0 : -8,
...@@ -750,24 +751,27 @@ struct outstate { ...@@ -750,24 +751,27 @@ struct outstate {
#define METRIC_LEN 35 #define METRIC_LEN 35
static void new_line_std(void *ctx) static void new_line_std(struct perf_stat_config *config __maybe_unused,
void *ctx)
{ {
struct outstate *os = ctx; struct outstate *os = ctx;
os->newline = true; os->newline = true;
} }
static void do_new_line_std(struct outstate *os) static void do_new_line_std(struct perf_stat_config *config,
struct outstate *os)
{ {
fputc('\n', os->fh); fputc('\n', os->fh);
fputs(os->prefix, os->fh); fputs(os->prefix, os->fh);
aggr_printout(os->evsel, os->id, os->nr); aggr_printout(config, os->evsel, os->id, os->nr);
if (stat_config.aggr_mode == AGGR_NONE) if (config->aggr_mode == AGGR_NONE)
fprintf(os->fh, " "); fprintf(os->fh, " ");
fprintf(os->fh, " "); fprintf(os->fh, " ");
} }
static void print_metric_std(void *ctx, const char *color, const char *fmt, static void print_metric_std(struct perf_stat_config *config,
void *ctx, const char *color, const char *fmt,
const char *unit, double val) const char *unit, double val)
{ {
struct outstate *os = ctx; struct outstate *os = ctx;
...@@ -783,7 +787,7 @@ static void print_metric_std(void *ctx, const char *color, const char *fmt, ...@@ -783,7 +787,7 @@ static void print_metric_std(void *ctx, const char *color, const char *fmt,
} }
if (newline) if (newline)
do_new_line_std(os); do_new_line_std(config, os);
n = fprintf(out, " # "); n = fprintf(out, " # ");
if (color) if (color)
...@@ -793,7 +797,7 @@ static void print_metric_std(void *ctx, const char *color, const char *fmt, ...@@ -793,7 +797,7 @@ static void print_metric_std(void *ctx, const char *color, const char *fmt,
fprintf(out, " %-*s", METRIC_LEN - n - 1, unit); fprintf(out, " %-*s", METRIC_LEN - n - 1, unit);
} }
static void new_line_csv(void *ctx) static void new_line_csv(struct perf_stat_config *config, void *ctx)
{ {
struct outstate *os = ctx; struct outstate *os = ctx;
int i; int i;
...@@ -801,12 +805,13 @@ static void new_line_csv(void *ctx) ...@@ -801,12 +805,13 @@ static void new_line_csv(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, csv_sep);
aggr_printout(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(csv_sep, os->fh);
} }
static void print_metric_csv(void *ctx, static void print_metric_csv(struct perf_stat_config *config __maybe_unused,
void *ctx,
const char *color __maybe_unused, const char *color __maybe_unused,
const char *fmt, const char *unit, double val) const char *fmt, const char *unit, double val)
{ {
...@@ -853,7 +858,8 @@ static const char *fixunit(char *buf, struct perf_evsel *evsel, ...@@ -853,7 +858,8 @@ static const char *fixunit(char *buf, struct perf_evsel *evsel,
return unit; return unit;
} }
static void print_metric_only(void *ctx, const char *color, const char *fmt, static void print_metric_only(struct perf_stat_config *config __maybe_unused,
void *ctx, const char *color, const char *fmt,
const char *unit, double val) const char *unit, double val)
{ {
struct outstate *os = ctx; struct outstate *os = ctx;
...@@ -874,7 +880,8 @@ static void print_metric_only(void *ctx, const char *color, const char *fmt, ...@@ -874,7 +880,8 @@ static void print_metric_only(void *ctx, const char *color, const char *fmt,
fprintf(out, "%*s ", mlen, str); fprintf(out, "%*s ", mlen, str);
} }
static void print_metric_only_csv(void *ctx, const char *color __maybe_unused, static void print_metric_only_csv(struct perf_stat_config *config __maybe_unused,
void *ctx, const char *color __maybe_unused,
const char *fmt, const char *fmt,
const char *unit, double val) const char *unit, double val)
{ {
...@@ -894,11 +901,13 @@ static void print_metric_only_csv(void *ctx, const char *color __maybe_unused, ...@@ -894,11 +901,13 @@ static void print_metric_only_csv(void *ctx, const char *color __maybe_unused,
fprintf(out, "%s%s", vals, csv_sep); fprintf(out, "%s%s", vals, csv_sep);
} }
static void new_line_metric(void *ctx __maybe_unused) static void new_line_metric(struct perf_stat_config *config __maybe_unused,
void *ctx __maybe_unused)
{ {
} }
static void print_metric_header(void *ctx, const char *color __maybe_unused, static void print_metric_header(struct perf_stat_config *config __maybe_unused,
void *ctx, const char *color __maybe_unused,
const char *fmt __maybe_unused, const char *fmt __maybe_unused,
const char *unit, double val __maybe_unused) const char *unit, double val __maybe_unused)
{ {
...@@ -936,9 +945,10 @@ static int first_shadow_cpu(struct perf_evsel *evsel, int id) ...@@ -936,9 +945,10 @@ static int first_shadow_cpu(struct perf_evsel *evsel, int id)
return 0; return 0;
} }
static void abs_printout(int id, int nr, struct perf_evsel *evsel, double avg) static void abs_printout(struct perf_stat_config *config,
int id, int nr, struct perf_evsel *evsel, double avg)
{ {
FILE *output = stat_config.output; FILE *output = config->output;
double sc = evsel->scale; double sc = evsel->scale;
const char *fmt; const char *fmt;
...@@ -951,7 +961,7 @@ static void abs_printout(int id, int nr, struct perf_evsel *evsel, double avg) ...@@ -951,7 +961,7 @@ static void abs_printout(int id, int nr, struct perf_evsel *evsel, double avg)
fmt = floor(sc) != sc ? "%18.2f%s" : "%18.0f%s"; fmt = floor(sc) != sc ? "%18.2f%s" : "%18.0f%s";
} }
aggr_printout(evsel, id, nr); aggr_printout(config, evsel, id, nr);
fprintf(output, fmt, avg, csv_sep); fprintf(output, fmt, avg, csv_sep);
...@@ -1004,7 +1014,7 @@ static void printout(struct perf_stat_config *config, int id, int nr, ...@@ -1004,7 +1014,7 @@ static void printout(struct perf_stat_config *config, int id, int nr,
.evsel = counter, .evsel = counter,
}; };
print_metric_t pm = print_metric_std; print_metric_t pm = print_metric_std;
void (*nl)(void *); new_line_t nl;
if (metric_only) { if (metric_only) {
nl = new_line_metric; nl = new_line_metric;
...@@ -1033,10 +1043,10 @@ static void printout(struct perf_stat_config *config, int id, int nr, ...@@ -1033,10 +1043,10 @@ static void printout(struct perf_stat_config *config, int id, int nr,
} }
if (run == 0 || ena == 0 || counter->counts->scaled == -1) { if (run == 0 || ena == 0 || counter->counts->scaled == -1) {
if (metric_only) { if (metric_only) {
pm(&os, NULL, "", "", 0); pm(config, &os, NULL, "", "", 0);
return; return;
} }
aggr_printout(counter, id, nr); aggr_printout(config, counter, id, nr);
fprintf(config->output, "%*s%s", fprintf(config->output, "%*s%s",
csv_output ? 0 : 18, csv_output ? 0 : 18,
...@@ -1062,16 +1072,16 @@ static void printout(struct perf_stat_config *config, int id, int nr, ...@@ -1062,16 +1072,16 @@ static void printout(struct perf_stat_config *config, int id, int nr,
csv_sep, counter->cgrp->name); csv_sep, counter->cgrp->name);
if (!csv_output) if (!csv_output)
pm(&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 (csv_output)
pm(&os, NULL, NULL, "", 0); pm(config, &os, NULL, NULL, "", 0);
return; return;
} }
if (!metric_only) if (!metric_only)
abs_printout(id, nr, counter, uval); abs_printout(config, id, nr, counter, uval);
out.print_metric = pm; out.print_metric = pm;
out.new_line = nl; out.new_line = nl;
...@@ -1083,7 +1093,7 @@ static void printout(struct perf_stat_config *config, int id, int nr, ...@@ -1083,7 +1093,7 @@ static void printout(struct perf_stat_config *config, int id, int nr,
print_running(config, run, ena); print_running(config, run, ena);
} }
perf_stat__print_shadow_stats(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 (!csv_output && !metric_only) {
...@@ -1255,7 +1265,7 @@ static void print_aggr(struct perf_stat_config *config, ...@@ -1255,7 +1265,7 @@ static void print_aggr(struct perf_stat_config *config,
val = ad.val; val = ad.val;
if (first && metric_only) { if (first && metric_only) {
first = false; first = false;
aggr_printout(counter, id, nr); aggr_printout(config, counter, id, nr);
} }
if (prefix && !metric_only) if (prefix && !metric_only)
fprintf(output, "%s", prefix); fprintf(output, "%s", prefix);
...@@ -1459,7 +1469,7 @@ static void print_no_aggr_metric(struct perf_stat_config *config, ...@@ -1459,7 +1469,7 @@ static void print_no_aggr_metric(struct perf_stat_config *config,
if (is_duration_time(counter)) if (is_duration_time(counter))
continue; continue;
if (first) { if (first) {
aggr_printout(counter, cpu, 0); aggr_printout(config, counter, cpu, 0);
first = false; first = false;
} }
val = perf_counts(counter->counts, cpu, 0)->val; val = perf_counts(counter->counts, cpu, 0)->val;
...@@ -1521,7 +1531,7 @@ static void print_metric_headers(struct perf_stat_config *config, ...@@ -1521,7 +1531,7 @@ static void print_metric_headers(struct perf_stat_config *config,
out.new_line = new_line_metric; out.new_line = new_line_metric;
out.force_header = true; out.force_header = true;
os.evsel = counter; os.evsel = counter;
perf_stat__print_shadow_stats(counter, 0, perf_stat__print_shadow_stats(config, counter, 0,
0, 0,
&out, &out,
&metric_events, &metric_events,
......
tools/perf/util/stat-shadow.c
View file @ 6ca9a082
This diff is collapsed.
tools/perf/util/stat.h
View file @ 6ca9a082
...@@ -135,9 +135,10 @@ bool __perf_evsel_stat__is(struct perf_evsel *evsel, ...@@ -135,9 +135,10 @@ bool __perf_evsel_stat__is(struct perf_evsel *evsel,
extern struct runtime_stat rt_stat; extern struct runtime_stat rt_stat;
extern struct stats walltime_nsecs_stats; extern struct stats walltime_nsecs_stats;
typedef void (*print_metric_t)(void *ctx, const char *color, const char *unit, typedef void (*print_metric_t)(struct perf_stat_config *config,
void *ctx, const char *color, const char *unit,
const char *fmt, double val); const char *fmt, double val);
typedef void (*new_line_t )(void *ctx); typedef void (*new_line_t)(struct perf_stat_config *config, void *ctx);
void runtime_stat__init(struct runtime_stat *st); void runtime_stat__init(struct runtime_stat *st);
void runtime_stat__exit(struct runtime_stat *st); void runtime_stat__exit(struct runtime_stat *st);
...@@ -153,7 +154,8 @@ struct perf_stat_output_ctx { ...@@ -153,7 +154,8 @@ struct perf_stat_output_ctx {
bool force_header; bool force_header;
}; };
void perf_stat__print_shadow_stats(struct perf_evsel *evsel, void perf_stat__print_shadow_stats(struct perf_stat_config *config,
struct perf_evsel *evsel,
double avg, int cpu, double avg, int cpu,
struct perf_stat_output_ctx *out, struct perf_stat_output_ctx *out,
struct rblist *metric_events, struct rblist *metric_events,
......
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