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

perf stat: Allow to specify specific metric column len

Browse Source 
The following change will introduce new metrics, that doesn't need such
wide hard coded spacing. Switch METRIC_ONLY_LEN macro usage with
metric_only_len variable.

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: Frederic Weisbecker <frederic@kernel.org>
Cc: Milian Wolff <milian.wolff@kdab.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/20180606221513.11302-7-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa 2018-06-07 00:15:09 +02:00 committed by Arnaldo Carvalho de Melo
parent f515572734
commit c1a1f5d9da
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,6 +145,8 @@ static struct target target = {
typedef int (*aggr_get_id_t)(struct cpu_map *m, int cpu); typedef int (*aggr_get_id_t)(struct cpu_map *m, int cpu);
#define METRIC_ONLY_LEN 20
static int run_count = 1; static int run_count = 1;
static bool no_inherit = false; static bool no_inherit = false;
static volatile pid_t child_pid = -1; static volatile pid_t child_pid = -1;
@ -182,6 +184,7 @@ static int print_mixed_hw_group_error;
static u64 *walltime_run; static u64 *walltime_run;
static bool ru_display = false; static bool ru_display = false;
static struct rusage ru_data; static struct rusage ru_data;
static unsigned int metric_only_len = METRIC_ONLY_LEN;
struct perf_stat { struct perf_stat {
bool record; bool record;
@ -969,8 +972,6 @@ static void print_metric_csv(void *ctx,
fprintf(out, "%s%s%s%s", csv_sep, vals, csv_sep, unit); fprintf(out, "%s%s%s%s", csv_sep, vals, csv_sep, unit);
} }
#define METRIC_ONLY_LEN 20
/* 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 */
static bool valid_only_metric(const char *unit) static bool valid_only_metric(const char *unit)
@ -1002,7 +1003,7 @@ static void print_metric_only(void *ctx, const char *color, const char *fmt,
struct outstate *os = ctx; struct outstate *os = ctx;
FILE *out = os->fh; FILE *out = os->fh;
char buf[1024], str[1024]; char buf[1024], str[1024];
unsigned mlen = METRIC_ONLY_LEN; unsigned mlen = metric_only_len;
if (!valid_only_metric(unit)) if (!valid_only_metric(unit))
return; return;
@ -1054,7 +1055,7 @@ static void print_metric_header(void *ctx, const char *color __maybe_unused,
if (csv_output) if (csv_output)
fprintf(os->fh, "%s%s", unit, csv_sep); fprintf(os->fh, "%s%s", unit, csv_sep);
else else
fprintf(os->fh, "%*s ", METRIC_ONLY_LEN, unit); fprintf(os->fh, "%*s ", metric_only_len, unit);
} }
static void nsec_printout(int id, int nr, struct perf_evsel *evsel, double avg) static void nsec_printout(int id, int nr, struct perf_evsel *evsel, double avg)