* [PATCH 1/4] perf kmem: introduce --list-cmds for use by scripts
2014-03-15 3:17 [PATCH 0/4] perf: trivial follow-ons to --list-cmds Ramkumar Ramachandra
@ 2014-03-15 3:17 ` Ramkumar Ramachandra
2014-04-17 9:57 ` [tip:perf/core] perf kmem: Introduce " tip-bot for Ramkumar Ramachandra
2014-03-15 3:17 ` [PATCH 2/4] perf mem: introduce " Ramkumar Ramachandra
` (3 subsequent siblings)
4 siblings, 1 reply; 11+ messages in thread
From: Ramkumar Ramachandra @ 2014-03-15 3:17 UTC (permalink / raw)
To: LKML; +Cc: David Ahern, Jiri Olsa, Arnaldo Carvalho de Melo
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
tools/perf/builtin-kmem.c | 8 +++++---
tools/perf/perf-completion.sh | 4 ++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
index 929462a..bd91de0 100644
--- a/tools/perf/builtin-kmem.c
+++ b/tools/perf/builtin-kmem.c
@@ -756,11 +756,13 @@ int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused)
OPT_BOOLEAN(0, "raw-ip", &raw_ip, "show raw ip instead of symbol"),
OPT_END()
};
- const char * const kmem_usage[] = {
- "perf kmem [<options>] {record|stat}",
+ const char *const kmem_subcommands[] = { "record", "stat", NULL };
+ const char *kmem_usage[] = {
+ NULL,
NULL
};
- argc = parse_options(argc, argv, kmem_options, kmem_usage, 0);
+ argc = parse_options_subcommand(argc, argv, kmem_options,
+ kmem_subcommands, kmem_usage, 0);
if (!argc)
usage_with_options(kmem_usage, kmem_options);
diff --git a/tools/perf/perf-completion.sh b/tools/perf/perf-completion.sh
index ae3a576..0ef59dd 100644
--- a/tools/perf/perf-completion.sh
+++ b/tools/perf/perf-completion.sh
@@ -121,8 +121,8 @@ __perf_main ()
elif [[ $prev == "-e" && "${words[1]}" == @(record|stat|top) ]]; then
evts=$($cmd list --raw-dump)
__perfcomp_colon "$evts" "$cur"
- # List subcommands for 'perf kvm'
- elif [[ $prev == "kvm" ]]; then
+ # List subcommands for perf commands
+ elif [[ $prev == @(kvm|kmem) ]]; then
subcmds=$($cmd $prev --list-cmds)
__perfcomp_colon "$subcmds" "$cur"
# List long option names
--
1.9.rc0.1.g9d22d25
^ permalink raw reply related [flat|nested] 11+ messages in thread* [tip:perf/core] perf kmem: Introduce --list-cmds for use by scripts
2014-03-15 3:17 ` [PATCH 1/4] perf kmem: introduce --list-cmds for use by scripts Ramkumar Ramachandra
@ 2014-04-17 9:57 ` tip-bot for Ramkumar Ramachandra
0 siblings, 0 replies; 11+ messages in thread
From: tip-bot for Ramkumar Ramachandra @ 2014-04-17 9:57 UTC (permalink / raw)
To: linux-tip-commits
Cc: acme, linux-kernel, hpa, mingo, jolsa, dsahern, tglx, artagnon
Commit-ID: 3bca23543b910a84d3c58a819663e0a4fad72bb6
Gitweb: http://git.kernel.org/tip/3bca23543b910a84d3c58a819663e0a4fad72bb6
Author: Ramkumar Ramachandra <artagnon@gmail.com>
AuthorDate: Fri, 14 Mar 2014 23:17:51 -0400
Committer: Jiri Olsa <jolsa@redhat.com>
CommitDate: Wed, 16 Apr 2014 17:16:04 +0200
perf kmem: Introduce --list-cmds for use by scripts
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Acked-by: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/r/1394853474-31019-2-git-send-email-artagnon@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
---
tools/perf/builtin-kmem.c | 8 +++++---
tools/perf/perf-completion.sh | 4 ++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
index 929462a..bd91de0 100644
--- a/tools/perf/builtin-kmem.c
+++ b/tools/perf/builtin-kmem.c
@@ -756,11 +756,13 @@ int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused)
OPT_BOOLEAN(0, "raw-ip", &raw_ip, "show raw ip instead of symbol"),
OPT_END()
};
- const char * const kmem_usage[] = {
- "perf kmem [<options>] {record|stat}",
+ const char *const kmem_subcommands[] = { "record", "stat", NULL };
+ const char *kmem_usage[] = {
+ NULL,
NULL
};
- argc = parse_options(argc, argv, kmem_options, kmem_usage, 0);
+ argc = parse_options_subcommand(argc, argv, kmem_options,
+ kmem_subcommands, kmem_usage, 0);
if (!argc)
usage_with_options(kmem_usage, kmem_options);
diff --git a/tools/perf/perf-completion.sh b/tools/perf/perf-completion.sh
index ae3a576..0ef59dd 100644
--- a/tools/perf/perf-completion.sh
+++ b/tools/perf/perf-completion.sh
@@ -121,8 +121,8 @@ __perf_main ()
elif [[ $prev == "-e" && "${words[1]}" == @(record|stat|top) ]]; then
evts=$($cmd list --raw-dump)
__perfcomp_colon "$evts" "$cur"
- # List subcommands for 'perf kvm'
- elif [[ $prev == "kvm" ]]; then
+ # List subcommands for perf commands
+ elif [[ $prev == @(kvm|kmem) ]]; then
subcmds=$($cmd $prev --list-cmds)
__perfcomp_colon "$subcmds" "$cur"
# List long option names
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/4] perf mem: introduce --list-cmds for use by scripts
2014-03-15 3:17 [PATCH 0/4] perf: trivial follow-ons to --list-cmds Ramkumar Ramachandra
2014-03-15 3:17 ` [PATCH 1/4] perf kmem: introduce --list-cmds for use by scripts Ramkumar Ramachandra
@ 2014-03-15 3:17 ` Ramkumar Ramachandra
2014-04-17 9:57 ` [tip:perf/core] perf mem: Introduce " tip-bot for Ramkumar Ramachandra
2014-03-15 3:17 ` [PATCH 3/4] perf lock: introduce " Ramkumar Ramachandra
` (2 subsequent siblings)
4 siblings, 1 reply; 11+ messages in thread
From: Ramkumar Ramachandra @ 2014-03-15 3:17 UTC (permalink / raw)
To: LKML; +Cc: David Ahern, Jiri Olsa, Arnaldo Carvalho de Melo
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
tools/perf/builtin-mem.c | 15 ++++++++-------
tools/perf/perf-completion.sh | 2 +-
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/tools/perf/builtin-mem.c b/tools/perf/builtin-mem.c
index 2e3ade69..4a1a6c9 100644
--- a/tools/perf/builtin-mem.c
+++ b/tools/perf/builtin-mem.c
@@ -21,11 +21,6 @@ struct perf_mem {
DECLARE_BITMAP(cpu_bitmap, MAX_NR_CPUS);
};
-static const char * const mem_usage[] = {
- "perf mem [<options>] {record <command> |report}",
- NULL
-};
-
static int __cmd_record(int argc, const char **argv)
{
int rec_argc, i = 0, j;
@@ -220,9 +215,15 @@ int cmd_mem(int argc, const char **argv, const char *prefix __maybe_unused)
" between columns '.' is reserved."),
OPT_END()
};
+ const char *const mem_subcommands[] = { "record", "report", NULL };
+ const char *mem_usage[] = {
+ NULL,
+ NULL
+ };
+
- argc = parse_options(argc, argv, mem_options, mem_usage,
- PARSE_OPT_STOP_AT_NON_OPTION);
+ argc = parse_options_subcommand(argc, argv, mem_options, mem_subcommands,
+ mem_usage, PARSE_OPT_STOP_AT_NON_OPTION);
if (!argc || !(strncmp(argv[0], "rec", 3) || mem_operation))
usage_with_options(mem_usage, mem_options);
diff --git a/tools/perf/perf-completion.sh b/tools/perf/perf-completion.sh
index 0ef59dd..f44c04b 100644
--- a/tools/perf/perf-completion.sh
+++ b/tools/perf/perf-completion.sh
@@ -122,7 +122,7 @@ __perf_main ()
evts=$($cmd list --raw-dump)
__perfcomp_colon "$evts" "$cur"
# List subcommands for perf commands
- elif [[ $prev == @(kvm|kmem) ]]; then
+ elif [[ $prev == @(kvm|kmem|mem) ]]; then
subcmds=$($cmd $prev --list-cmds)
__perfcomp_colon "$subcmds" "$cur"
# List long option names
--
1.9.rc0.1.g9d22d25
^ permalink raw reply related [flat|nested] 11+ messages in thread* [tip:perf/core] perf mem: Introduce --list-cmds for use by scripts
2014-03-15 3:17 ` [PATCH 2/4] perf mem: introduce " Ramkumar Ramachandra
@ 2014-04-17 9:57 ` tip-bot for Ramkumar Ramachandra
0 siblings, 0 replies; 11+ messages in thread
From: tip-bot for Ramkumar Ramachandra @ 2014-04-17 9:57 UTC (permalink / raw)
To: linux-tip-commits
Cc: acme, linux-kernel, hpa, mingo, jolsa, dsahern, tglx, artagnon
Commit-ID: 8d2a2a1d885d36e978c4619a3db8791f9768dd6a
Gitweb: http://git.kernel.org/tip/8d2a2a1d885d36e978c4619a3db8791f9768dd6a
Author: Ramkumar Ramachandra <artagnon@gmail.com>
AuthorDate: Fri, 14 Mar 2014 23:17:52 -0400
Committer: Jiri Olsa <jolsa@redhat.com>
CommitDate: Wed, 16 Apr 2014 17:16:04 +0200
perf mem: Introduce --list-cmds for use by scripts
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Acked-by: David Ahern <dsahern@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/r/1394853474-31019-3-git-send-email-artagnon@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
---
tools/perf/builtin-mem.c | 15 ++++++++-------
tools/perf/perf-completion.sh | 2 +-
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/tools/perf/builtin-mem.c b/tools/perf/builtin-mem.c
index 2e3ade69..4a1a6c9 100644
--- a/tools/perf/builtin-mem.c
+++ b/tools/perf/builtin-mem.c
@@ -21,11 +21,6 @@ struct perf_mem {
DECLARE_BITMAP(cpu_bitmap, MAX_NR_CPUS);
};
-static const char * const mem_usage[] = {
- "perf mem [<options>] {record <command> |report}",
- NULL
-};
-
static int __cmd_record(int argc, const char **argv)
{
int rec_argc, i = 0, j;
@@ -220,9 +215,15 @@ int cmd_mem(int argc, const char **argv, const char *prefix __maybe_unused)
" between columns '.' is reserved."),
OPT_END()
};
+ const char *const mem_subcommands[] = { "record", "report", NULL };
+ const char *mem_usage[] = {
+ NULL,
+ NULL
+ };
+
- argc = parse_options(argc, argv, mem_options, mem_usage,
- PARSE_OPT_STOP_AT_NON_OPTION);
+ argc = parse_options_subcommand(argc, argv, mem_options, mem_subcommands,
+ mem_usage, PARSE_OPT_STOP_AT_NON_OPTION);
if (!argc || !(strncmp(argv[0], "rec", 3) || mem_operation))
usage_with_options(mem_usage, mem_options);
diff --git a/tools/perf/perf-completion.sh b/tools/perf/perf-completion.sh
index 0ef59dd..f44c04b 100644
--- a/tools/perf/perf-completion.sh
+++ b/tools/perf/perf-completion.sh
@@ -122,7 +122,7 @@ __perf_main ()
evts=$($cmd list --raw-dump)
__perfcomp_colon "$evts" "$cur"
# List subcommands for perf commands
- elif [[ $prev == @(kvm|kmem) ]]; then
+ elif [[ $prev == @(kvm|kmem|mem) ]]; then
subcmds=$($cmd $prev --list-cmds)
__perfcomp_colon "$subcmds" "$cur"
# List long option names
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 3/4] perf lock: introduce --list-cmds for use by scripts
2014-03-15 3:17 [PATCH 0/4] perf: trivial follow-ons to --list-cmds Ramkumar Ramachandra
2014-03-15 3:17 ` [PATCH 1/4] perf kmem: introduce --list-cmds for use by scripts Ramkumar Ramachandra
2014-03-15 3:17 ` [PATCH 2/4] perf mem: introduce " Ramkumar Ramachandra
@ 2014-03-15 3:17 ` Ramkumar Ramachandra
2014-04-17 9:57 ` [tip:perf/core] perf lock: Introduce " tip-bot for Ramkumar Ramachandra
2014-03-15 3:17 ` [PATCH 4/4] perf sched: introduce " Ramkumar Ramachandra
2014-03-15 15:49 ` [PATCH 0/4] perf: trivial follow-ons to --list-cmds David Ahern
4 siblings, 1 reply; 11+ messages in thread
From: Ramkumar Ramachandra @ 2014-03-15 3:17 UTC (permalink / raw)
To: LKML; +Cc: David Ahern, Jiri Olsa, Arnaldo Carvalho de Melo
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
tools/perf/builtin-lock.c | 10 ++++++----
tools/perf/perf-completion.sh | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c
index c852c7a..6148afc 100644
--- a/tools/perf/builtin-lock.c
+++ b/tools/perf/builtin-lock.c
@@ -961,8 +961,10 @@ int cmd_lock(int argc, const char **argv, const char *prefix __maybe_unused)
"perf lock info [<options>]",
NULL
};
- const char * const lock_usage[] = {
- "perf lock [<options>] {record|report|script|info}",
+ const char *const lock_subcommands[] = { "record", "report", "script",
+ "info", NULL };
+ const char *lock_usage[] = {
+ NULL,
NULL
};
const char * const report_usage[] = {
@@ -976,8 +978,8 @@ int cmd_lock(int argc, const char **argv, const char *prefix __maybe_unused)
for (i = 0; i < LOCKHASH_SIZE; i++)
INIT_LIST_HEAD(lockhash_table + i);
- argc = parse_options(argc, argv, lock_options, lock_usage,
- PARSE_OPT_STOP_AT_NON_OPTION);
+ argc = parse_options_subcommand(argc, argv, lock_options, lock_subcommands,
+ lock_usage, PARSE_OPT_STOP_AT_NON_OPTION);
if (!argc)
usage_with_options(lock_usage, lock_options);
diff --git a/tools/perf/perf-completion.sh b/tools/perf/perf-completion.sh
index f44c04b..ecedab6 100644
--- a/tools/perf/perf-completion.sh
+++ b/tools/perf/perf-completion.sh
@@ -122,7 +122,7 @@ __perf_main ()
evts=$($cmd list --raw-dump)
__perfcomp_colon "$evts" "$cur"
# List subcommands for perf commands
- elif [[ $prev == @(kvm|kmem|mem) ]]; then
+ elif [[ $prev == @(kvm|kmem|mem|lock) ]]; then
subcmds=$($cmd $prev --list-cmds)
__perfcomp_colon "$subcmds" "$cur"
# List long option names
--
1.9.rc0.1.g9d22d25
^ permalink raw reply related [flat|nested] 11+ messages in thread* [tip:perf/core] perf lock: Introduce --list-cmds for use by scripts
2014-03-15 3:17 ` [PATCH 3/4] perf lock: introduce " Ramkumar Ramachandra
@ 2014-04-17 9:57 ` tip-bot for Ramkumar Ramachandra
0 siblings, 0 replies; 11+ messages in thread
From: tip-bot for Ramkumar Ramachandra @ 2014-04-17 9:57 UTC (permalink / raw)
To: linux-tip-commits
Cc: acme, linux-kernel, hpa, mingo, jolsa, dsahern, tglx, artagnon
Commit-ID: a2368c3199eba493d72c6d0e5b804f908a09706c
Gitweb: http://git.kernel.org/tip/a2368c3199eba493d72c6d0e5b804f908a09706c
Author: Ramkumar Ramachandra <artagnon@gmail.com>
AuthorDate: Fri, 14 Mar 2014 23:17:53 -0400
Committer: Jiri Olsa <jolsa@redhat.com>
CommitDate: Wed, 16 Apr 2014 17:16:04 +0200
perf lock: Introduce --list-cmds for use by scripts
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Acked-by: David Ahern <dsahern@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/r/1394853474-31019-4-git-send-email-artagnon@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
---
tools/perf/builtin-lock.c | 10 ++++++----
tools/perf/perf-completion.sh | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c
index c852c7a..6148afc 100644
--- a/tools/perf/builtin-lock.c
+++ b/tools/perf/builtin-lock.c
@@ -961,8 +961,10 @@ int cmd_lock(int argc, const char **argv, const char *prefix __maybe_unused)
"perf lock info [<options>]",
NULL
};
- const char * const lock_usage[] = {
- "perf lock [<options>] {record|report|script|info}",
+ const char *const lock_subcommands[] = { "record", "report", "script",
+ "info", NULL };
+ const char *lock_usage[] = {
+ NULL,
NULL
};
const char * const report_usage[] = {
@@ -976,8 +978,8 @@ int cmd_lock(int argc, const char **argv, const char *prefix __maybe_unused)
for (i = 0; i < LOCKHASH_SIZE; i++)
INIT_LIST_HEAD(lockhash_table + i);
- argc = parse_options(argc, argv, lock_options, lock_usage,
- PARSE_OPT_STOP_AT_NON_OPTION);
+ argc = parse_options_subcommand(argc, argv, lock_options, lock_subcommands,
+ lock_usage, PARSE_OPT_STOP_AT_NON_OPTION);
if (!argc)
usage_with_options(lock_usage, lock_options);
diff --git a/tools/perf/perf-completion.sh b/tools/perf/perf-completion.sh
index f44c04b..ecedab6 100644
--- a/tools/perf/perf-completion.sh
+++ b/tools/perf/perf-completion.sh
@@ -122,7 +122,7 @@ __perf_main ()
evts=$($cmd list --raw-dump)
__perfcomp_colon "$evts" "$cur"
# List subcommands for perf commands
- elif [[ $prev == @(kvm|kmem|mem) ]]; then
+ elif [[ $prev == @(kvm|kmem|mem|lock) ]]; then
subcmds=$($cmd $prev --list-cmds)
__perfcomp_colon "$subcmds" "$cur"
# List long option names
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 4/4] perf sched: introduce --list-cmds for use by scripts
2014-03-15 3:17 [PATCH 0/4] perf: trivial follow-ons to --list-cmds Ramkumar Ramachandra
` (2 preceding siblings ...)
2014-03-15 3:17 ` [PATCH 3/4] perf lock: introduce " Ramkumar Ramachandra
@ 2014-03-15 3:17 ` Ramkumar Ramachandra
2014-04-17 9:57 ` [tip:perf/core] perf sched: Introduce " tip-bot for Ramkumar Ramachandra
2014-03-15 15:49 ` [PATCH 0/4] perf: trivial follow-ons to --list-cmds David Ahern
4 siblings, 1 reply; 11+ messages in thread
From: Ramkumar Ramachandra @ 2014-03-15 3:17 UTC (permalink / raw)
To: LKML; +Cc: David Ahern, Jiri Olsa, Arnaldo Carvalho de Melo
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
tools/perf/builtin-sched.c | 10 ++++++----
tools/perf/perf-completion.sh | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
index 6a76a07..347bd32 100644
--- a/tools/perf/builtin-sched.c
+++ b/tools/perf/builtin-sched.c
@@ -1713,8 +1713,10 @@ int cmd_sched(int argc, const char **argv, const char *prefix __maybe_unused)
"perf sched replay [<options>]",
NULL
};
- const char * const sched_usage[] = {
- "perf sched [<options>] {record|latency|map|replay|script}",
+ const char *const sched_subcommands[] = { "record", "latency", "map",
+ "replay", "script", NULL };
+ const char *sched_usage[] = {
+ NULL,
NULL
};
struct trace_sched_handler lat_ops = {
@@ -1736,8 +1738,8 @@ int cmd_sched(int argc, const char **argv, const char *prefix __maybe_unused)
for (i = 0; i < ARRAY_SIZE(sched.curr_pid); i++)
sched.curr_pid[i] = -1;
- argc = parse_options(argc, argv, sched_options, sched_usage,
- PARSE_OPT_STOP_AT_NON_OPTION);
+ argc = parse_options_subcommand(argc, argv, sched_options, sched_subcommands,
+ sched_usage, PARSE_OPT_STOP_AT_NON_OPTION);
if (!argc)
usage_with_options(sched_usage, sched_options);
diff --git a/tools/perf/perf-completion.sh b/tools/perf/perf-completion.sh
index ecedab6..3356984 100644
--- a/tools/perf/perf-completion.sh
+++ b/tools/perf/perf-completion.sh
@@ -122,7 +122,7 @@ __perf_main ()
evts=$($cmd list --raw-dump)
__perfcomp_colon "$evts" "$cur"
# List subcommands for perf commands
- elif [[ $prev == @(kvm|kmem|mem|lock) ]]; then
+ elif [[ $prev == @(kvm|kmem|mem|lock|sched) ]]; then
subcmds=$($cmd $prev --list-cmds)
__perfcomp_colon "$subcmds" "$cur"
# List long option names
--
1.9.rc0.1.g9d22d25
^ permalink raw reply related [flat|nested] 11+ messages in thread* [tip:perf/core] perf sched: Introduce --list-cmds for use by scripts
2014-03-15 3:17 ` [PATCH 4/4] perf sched: introduce " Ramkumar Ramachandra
@ 2014-04-17 9:57 ` tip-bot for Ramkumar Ramachandra
0 siblings, 0 replies; 11+ messages in thread
From: tip-bot for Ramkumar Ramachandra @ 2014-04-17 9:57 UTC (permalink / raw)
To: linux-tip-commits
Cc: acme, linux-kernel, hpa, mingo, jolsa, dsahern, tglx, artagnon
Commit-ID: a83edb2dfc5989fbadc594109c933bae528a2809
Gitweb: http://git.kernel.org/tip/a83edb2dfc5989fbadc594109c933bae528a2809
Author: Ramkumar Ramachandra <artagnon@gmail.com>
AuthorDate: Fri, 14 Mar 2014 23:17:54 -0400
Committer: Jiri Olsa <jolsa@redhat.com>
CommitDate: Wed, 16 Apr 2014 17:16:05 +0200
perf sched: Introduce --list-cmds for use by scripts
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Acked-by: David Ahern <dsahern@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/r/1394853474-31019-5-git-send-email-artagnon@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
---
tools/perf/builtin-sched.c | 10 ++++++----
tools/perf/perf-completion.sh | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
index 9ac0a49..d3fb0ed 100644
--- a/tools/perf/builtin-sched.c
+++ b/tools/perf/builtin-sched.c
@@ -1713,8 +1713,10 @@ int cmd_sched(int argc, const char **argv, const char *prefix __maybe_unused)
"perf sched replay [<options>]",
NULL
};
- const char * const sched_usage[] = {
- "perf sched [<options>] {record|latency|map|replay|script}",
+ const char *const sched_subcommands[] = { "record", "latency", "map",
+ "replay", "script", NULL };
+ const char *sched_usage[] = {
+ NULL,
NULL
};
struct trace_sched_handler lat_ops = {
@@ -1736,8 +1738,8 @@ int cmd_sched(int argc, const char **argv, const char *prefix __maybe_unused)
for (i = 0; i < ARRAY_SIZE(sched.curr_pid); i++)
sched.curr_pid[i] = -1;
- argc = parse_options(argc, argv, sched_options, sched_usage,
- PARSE_OPT_STOP_AT_NON_OPTION);
+ argc = parse_options_subcommand(argc, argv, sched_options, sched_subcommands,
+ sched_usage, PARSE_OPT_STOP_AT_NON_OPTION);
if (!argc)
usage_with_options(sched_usage, sched_options);
diff --git a/tools/perf/perf-completion.sh b/tools/perf/perf-completion.sh
index ecedab6..3356984 100644
--- a/tools/perf/perf-completion.sh
+++ b/tools/perf/perf-completion.sh
@@ -122,7 +122,7 @@ __perf_main ()
evts=$($cmd list --raw-dump)
__perfcomp_colon "$evts" "$cur"
# List subcommands for perf commands
- elif [[ $prev == @(kvm|kmem|mem|lock) ]]; then
+ elif [[ $prev == @(kvm|kmem|mem|lock|sched) ]]; then
subcmds=$($cmd $prev --list-cmds)
__perfcomp_colon "$subcmds" "$cur"
# List long option names
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 0/4] perf: trivial follow-ons to --list-cmds
2014-03-15 3:17 [PATCH 0/4] perf: trivial follow-ons to --list-cmds Ramkumar Ramachandra
` (3 preceding siblings ...)
2014-03-15 3:17 ` [PATCH 4/4] perf sched: introduce " Ramkumar Ramachandra
@ 2014-03-15 15:49 ` David Ahern
2014-03-27 0:05 ` Ramkumar Ramachandra
4 siblings, 1 reply; 11+ messages in thread
From: David Ahern @ 2014-03-15 15:49 UTC (permalink / raw)
To: Ramkumar Ramachandra, LKML; +Cc: Jiri Olsa, Arnaldo Carvalho de Melo
On 3/14/14, 9:17 PM, Ramkumar Ramachandra wrote:
> Hi,
>
> With "perf kvm: introduce --list-cmds for use by scripts" accepted,
> these are trivial follow-on patches to enable the same functionality
> in kmem, mem, lock, and sched.
>
> Thanks.
>
> Ramkumar Ramachandra (4):
> perf kmem: introduce --list-cmds for use by scripts
> perf mem: introduce --list-cmds for use by scripts
> perf lock: introduce --list-cmds for use by scripts
> perf sched: introduce --list-cmds for use by scripts
>
All 4 look good to me.
Acked-by: David Ahern <dsahern@gmail.com>
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 0/4] perf: trivial follow-ons to --list-cmds
2014-03-15 15:49 ` [PATCH 0/4] perf: trivial follow-ons to --list-cmds David Ahern
@ 2014-03-27 0:05 ` Ramkumar Ramachandra
0 siblings, 0 replies; 11+ messages in thread
From: Ramkumar Ramachandra @ 2014-03-27 0:05 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo; +Cc: LKML, Jiri Olsa, David Ahern
David Ahern wrote:
>> Ramkumar Ramachandra (4):
>> perf kmem: introduce --list-cmds for use by scripts
>> perf mem: introduce --list-cmds for use by scripts
>> perf lock: introduce --list-cmds for use by scripts
>> perf sched: introduce --list-cmds for use by scripts
>>
>
> All 4 look good to me.
>
> Acked-by: David Ahern <dsahern@gmail.com>
Arnaldo: I noticed that you haven't picked these up yet. Let me know
if they're not okay.
Thanks.
Ram
^ permalink raw reply [flat|nested] 11+ messages in thread