2014-04-11 00:42:41

by Ramkumar Ramachandra

[permalink] [raw]
Subject: [PATCH v2] perf list: Fix --raw-dump argument

While adding usage information, 44d742e (perf list: Add usage,
2013-10-30) broke

$ perf list --raw-dump

Fix this by making raw-dump a subcommand.

Cc: David Ahern <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Arnaldo Carvalho de Melo <[email protected]>
Signed-off-by: Ramkumar Ramachandra <[email protected]>
---
tools/perf/builtin-list.c | 2 +-
tools/perf/perf-completion.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c
index 011195e..c74aef5 100644
--- a/tools/perf/builtin-list.c
+++ b/tools/perf/builtin-list.c
@@ -53,7 +53,7 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
print_hwcache_events(NULL, false);
else if (strcmp(argv[i], "pmu") == 0)
print_pmu_events(NULL, false);
- else if (strcmp(argv[i], "--raw-dump") == 0)
+ else if (strcmp(argv[i], "raw-dump") == 0)
print_events(NULL, true);
else {
char *sep = strchr(argv[i], ':'), *s;
diff --git a/tools/perf/perf-completion.sh b/tools/perf/perf-completion.sh
index ae3a576..8f518f0 100644
--- a/tools/perf/perf-completion.sh
+++ b/tools/perf/perf-completion.sh
@@ -119,7 +119,7 @@ __perf_main ()
fi
# List possible events for -e option
elif [[ $prev == "-e" && "${words[1]}" == @(record|stat|top) ]]; then
- evts=$($cmd list --raw-dump)
+ evts=$($cmd list raw-dump)
__perfcomp_colon "$evts" "$cur"
# List subcommands for 'perf kvm'
elif [[ $prev == "kvm" ]]; then
--
1.9.2.667.ge5b74e1


2014-04-11 10:33:01

by Jiri Olsa

[permalink] [raw]
Subject: Re: [PATCH v2] perf list: Fix --raw-dump argument

On Thu, Apr 10, 2014 at 08:42:33PM -0400, Ramkumar Ramachandra wrote:
> While adding usage information, 44d742e (perf list: Add usage,
> 2013-10-30) broke
>
> $ perf list --raw-dump
>
> Fix this by making raw-dump a subcommand.

you need to update perf-completion.sh now
also please add it to perf list man page as well

thanks,
jirka

>
> Cc: David Ahern <[email protected]>
> Cc: Jiri Olsa <[email protected]>
> Cc: Arnaldo Carvalho de Melo <[email protected]>
> Signed-off-by: Ramkumar Ramachandra <[email protected]>
> ---
> tools/perf/builtin-list.c | 2 +-
> tools/perf/perf-completion.sh | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c
> index 011195e..c74aef5 100644
> --- a/tools/perf/builtin-list.c
> +++ b/tools/perf/builtin-list.c
> @@ -53,7 +53,7 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
> print_hwcache_events(NULL, false);
> else if (strcmp(argv[i], "pmu") == 0)
> print_pmu_events(NULL, false);
> - else if (strcmp(argv[i], "--raw-dump") == 0)
> + else if (strcmp(argv[i], "raw-dump") == 0)
> print_events(NULL, true);
> else {
> char *sep = strchr(argv[i], ':'), *s;
> diff --git a/tools/perf/perf-completion.sh b/tools/perf/perf-completion.sh
> index ae3a576..8f518f0 100644
> --- a/tools/perf/perf-completion.sh
> +++ b/tools/perf/perf-completion.sh
> @@ -119,7 +119,7 @@ __perf_main ()
> fi
> # List possible events for -e option
> elif [[ $prev == "-e" && "${words[1]}" == @(record|stat|top) ]]; then
> - evts=$($cmd list --raw-dump)
> + evts=$($cmd list raw-dump)
> __perfcomp_colon "$evts" "$cur"
> # List subcommands for 'perf kvm'
> elif [[ $prev == "kvm" ]]; then
> --
> 1.9.2.667.ge5b74e1
>

2014-04-11 13:08:45

by Ramkumar Ramachandra

[permalink] [raw]
Subject: Re: [PATCH v2] perf list: Fix --raw-dump argument

Jiri Olsa wrote:
> you need to update perf-completion.sh now
> also please add it to perf list man page as well

I updated perf-completion.sh, although I didn't mention it in the
commit message. I'll add it to the perf-list man page and send out
another version.

Ram

2014-04-11 13:14:06

by Jiri Olsa

[permalink] [raw]
Subject: Re: [PATCH v2] perf list: Fix --raw-dump argument

On Fri, Apr 11, 2014 at 09:08:03AM -0400, Ramkumar Ramachandra wrote:
> Jiri Olsa wrote:
> > you need to update perf-completion.sh now
> > also please add it to perf list man page as well
>
> I updated perf-completion.sh, although I didn't mention it in the
> commit message. I'll add it to the perf-list man page and send out
> another version.

ugh, I'm getting blind.. sry :-\

thanks,
jirka