perf stat: Make stat options global

So they can be used in perf stat record command in following patch.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Kan Liang <kan.liang@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1446734469-11352-2-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index b74ee0f2e714a837b590616183d29c4d83cc8920..e77880b5094ded75ac4975d4212f9e35bb9cfa2f 100644 (file)
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -122,6 +122,9 @@ static bool                 forever                         = false;
 static struct timespec         ref_time;
 static struct cpu_map          *aggr_map;
 static aggr_get_id_t           aggr_get_id;
+static bool                    append_file;
+static const char              *output_name;
+static int                     output_fd;
 
 static volatile int done = 0;
 
@@ -927,6 +930,67 @@ static int stat__set_big_num(const struct option *opt __maybe_unused,
        return 0;
 }
 
+static const struct option stat_options[] = {
+       OPT_BOOLEAN('T', "transaction", &transaction_run,
+                   "hardware transaction statistics"),
+       OPT_CALLBACK('e', "event", &evsel_list, "event",
+                    "event selector. use 'perf list' to list available events",
+                    parse_events_option),
+       OPT_CALLBACK(0, "filter", &evsel_list, "filter",
+                    "event filter", parse_filter),
+       OPT_BOOLEAN('i', "no-inherit", &no_inherit,
+                   "child tasks do not inherit counters"),
+       OPT_STRING('p', "pid", &target.pid, "pid",
+                  "stat events on existing process id"),
+       OPT_STRING('t', "tid", &target.tid, "tid",
+                  "stat events on existing thread id"),
+       OPT_BOOLEAN('a', "all-cpus", &target.system_wide,
+                   "system-wide collection from all CPUs"),
+       OPT_BOOLEAN('g', "group", &group,
+                   "put the counters into a counter group"),
+       OPT_BOOLEAN('c', "scale", &stat_config.scale, "scale/normalize counters"),
+       OPT_INCR('v', "verbose", &verbose,
+                   "be more verbose (show counter open errors, etc)"),
+       OPT_INTEGER('r', "repeat", &run_count,
+                   "repeat command and print average + stddev (max: 100, forever: 0)"),
+       OPT_BOOLEAN('n', "null", &null_run,
+                   "null run - dont start any counters"),
+       OPT_INCR('d', "detailed", &detailed_run,
+                   "detailed run - start a lot of events"),
+       OPT_BOOLEAN('S', "sync", &sync_run,
+                   "call sync() before starting a run"),
+       OPT_CALLBACK_NOOPT('B', "big-num", NULL, NULL,
+                          "print large numbers with thousands\' separators",
+                          stat__set_big_num),
+       OPT_STRING('C', "cpu", &target.cpu_list, "cpu",
+                   "list of cpus to monitor in system-wide"),
+       OPT_SET_UINT('A', "no-aggr", &stat_config.aggr_mode,
+                   "disable CPU count aggregation", AGGR_NONE),
+       OPT_STRING('x', "field-separator", &csv_sep, "separator",
+                  "print counts with custom separator"),
+       OPT_CALLBACK('G', "cgroup", &evsel_list, "name",
+                    "monitor event in cgroup name only", parse_cgroups),
+       OPT_STRING('o', "output", &output_name, "file", "output file name"),
+       OPT_BOOLEAN(0, "append", &append_file, "append to the output file"),
+       OPT_INTEGER(0, "log-fd", &output_fd,
+                   "log output to fd, instead of stderr"),
+       OPT_STRING(0, "pre", &pre_cmd, "command",
+                       "command to run prior to the measured command"),
+       OPT_STRING(0, "post", &post_cmd, "command",
+                       "command to run after to the measured command"),
+       OPT_UINTEGER('I', "interval-print", &stat_config.interval,
+                   "print counts at regular interval in ms (>= 10)"),
+       OPT_SET_UINT(0, "per-socket", &stat_config.aggr_mode,
+                    "aggregate counts per processor socket", AGGR_SOCKET),
+       OPT_SET_UINT(0, "per-core", &stat_config.aggr_mode,
+                    "aggregate counts per physical processor core", AGGR_CORE),
+       OPT_SET_UINT(0, "per-thread", &stat_config.aggr_mode,
+                    "aggregate counts per thread", AGGR_THREAD),
+       OPT_UINTEGER('D', "delay", &initial_delay,
+                    "ms to wait before starting measurement after program start"),
+       OPT_END()
+};
+
 static int perf_stat__get_socket(struct cpu_map *map, int cpu)
 {
        return cpu_map__get_socket(map, cpu, NULL);
@@ -1174,69 +1238,6 @@ static int add_default_attributes(void)
 
 int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused)
 {
-       bool append_file = false;
-       int output_fd = 0;
-       const char *output_name = NULL;
-       const struct option options[] = {
-       OPT_BOOLEAN('T', "transaction", &transaction_run,
-                   "hardware transaction statistics"),
-       OPT_CALLBACK('e', "event", &evsel_list, "event",
-                    "event selector. use 'perf list' to list available events",
-                    parse_events_option),
-       OPT_CALLBACK(0, "filter", &evsel_list, "filter",
-                    "event filter", parse_filter),
-       OPT_BOOLEAN('i', "no-inherit", &no_inherit,
-                   "child tasks do not inherit counters"),
-       OPT_STRING('p', "pid", &target.pid, "pid",
-                  "stat events on existing process id"),
-       OPT_STRING('t', "tid", &target.tid, "tid",
-                  "stat events on existing thread id"),
-       OPT_BOOLEAN('a', "all-cpus", &target.system_wide,
-                   "system-wide collection from all CPUs"),
-       OPT_BOOLEAN('g', "group", &group,
-                   "put the counters into a counter group"),
-       OPT_BOOLEAN('c', "scale", &stat_config.scale, "scale/normalize counters"),
-       OPT_INCR('v', "verbose", &verbose,
-                   "be more verbose (show counter open errors, etc)"),
-       OPT_INTEGER('r', "repeat", &run_count,
-                   "repeat command and print average + stddev (max: 100, forever: 0)"),
-       OPT_BOOLEAN('n', "null", &null_run,
-                   "null run - dont start any counters"),
-       OPT_INCR('d', "detailed", &detailed_run,
-                   "detailed run - start a lot of events"),
-       OPT_BOOLEAN('S', "sync", &sync_run,
-                   "call sync() before starting a run"),
-       OPT_CALLBACK_NOOPT('B', "big-num", NULL, NULL,
-                          "print large numbers with thousands\' separators",
-                          stat__set_big_num),
-       OPT_STRING('C', "cpu", &target.cpu_list, "cpu",
-                   "list of cpus to monitor in system-wide"),
-       OPT_SET_UINT('A', "no-aggr", &stat_config.aggr_mode,
-                   "disable CPU count aggregation", AGGR_NONE),
-       OPT_STRING('x', "field-separator", &csv_sep, "separator",
-                  "print counts with custom separator"),
-       OPT_CALLBACK('G', "cgroup", &evsel_list, "name",
-                    "monitor event in cgroup name only", parse_cgroups),
-       OPT_STRING('o', "output", &output_name, "file", "output file name"),
-       OPT_BOOLEAN(0, "append", &append_file, "append to the output file"),
-       OPT_INTEGER(0, "log-fd", &output_fd,
-                   "log output to fd, instead of stderr"),
-       OPT_STRING(0, "pre", &pre_cmd, "command",
-                       "command to run prior to the measured command"),
-       OPT_STRING(0, "post", &post_cmd, "command",
-                       "command to run after to the measured command"),
-       OPT_UINTEGER('I', "interval-print", &stat_config.interval,
-                   "print counts at regular interval in ms (>= 10)"),
-       OPT_SET_UINT(0, "per-socket", &stat_config.aggr_mode,
-                    "aggregate counts per processor socket", AGGR_SOCKET),
-       OPT_SET_UINT(0, "per-core", &stat_config.aggr_mode,
-                    "aggregate counts per physical processor core", AGGR_CORE),
-       OPT_SET_UINT(0, "per-thread", &stat_config.aggr_mode,
-                    "aggregate counts per thread", AGGR_THREAD),
-       OPT_UINTEGER('D', "delay", &initial_delay,
-                    "ms to wait before starting measurement after program start"),
-       OPT_END()
-       };
        const char * const stat_usage[] = {
                "perf stat [<options>] [<command>]",
                NULL
@@ -1252,7 +1253,7 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused)
        if (evsel_list == NULL)
                return -ENOMEM;
 
-       argc = parse_options(argc, argv, options, stat_usage,
+       argc = parse_options(argc, argv, stat_options, stat_usage,
                PARSE_OPT_STOP_AT_NON_OPTION);
 
        interval = stat_config.interval;
@@ -1262,14 +1263,14 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused)
 
        if (output_name && output_fd) {
                fprintf(stderr, "cannot use both --output and --log-fd\n");
-               parse_options_usage(stat_usage, options, "o", 1);
-               parse_options_usage(NULL, options, "log-fd", 0);
+               parse_options_usage(stat_usage, stat_options, "o", 1);
+               parse_options_usage(NULL, stat_options, "log-fd", 0);
                goto out;
        }
 
        if (output_fd < 0) {
                fprintf(stderr, "argument to --log-fd must be a > 0\n");
-               parse_options_usage(stat_usage, options, "log-fd", 0);
+               parse_options_usage(stat_usage, stat_options, "log-fd", 0);
                goto out;
        }
 
@@ -1309,8 +1310,8 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused)
                /* User explicitly passed -B? */
                if (big_num_opt == 1) {
                        fprintf(stderr, "-B option not supported with -x\n");
-                       parse_options_usage(stat_usage, options, "B", 1);
-                       parse_options_usage(NULL, options, "x", 1);
+                       parse_options_usage(stat_usage, stat_options, "B", 1);
+                       parse_options_usage(NULL, stat_options, "x", 1);
                        goto out;
                } else /* Nope, so disable big number formatting */
                        big_num = false;
@@ -1318,11 +1319,11 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused)
                big_num = false;
 
        if (!argc && target__none(&target))
-               usage_with_options(stat_usage, options);
+               usage_with_options(stat_usage, stat_options);
 
        if (run_count < 0) {
                pr_err("Run count must be a positive number\n");
-               parse_options_usage(stat_usage, options, "r", 1);
+               parse_options_usage(stat_usage, stat_options, "r", 1);
                goto out;
        } else if (run_count == 0) {
                forever = true;
@@ -1332,8 +1333,8 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused)
        if ((stat_config.aggr_mode == AGGR_THREAD) && !target__has_task(&target)) {
                fprintf(stderr, "The --per-thread option is only available "
                        "when monitoring via -p -t options.\n");
-               parse_options_usage(NULL, options, "p", 1);
-               parse_options_usage(NULL, options, "t", 1);
+               parse_options_usage(NULL, stat_options, "p", 1);
+               parse_options_usage(NULL, stat_options, "t", 1);
                goto out;
        }
 
@@ -1347,9 +1348,9 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused)
                fprintf(stderr, "both cgroup and no-aggregation "
                        "modes only available in system-wide mode\n");
 
-               parse_options_usage(stat_usage, options, "G", 1);
-               parse_options_usage(NULL, options, "A", 1);
-               parse_options_usage(NULL, options, "a", 1);
+               parse_options_usage(stat_usage, stat_options, "G", 1);
+               parse_options_usage(NULL, stat_options, "A", 1);
+               parse_options_usage(NULL, stat_options, "a", 1);
                goto out;
        }
 
@@ -1361,12 +1362,12 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused)
        if (perf_evlist__create_maps(evsel_list, &target) < 0) {
                if (target__has_task(&target)) {
                        pr_err("Problems finding threads of monitor\n");
-                       parse_options_usage(stat_usage, options, "p", 1);
-                       parse_options_usage(NULL, options, "t", 1);
+                       parse_options_usage(stat_usage, stat_options, "p", 1);
+                       parse_options_usage(NULL, stat_options, "t", 1);
                } else if (target__has_cpu(&target)) {
                        perror("failed to parse CPUs map");
-                       parse_options_usage(stat_usage, options, "C", 1);
-                       parse_options_usage(NULL, options, "a", 1);
+                       parse_options_usage(stat_usage, stat_options, "C", 1);
+                       parse_options_usage(NULL, stat_options, "a", 1);
                }
                goto out;
        }
@@ -1381,7 +1382,7 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused)
        if (interval && interval < 100) {
                if (interval < 10) {
                        pr_err("print interval must be >= 10ms\n");
-                       parse_options_usage(stat_usage, options, "I", 1);
+                       parse_options_usage(stat_usage, stat_options, "I", 1);
                        goto out;
                } else
                        pr_warning("print interval < 100ms. "