perf c2c: Support cascading options

Adding support for cascading options added by Namhyung in:

  commit 369a2478973a ("tools lib subcmd: Support cascading options")

This way the report and record command share options with with c2c
command and can save some option duplicates. For now it's the 'v'
option.

Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Joe Mario <jmario@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1479764011-10732-7-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-c2c.c b/tools/perf/builtin-c2c.c
index 5492471..4b41963 100644 (file)
--- a/tools/perf/builtin-c2c.c
+++ b/tools/perf/builtin-c2c.c
@@ -101,6 +101,11 @@ static const char *display_str[DISPLAY_MAX] = {
        [DISPLAY_TOT] = "Total",
 };
 
+static const struct option c2c_options[] = {
+       OPT_INCR('v', "verbose", &verbose, "be more verbose (show counter open errors, etc)"),
+       OPT_END()
+};
+
 static struct perf_c2c c2c;
 
 static void *c2c_he_zalloc(size_t size)
@@ -2520,11 +2525,9 @@ static int perf_c2c__report(int argc, const char **argv)
        const char *display = NULL;
        const char *coalesce = NULL;
        bool no_source = false;
-       const struct option c2c_options[] = {
+       const struct option options[] = {
        OPT_STRING('k', "vmlinux", &symbol_conf.vmlinux_name,
                   "file", "vmlinux pathname"),
-       OPT_INCR('v', "verbose", &verbose,
-                "be more verbose (show counter open errors, etc)"),
        OPT_STRING('i', "input", &input_name, "file",
                   "the input file to process"),
        OPT_INCR('N', "node-info", &c2c.node_info,
@@ -2548,14 +2551,15 @@ static int perf_c2c__report(int argc, const char **argv)
        OPT_STRING('c', "coalesce", &coalesce, "coalesce fields",
                   "coalesce fields: pid,tid,iaddr,dso"),
        OPT_BOOLEAN('f', "force", &symbol_conf.force, "don't complain, do it"),
+       OPT_PARENT(c2c_options),
        OPT_END()
        };
        int err = 0;
 
-       argc = parse_options(argc, argv, c2c_options, report_c2c_usage,
+       argc = parse_options(argc, argv, options, report_c2c_usage,
                             PARSE_OPT_STOP_AT_NON_OPTION);
        if (argc)
-               usage_with_options(report_c2c_usage, c2c_options);
+               usage_with_options(report_c2c_usage, options);
 
        if (c2c.stats_only)
                c2c.use_stdio = true;
@@ -2683,11 +2687,10 @@ static int perf_c2c__record(int argc, const char **argv)
        OPT_CALLBACK('e', "event", &event_set, "event",
                     "event selector. Use 'perf mem record -e list' to list available events",
                     parse_record_events),
-       OPT_INCR('v', "verbose", &verbose,
-                "be more verbose (show counter open errors, etc)"),
        OPT_BOOLEAN('u', "all-user", &all_user, "collect only user level data"),
        OPT_BOOLEAN('k', "all-kernel", &all_kernel, "collect only kernel level data"),
        OPT_UINTEGER('l', "ldlat", &perf_mem_events__loads_ldlat, "setup mem-loads latency"),
+       OPT_PARENT(c2c_options),
        OPT_END()
        };
 
@@ -2759,11 +2762,6 @@ static int perf_c2c__record(int argc, const char **argv)
 
 int cmd_c2c(int argc, const char **argv, const char *prefix __maybe_unused)
 {
-       const struct option c2c_options[] = {
-       OPT_INCR('v', "verbose", &verbose, "be more verbose"),
-       OPT_END()
-       };
-
        argc = parse_options(argc, argv, c2c_options, c2c_usage,
                             PARSE_OPT_STOP_AT_NON_OPTION);