OSDN Git Service

perf timechart: Use OPT_PARENT for common options
authorArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 17 Mar 2017 14:23:21 +0000 (11:23 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 17 Mar 2017 14:49:08 +0000 (11:49 -0300)
Move -T/--tasks-only and -P/--power-only options to a separate options
array that then gets referenced via OPT_PARENT from the 'perf timechart'
and 'perf timechart record' option arrays.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Changbin Du <changbin.du@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-j80lol9wj1i6556ibh48iebe@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/builtin-timechart.c

index e7eaa29..fbd7c6c 100644 (file)
@@ -1933,6 +1933,11 @@ int cmd_timechart(int argc, const char **argv,
                .merge_dist = 1000,
        };
        const char *output_name = "output.svg";
+       const struct option timechart_common_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"),
+       OPT_END()
+       };
        const struct option timechart_options[] = {
        OPT_STRING('i', "input", &input_name, "file", "input file name"),
        OPT_STRING('o', "output", &output_name, "file", "output file name"),
@@ -1940,9 +1945,6 @@ int cmd_timechart(int argc, const char **argv,
        OPT_CALLBACK(0, "highlight", NULL, "duration or task name",
                      "highlight tasks. Pass duration in ns or process name.",
                       parse_highlight),
-       OPT_BOOLEAN('P', "power-only", &tchart.power_only, "output power data only"),
-       OPT_BOOLEAN('T', "tasks-only", &tchart.tasks_only,
-                   "output processes data only"),
        OPT_CALLBACK('p', "process", NULL, "process",
                      "process selector. Pass a pid or process name.",
                       parse_process),
@@ -1962,22 +1964,18 @@ int cmd_timechart(int argc, const char **argv,
                     "merge events that are merge-dist us apart",
                     parse_time),
        OPT_BOOLEAN('f', "force", &tchart.force, "don't complain, do it"),
-       OPT_END()
+       OPT_PARENT(timechart_common_options),
        };
        const char * const timechart_subcommands[] = { "record", NULL };
        const char *timechart_usage[] = {
                "perf timechart [<options>] {record}",
                NULL
        };
-
        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"),
        OPT_BOOLEAN('I', "io-only", &tchart.io_only,
                    "record only IO data"),
        OPT_BOOLEAN('g', "callchain", &tchart.with_backtrace, "record callchain"),
-       OPT_END()
+       OPT_PARENT(timechart_common_options),
        };
        const char * const timechart_record_usage[] = {
                "perf timechart record [<options>]",