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

Commit b40e3612 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf lock: Make 'f' part of the common 'lock_options' 

All options need the -f/--force option, so move it to the array
referenced via OPT_PARENT.

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-unbeionpi58rioh4e9w8kp4n@git.kernel.org


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

tools/perf/builtin-lock.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -952,6 +952,7 @@ int cmd_lock(int argc, const char **argv, const char *prefix __maybe_unused) 
	OPT_STRING('i', "input", &input_name, "file", "input file name"),

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

	OPT_INCR('v', "verbose", &verbose, "be more verbose (show symbol address, etc)"),

	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_BOOLEAN('D', "dump-raw-trace", &dump_trace, "dump raw trace in ASCII"),

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

	OPT_END()

	OPT_END()

	};

	};
@@ -960,14 +961,12 @@ int cmd_lock(int argc, const char **argv, const char *prefix __maybe_unused) 
		    "dump thread list in perf.data"),

		    "dump thread list in perf.data"),

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

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

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

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

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

	OPT_PARENT(lock_options)

	OPT_PARENT(lock_options)

	};

	};





	const struct option report_options[] = {

	const struct option report_options[] = {

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

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

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

		    "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 */

	/* TODO: type */

	OPT_PARENT(lock_options)

	OPT_PARENT(lock_options)

	};

	};