perf tools: Export usage string and option table of perf record

Those are shared with other builtin commands like kvm, script.  So
make it accessable from them.  This is a preparation of later change
that limiting possible options.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Hemant Kumar <hemant@linux.vnet.ibm.com>
Cc: Alexander Yarygin <yarygin@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Hemant Kumar <hemant@linux.vnet.ibm.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1413990949-13953-3-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 2583a9b043178453890c8006b41f138afb9db8f0..5091a27e6d28256628e14fc01b3a7ed5edfd693f 100644 (file)
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -680,11 +680,12 @@ static int perf_record_config(const char *var, const char *value, void *cb)
        return perf_default_config(var, value, cb);
 }
 
-static const char * const record_usage[] = {
+static const char * const __record_usage[] = {
        "perf record [<options>] [<command>]",
        "perf record [<options>] -- <command> [<options>]",
        NULL
 };
+const char * const *record_usage = __record_usage;
 
 /*
  * XXX Ideally would be local to cmd_record() and passed to a record__new
@@ -725,7 +726,7 @@ const char record_callchain_help[] = CALLCHAIN_HELP "fp";
  * perf_evlist__prepare_workload, etc instead of fork+exec'in 'perf record',
  * using pipes, etc.
  */
-const struct option record_options[] = {
+struct option __record_options[] = {
        OPT_CALLBACK('e', "event", &record.evlist, "event",
                     "event selector. use 'perf list' to list available events",
                     parse_events_option),
@@ -802,6 +803,8 @@ const struct option record_options[] = {
        OPT_END()
 };
 
+struct option *record_options = __record_options;
+
 int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused)
 {
        int err = -ENOMEM;

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index b35517f2ceb57014e1fb35f2d65f89e8c50e4f05..ce304dfd962a13db6d2f471a1a6baa304a7bd130 100644 (file)
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -23,7 +23,6 @@ static char const             *generate_script_lang;
 static bool                    debug_mode;
 static u64                     last_timestamp;
 static u64                     nr_unordered;
-extern const struct option     record_options[];
 static bool                    no_callchain;
 static bool                    latency_format;
 static bool                    system_wide;

diff --git a/tools/perf/builtin-timechart.c b/tools/perf/builtin-timechart.c
index f5fb256d90d55825fc9e0ecfbd57e1a84eb9806d..f3bb1a4bf060c4a6ad2347f7f40b321916669533 100644 (file)
--- a/tools/perf/builtin-timechart.c
+++ b/tools/perf/builtin-timechart.c
@@ -1963,7 +1963,7 @@ int cmd_timechart(int argc, const char **argv,
                NULL
        };
 
-       const struct option record_options[] = {
+       const struct option timechart_record_options[] = {
        OPT_BOOLEAN('P', "power-only", &tchart.power_only, "output power data only"),
        OPT_BOOLEAN('T', "tasks-only", &tchart.tasks_only,
                    "output processes data only"),
@@ -1972,7 +1972,7 @@ int cmd_timechart(int argc, const char **argv,
        OPT_BOOLEAN('g', "callchain", &tchart.with_backtrace, "record callchain"),
        OPT_END()
        };
-       const char * const record_usage[] = {
+       const char * const timechart_record_usage[] = {
                "perf timechart record [<options>]",
                NULL
        };
@@ -1985,7 +1985,8 @@ int cmd_timechart(int argc, const char **argv,
        }
 
        if (argc && !strncmp(argv[0], "rec", 3)) {
-               argc = parse_options(argc, argv, record_options, record_usage,
+               argc = parse_options(argc, argv, timechart_record_options,
+                                    timechart_record_usage,
                                     PARSE_OPT_STOP_AT_NON_OPTION);
 
                if (tchart.power_only && tchart.tasks_only) {

diff --git a/tools/perf/perf.h b/tools/perf/perf.h
index 220d44e44c1b1d4fdfafcbe546690d2534108d7f..511c2831aa81e19d9e0d1449cb7dc12261474383 100644 (file)
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -62,4 +62,7 @@ struct record_opts {
        unsigned     initial_delay;
 };
 
+struct option;
+extern const char * const *record_usage;
+extern struct option *record_options;
 #endif