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

Commit a0541234 authored by Anton Blanchard's avatar Anton Blanchard Committed by Peter Zijlstra
Browse files

perf_counter: Improve perf stat and perf record option parsing 



perf stat and perf record currently look for all options on the command
line. This can lead to some confusion:

# perf stat ls -l
  Error: unknown switch `l'

While we can work around this by adding '--' before the command, the git
option parsing code can stop at the first non option:

# perf stat ls -l
 Performance counter stats for 'ls -l':
....

Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <20090722130412.GD9029@kryten>
parent 7f453c24

tools/perf/builtin-record.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -664,7 +664,8 @@ int cmd_record(int argc, const char **argv, const char *prefix __used) 
{

{

	int counter;

	int counter;





	argc = parse_options(argc, argv, options, record_usage, 0);

	argc = parse_options(argc, argv, options, record_usage,

		PARSE_OPT_STOP_AT_NON_OPTION);

	if (!argc && target_pid == -1 && !system_wide)

	if (!argc && target_pid == -1 && !system_wide)

		usage_with_options(record_usage, options);

		usage_with_options(record_usage, options);

tools/perf/builtin-stat.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -511,7 +511,8 @@ int cmd_stat(int argc, const char **argv, const char *prefix __used) 
{

{

	int status;

	int status;





	argc = parse_options(argc, argv, options, stat_usage, 0);

	argc = parse_options(argc, argv, options, stat_usage,

		PARSE_OPT_STOP_AT_NON_OPTION);

	if (!argc)

	if (!argc)

		usage_with_options(stat_usage, options);

		usage_with_options(stat_usage, options);

	if (run_count <= 0 || run_count > MAX_RUN)

	if (run_count <= 0 || run_count > MAX_RUN)