Commit 34ff0866 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo

perf stat: Move 'big_num' data to 'struct perf_stat_config'

Move the static variable 'big_num' to 'struct perf_stat_config', so that
it can be passed around and used outside 'perf stat' command.
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-39-jolsa@kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent a138af66
...@@ -151,7 +151,6 @@ static bool transaction_run; ...@@ -151,7 +151,6 @@ static bool transaction_run;
static bool topdown_run = false; static bool topdown_run = false;
static bool smi_cost = false; static bool smi_cost = false;
static bool smi_reset = false; static bool smi_reset = false;
static bool big_num = true;
static int big_num_opt = -1; static int big_num_opt = -1;
static bool group = false; static bool group = false;
static const char *pre_cmd = NULL; static const char *pre_cmd = NULL;
...@@ -192,6 +191,7 @@ static struct perf_stat_config stat_config = { ...@@ -192,6 +191,7 @@ static struct perf_stat_config stat_config = {
.run_count = 1, .run_count = 1,
.metric_only_len = METRIC_ONLY_LEN, .metric_only_len = METRIC_ONLY_LEN,
.walltime_nsecs_stats = &walltime_nsecs_stats, .walltime_nsecs_stats = &walltime_nsecs_stats,
.big_num = true,
}; };
static bool is_duration_time(struct perf_evsel *evsel) static bool is_duration_time(struct perf_evsel *evsel)
...@@ -945,7 +945,7 @@ static void abs_printout(struct perf_stat_config *config, ...@@ -945,7 +945,7 @@ static void abs_printout(struct perf_stat_config *config,
if (config->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 (config->big_num)
fmt = floor(sc) != sc ? "%'18.2f%s" : "%'18.0f%s"; fmt = floor(sc) != sc ? "%'18.2f%s" : "%'18.0f%s";
else else
fmt = floor(sc) != sc ? "%18.2f%s" : "%18.0f%s"; fmt = floor(sc) != sc ? "%18.2f%s" : "%18.0f%s";
...@@ -2847,9 +2847,9 @@ int cmd_stat(int argc, const char **argv) ...@@ -2847,9 +2847,9 @@ int cmd_stat(int argc, const char **argv)
parse_options_usage(NULL, stat_options, "x", 1); parse_options_usage(NULL, stat_options, "x", 1);
goto out; goto out;
} else /* Nope, so disable big number formatting */ } else /* Nope, so disable big number formatting */
big_num = false; stat_config.big_num = false;
} else if (big_num_opt == 0) /* User passed --no-big-num */ } else if (big_num_opt == 0) /* User passed --no-big-num */
big_num = false; stat_config.big_num = false;
setup_system_wide(argc); setup_system_wide(argc);
......
...@@ -103,6 +103,7 @@ struct perf_stat_config { ...@@ -103,6 +103,7 @@ struct perf_stat_config {
bool metric_only; bool metric_only;
bool null_run; bool null_run;
bool ru_display; bool ru_display;
bool big_num;
FILE *output; FILE *output;
unsigned int interval; unsigned int interval;
unsigned int timeout; unsigned int timeout;
......
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