Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77f02f44 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf sched: Make common options cascading 



The -i and -v options can be used in subcommands so enable cascading the
sched_options.  This fixes the following inconvenience in 'perf sched':

  $ perf sched -i perf.data.sched  map
  ... (it works well) ...

  $ perf sched map  -i perf.data.sched
    Error: unknown switch `i'

   Usage: perf sched map [<options>]

          --color-cpus <cpus>
                            highlight given CPUs in map
          --color-pids <pids>
                            highlight given pids in map
          --compact         map output in compact mode
          --cpus <cpus>     display given CPUs in map

With this patch, the second command line works with the perf.data.sched
data file.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/20161024030003.28534-2-namhyung@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 369a2478

tools/perf/builtin-sched.c

+12 −12
Original line number Diff line number Diff line
@@ -1954,6 +1954,15 @@ int cmd_sched(int argc, const char **argv, const char *prefix __maybe_unused) 
		.next_shortname2      = '0',

		.skip_merge           = 0,

	};

	const struct option sched_options[] = {

	OPT_STRING('i', "input", &input_name, "file",

		    "input file name"),

	OPT_INCR('v', "verbose", &verbose,

		    "be more verbose (show symbol address, etc)"),

	OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace,

		    "dump raw trace in ASCII"),

	OPT_END()

	};

	const struct option latency_options[] = {

	OPT_STRING('s', "sort", &sched.sort_order, "key[,key2...]",

		   "sort by key(s): runtime, switch, avg, max"),
@@ -1965,7 +1974,7 @@ int cmd_sched(int argc, const char **argv, const char *prefix __maybe_unused) 
		    "dump raw trace in ASCII"),

	OPT_BOOLEAN('p', "pids", &sched.skip_merge,

		    "latency stats per pid instead of per comm"),

	OPT_END()

	OPT_PARENT(sched_options)

	};

	const struct option replay_options[] = {

	OPT_UINTEGER('r', "repeat", &sched.replay_repeat,
@@ -1975,16 +1984,7 @@ int cmd_sched(int argc, const char **argv, const char *prefix __maybe_unused) 
	OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace,

		    "dump raw trace in ASCII"),

	OPT_BOOLEAN('f', "force", &sched.force, "don't complain, do it"),

	OPT_END()

	};

	const struct option sched_options[] = {

	OPT_STRING('i', "input", &input_name, "file",

		    "input file name"),

	OPT_INCR('v', "verbose", &verbose,

		    "be more verbose (show symbol address, etc)"),

	OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace,

		    "dump raw trace in ASCII"),

	OPT_END()

	OPT_PARENT(sched_options)

	};

	const struct option map_options[] = {

	OPT_BOOLEAN(0, "compact", &sched.map.comp,
@@ -1995,7 +1995,7 @@ int cmd_sched(int argc, const char **argv, const char *prefix __maybe_unused) 
                    "highlight given CPUs in map"),

	OPT_STRING(0, "cpus", &sched.map.cpus_str, "cpus",

                    "display given CPUs in map"),

	OPT_END()

	OPT_PARENT(sched_options)

	};

	const char * const latency_usage[] = {

		"perf sched latency [<options>]",