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

Commit 6fdd9cb7 authored by Yunlong Song's avatar Yunlong Song Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Add the bash completion for listing subsubcommands of perf trace 



The bash completion does not support listing subsubcommands for 'perf
trace <TAB>', so fix it.

Example:

Before this patch:

 $ perf trace <TAB>
 $

As shown above, the subsubcommands of perf trace does not come out.

After this patch:

 $ perf trace <TAB>
 record

As shown above, the subsubcommands of perf trace can come out now.

Signed-off-by: default avatarYunlong Song <yunlong.song@huawei.com>
Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1426685758-25488-13-git-send-email-yunlong.song@huawei.com


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

tools/perf/builtin-trace.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -2609,7 +2609,7 @@ static void evlist__set_evsel_handler(struct perf_evlist *evlist, void *handler) 




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

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

{

{

	const char * const trace_usage[] = {

	const char *trace_usage[] = {

		"perf trace [<options>] [<command>]",

		"perf trace [<options>] [<command>]",

		"perf trace [<options>] -- <command> [<options>]",

		"perf trace [<options>] -- <command> [<options>]",

		"perf trace record [<options>] [<command>]",

		"perf trace record [<options>] [<command>]",
@@ -2684,6 +2684,7 @@ int cmd_trace(int argc, const char **argv, const char *prefix __maybe_unused) 
	OPT_BOOLEAN(0, "syscalls", &trace.trace_syscalls, "Trace syscalls"),

	OPT_BOOLEAN(0, "syscalls", &trace.trace_syscalls, "Trace syscalls"),

	OPT_END()

	OPT_END()

	};

	};

	const char * const trace_subcommands[] = { "record", NULL };

	int err;

	int err;

	char bf[BUFSIZ];

	char bf[BUFSIZ];
@@ -2699,8 +2700,8 @@ int cmd_trace(int argc, const char **argv, const char *prefix __maybe_unused) 
		goto out;

		goto out;

	}

	}





	argc = parse_options(argc, argv, trace_options, trace_usage,

	argc = parse_options_subcommand(argc, argv, trace_options, trace_subcommands,

			     PARSE_OPT_STOP_AT_NON_OPTION);

				 trace_usage, PARSE_OPT_STOP_AT_NON_OPTION);





	if (trace.trace_pgfaults) {

	if (trace.trace_pgfaults) {

		trace.opts.sample_address = true;

		trace.opts.sample_address = true;

tools/perf/perf-completion.sh

+6 −3
Original line number Original line Diff line number Diff line
@@ -120,6 +120,7 @@ __perf_prev_skip_opts () 
		((i--))

		((i--))

	done

	done

}

}



__perf_main ()

__perf_main ()

{

{

	local cmd

	local cmd
@@ -137,13 +138,15 @@ __perf_main () 
			cmds=$($cmd --list-cmds)

			cmds=$($cmd --list-cmds)

		fi

		fi

		__perfcomp "$cmds" "$cur"

		__perfcomp "$cmds" "$cur"

	# List possible events for -e and --event option

	# List possible events for -e option

	elif [[ $prev == @("-e"|"--event") && $prev_skip_opts == @(record|stat|top) ]]; then

	elif [[ $prev == @("-e"|"--event") &&

		$prev_skip_opts == @(record|stat|top) ]]; then

		evts=$($cmd list --raw-dump)

		evts=$($cmd list --raw-dump)

		__perfcomp_colon "$evts" "$cur"

		__perfcomp_colon "$evts" "$cur"

	else

	else

		# List subcommands for perf commands

		# List subcommands for perf commands

		if [[ $prev_skip_opts == @(kvm|kmem|mem|lock|sched|data|help|script|test|timechart) ]]; then

		if [[ $prev_skip_opts == @(kvm|kmem|mem|lock|sched|

			|data|help|script|test|timechart|trace) ]]; then

			subcmds=$($cmd $prev_skip_opts --list-cmds)

			subcmds=$($cmd $prev_skip_opts --list-cmds)

			__perfcomp_colon "$subcmds" "$cur"

			__perfcomp_colon "$subcmds" "$cur"

		fi

		fi