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

Commit 249eed53 authored by Changbin Du's avatar Changbin Du Committed by Arnaldo Carvalho de Melo
Browse files

perf lock: Subcommands should include common options 



When I use -i option for report subcommand, it doesn't accept it.  We
need add common options using OPT_PARENT macro.

perf lock report -i lock_perf.data
  Error: unknown switch `i'

  Usage: perf lock report [<options>]

    -f, --force           don't complain, do it
    -k, --key <acquired>  key for sorting ...

Signed-off-by: default avatarChangbin Du <changbin.du@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20170317055342.8284-1-changbin.du@intel.com


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

tools/perf/builtin-lock.c

+11 −8
Original line number Diff line number Diff line
@@ -948,27 +948,30 @@ static int __cmd_record(int argc, const char **argv) 


int cmd_lock(int argc, const char **argv, const char *prefix __maybe_unused)

{

	const struct option lock_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 info_options[] = {

	OPT_BOOLEAN('t', "threads", &info_threads,

		    "dump thread list in perf.data"),

	OPT_BOOLEAN('m', "map", &info_map,

		    "map of lock instances (address:name table)"),

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

	OPT_END()

	};

	const struct option lock_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(lock_options)

	};



	const struct option report_options[] = {

	OPT_STRING('k', "key", &sort_key, "acquired",

		    "key for sorting (acquired / contended / avg_wait / wait_total / wait_max / wait_min)"),

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

	/* TODO: type */

	OPT_END()

	OPT_PARENT(lock_options)

	};



	const char * const info_usage[] = {

		"perf lock info [<options>]",

		NULL