* [PATCH 1/1] perf list: Fix --raw-dump option
@ 2014-12-29 17:02 Taesoo Kim
2014-12-30 22:49 ` Arnaldo Carvalho de Melo
0 siblings, 1 reply; 6+ messages in thread
From: Taesoo Kim @ 2014-12-29 17:02 UTC (permalink / raw)
To: Peter Zijlstra, Paul Mackerras, Ingo Molnar,
Arnaldo Carvalho de Melo, linux-kernel
Cc: taesoo, namhyung, Taesoo Kim
Currently, 'perf list --raw-dump' requires extra arguments
(e.g., hw) to invoke, which breaks bash/zsh completion
(perf-completion.sh).
$ perf list --raw-dump
Error: unknown option `raw-dump'
usage: perf list [hw|sw|cache|tracepoint|pmu|event_glob]
After,
$ perf list --raw-dump
cpu-cycles instructions cache-references cache-misses ...
Signed-off-by: Taesoo Kim <tsgatesv@gmail.com>
---
tools/perf/builtin-list.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c
index 011195e..3783c28 100644
--- a/tools/perf/builtin-list.c
+++ b/tools/perf/builtin-list.c
@@ -16,10 +16,13 @@
#include "util/pmu.h"
#include "util/parse-options.h"
+static bool raw_dump = false;
+
int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
{
int i;
- const struct option list_options[] = {
+ struct option list_options[] = {
+ OPT_BOOLEAN(0, "raw-dump", &raw_dump, "Dump raw events"),
OPT_END()
};
const char * const list_usage[] = {
@@ -27,11 +30,18 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
NULL
};
+ set_option_flag(list_options, 0, "raw-dump", PARSE_OPT_HIDDEN);
+
argc = parse_options(argc, argv, list_options, list_usage,
PARSE_OPT_STOP_AT_NON_OPTION);
setup_pager();
+ if (raw_dump) {
+ print_events(NULL, true);
+ return 0;
+ }
+
if (argc == 0) {
print_events(NULL, false);
return 0;
@@ -53,8 +63,6 @@ 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)
- print_events(NULL, true);
else {
char *sep = strchr(argv[i], ':'), *s;
int sep_idx;
--
2.1.3
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 1/1] perf list: Fix --raw-dump option
2014-12-29 17:02 [PATCH 1/1] perf list: Fix --raw-dump option Taesoo Kim
@ 2014-12-30 22:49 ` Arnaldo Carvalho de Melo
0 siblings, 0 replies; 6+ messages in thread
From: Arnaldo Carvalho de Melo @ 2014-12-30 22:49 UTC (permalink / raw)
To: Taesoo Kim
Cc: Peter Zijlstra, Paul Mackerras, Ingo Molnar, linux-kernel, taesoo,
namhyung
Em Mon, Dec 29, 2014 at 12:02:50PM -0500, Taesoo Kim escreveu:
> Currently, 'perf list --raw-dump' requires extra arguments
> (e.g., hw) to invoke, which breaks bash/zsh completion
> (perf-completion.sh).
>
> $ perf list --raw-dump
> Error: unknown option `raw-dump'
>
> usage: perf list [hw|sw|cache|tracepoint|pmu|event_glob]
>
> After,
>
> $ perf list --raw-dump
> cpu-cycles instructions cache-references cache-misses ...
>
> Signed-off-by: Taesoo Kim <tsgatesv@gmail.com>
> ---
> tools/perf/builtin-list.c | 14 +++++++++++---
> 1 file changed, 11 insertions(+), 3 deletions(-)
>
> diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c
> index 011195e..3783c28 100644
> --- a/tools/perf/builtin-list.c
> +++ b/tools/perf/builtin-list.c
> @@ -16,10 +16,13 @@
> #include "util/pmu.h"
> #include "util/parse-options.h"
>
> +static bool raw_dump = false;
> +
Why does this need to be a global static variable? Can't it be moved
to...
> int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
> {
> int i;
... here?
+ bool raw_dump = false;
> - const struct option list_options[] = {
> + struct option list_options[] = {
> + OPT_BOOLEAN(0, "raw-dump", &raw_dump, "Dump raw events"),
> OPT_END()
> };
> const char * const list_usage[] = {
> @@ -27,11 +30,18 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
> NULL
> };
>
> + set_option_flag(list_options, 0, "raw-dump", PARSE_OPT_HIDDEN);
> +
> argc = parse_options(argc, argv, list_options, list_usage,
> PARSE_OPT_STOP_AT_NON_OPTION);
>
> setup_pager();
>
> + if (raw_dump) {
> + print_events(NULL, true);
> + return 0;
> + }
> +
> if (argc == 0) {
> print_events(NULL, false);
> return 0;
> @@ -53,8 +63,6 @@ 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)
> - print_events(NULL, true);
> else {
> char *sep = strchr(argv[i], ':'), *s;
> int sep_idx;
> --
> 2.1.3
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/1] perf list: Fix --raw-dump option
@ 2014-12-31 3:36 Taesoo Kim
2014-12-31 3:53 ` Namhyung Kim
0 siblings, 1 reply; 6+ messages in thread
From: Taesoo Kim @ 2014-12-31 3:36 UTC (permalink / raw)
To: Peter Zijlstra, Paul Mackerras, Ingo Molnar,
Arnaldo Carvalho de Melo, linux-kernel
Cc: taesoo, namhyung, arnaldo.melo, Taesoo Kim
Currently, 'perf list --raw-dump' requires extra arguments
(e.g., hw) to invoke, which breaks bash/zsh completion
(perf-completion.sh).
$ perf list --raw-dump
Error: unknown option `raw-dump'
usage: perf list [hw|sw|cache|tracepoint|pmu|event_glob]
After,
$ perf list --raw-dump
cpu-cycles instructions cache-references cache-misses ...
Signed-off-by: Taesoo Kim <tsgatesv@gmail.com>
---
tools/perf/builtin-list.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c
index 011195e..198f3c3 100644
--- a/tools/perf/builtin-list.c
+++ b/tools/perf/builtin-list.c
@@ -19,7 +19,9 @@
int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
{
int i;
- const struct option list_options[] = {
+ bool raw_dump = false;
+ struct option list_options[] = {
+ OPT_BOOLEAN(0, "raw-dump", &raw_dump, "Dump raw events"),
OPT_END()
};
const char * const list_usage[] = {
@@ -27,11 +29,18 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
NULL
};
+ set_option_flag(list_options, 0, "raw-dump", PARSE_OPT_HIDDEN);
+
argc = parse_options(argc, argv, list_options, list_usage,
PARSE_OPT_STOP_AT_NON_OPTION);
setup_pager();
+ if (raw_dump) {
+ print_events(NULL, true);
+ return 0;
+ }
+
if (argc == 0) {
print_events(NULL, false);
return 0;
@@ -53,8 +62,6 @@ 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)
- print_events(NULL, true);
else {
char *sep = strchr(argv[i], ':'), *s;
int sep_idx;
--
2.2.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 1/1] perf list: Fix --raw-dump option
2014-12-31 3:36 Taesoo Kim
@ 2014-12-31 3:53 ` Namhyung Kim
0 siblings, 0 replies; 6+ messages in thread
From: Namhyung Kim @ 2014-12-31 3:53 UTC (permalink / raw)
To: Taesoo Kim
Cc: Peter Zijlstra, Paul Mackerras, Ingo Molnar,
Arnaldo Carvalho de Melo, linux-kernel, taesoo, arnaldo.melo
Hi Taesoo,
On Tue, Dec 30, 2014 at 10:36:55PM -0500, Taesoo Kim wrote:
> Currently, 'perf list --raw-dump' requires extra arguments
> (e.g., hw) to invoke, which breaks bash/zsh completion
> (perf-completion.sh).
>
> $ perf list --raw-dump
> Error: unknown option `raw-dump'
>
> usage: perf list [hw|sw|cache|tracepoint|pmu|event_glob]
>
> After,
>
> $ perf list --raw-dump
> cpu-cycles instructions cache-references cache-misses ...
>
> Signed-off-by: Taesoo Kim <tsgatesv@gmail.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Thanks,
Namhyung
> ---
> tools/perf/builtin-list.c | 13 ++++++++++---
> 1 file changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c
> index 011195e..198f3c3 100644
> --- a/tools/perf/builtin-list.c
> +++ b/tools/perf/builtin-list.c
> @@ -19,7 +19,9 @@
> int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
> {
> int i;
> - const struct option list_options[] = {
> + bool raw_dump = false;
> + struct option list_options[] = {
> + OPT_BOOLEAN(0, "raw-dump", &raw_dump, "Dump raw events"),
> OPT_END()
> };
> const char * const list_usage[] = {
> @@ -27,11 +29,18 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
> NULL
> };
>
> + set_option_flag(list_options, 0, "raw-dump", PARSE_OPT_HIDDEN);
> +
> argc = parse_options(argc, argv, list_options, list_usage,
> PARSE_OPT_STOP_AT_NON_OPTION);
>
> setup_pager();
>
> + if (raw_dump) {
> + print_events(NULL, true);
> + return 0;
> + }
> +
> if (argc == 0) {
> print_events(NULL, false);
> return 0;
> @@ -53,8 +62,6 @@ 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)
> - print_events(NULL, true);
> else {
> char *sep = strchr(argv[i], ':'), *s;
> int sep_idx;
> --
> 2.2.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/1] perf list: Fix --raw-dump option
@ 2014-12-27 4:29 Taesoo Kim
2014-12-29 7:32 ` Namhyung Kim
0 siblings, 1 reply; 6+ messages in thread
From: Taesoo Kim @ 2014-12-27 4:29 UTC (permalink / raw)
To: Peter Zijlstra, Paul Mackerras, Ingo Molnar,
Arnaldo Carvalho de Melo, linux-kernel
Cc: taesoo, Taesoo Kim
Currently, 'perf list --raw-dump' requires extra arguments
(e.g., hw) to invoke, which breaks bash/zsh completion
(perf-completion.sh).
$ perf list --raw-dump
Error: unknown option `raw-dump'
usage: perf list [hw|sw|cache|tracepoint|pmu|event_glob]
After,
$ perf list --raw-dump
cpu-cycles instructions cache-references cache-misses ...
Signed-off-by: Taesoo Kim <tsgatesv@gmail.com>
---
tools/perf/builtin-list.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c
index 011195e..ec76bee 100644
--- a/tools/perf/builtin-list.c
+++ b/tools/perf/builtin-list.c
@@ -16,14 +16,17 @@
#include "util/pmu.h"
#include "util/parse-options.h"
+static bool raw_dump = false;
+
int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
{
int i;
const struct option list_options[] = {
+ OPT_BOOLEAN(0, "raw-dump", &raw_dump, "Dump raw events"),
OPT_END()
};
const char * const list_usage[] = {
- "perf list [hw|sw|cache|tracepoint|pmu|event_glob]",
+ "perf list [hw|sw|cache|tracepoint|pmu|event_glob|--raw-dump]",
NULL
};
@@ -32,6 +35,11 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
setup_pager();
+ if (raw_dump) {
+ print_events(NULL, true);
+ return 0;
+ }
+
if (argc == 0) {
print_events(NULL, false);
return 0;
@@ -53,8 +61,6 @@ 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)
- print_events(NULL, true);
else {
char *sep = strchr(argv[i], ':'), *s;
int sep_idx;
--
2.1.3
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 1/1] perf list: Fix --raw-dump option
2014-12-27 4:29 Taesoo Kim
@ 2014-12-29 7:32 ` Namhyung Kim
0 siblings, 0 replies; 6+ messages in thread
From: Namhyung Kim @ 2014-12-29 7:32 UTC (permalink / raw)
To: Taesoo Kim
Cc: Peter Zijlstra, Paul Mackerras, Ingo Molnar,
Arnaldo Carvalho de Melo, linux-kernel, taesoo
Hi Taesoo,
On Fri, Dec 26, 2014 at 11:29:33PM -0500, Taesoo Kim wrote:
> Currently, 'perf list --raw-dump' requires extra arguments
> (e.g., hw) to invoke, which breaks bash/zsh completion
> (perf-completion.sh).
>
> $ perf list --raw-dump
> Error: unknown option `raw-dump'
>
> usage: perf list [hw|sw|cache|tracepoint|pmu|event_glob]
>
> After,
>
> $ perf list --raw-dump
> cpu-cycles instructions cache-references cache-misses ...
>
> Signed-off-by: Taesoo Kim <tsgatesv@gmail.com>
Thanks for fixing this. Actually the --raw-dump option is intended to
support shell completion and not to be used directly. I didn't update
the completion script for a while so didn't notice it. It seems like
recent updates of the option parsing code broke this.
> ---
> tools/perf/builtin-list.c | 12 +++++++++---
> 1 file changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c
> index 011195e..ec76bee 100644
> --- a/tools/perf/builtin-list.c
> +++ b/tools/perf/builtin-list.c
> @@ -16,14 +16,17 @@
> #include "util/pmu.h"
> #include "util/parse-options.h"
>
> +static bool raw_dump = false;
> +
> int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
> {
> int i;
> const struct option list_options[] = {
> + OPT_BOOLEAN(0, "raw-dump", &raw_dump, "Dump raw events"),
> OPT_END()
> };
> const char * const list_usage[] = {
> - "perf list [hw|sw|cache|tracepoint|pmu|event_glob]",
> + "perf list [hw|sw|cache|tracepoint|pmu|event_glob|--raw-dump]",
> NULL
> };
So I'd like to keep the usage string as is and mark the option as
hidden - i.e. using set_option_flag(list_options, 0, "raw-dump",
PARSE_OPT_HIDDEN) before calling to parse_options().
With that,
Acked-by: Namhyung Kim <namhyung@kernel.org>
Thanks,
Namhyung
>
> @@ -32,6 +35,11 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
>
> setup_pager();
>
> + if (raw_dump) {
> + print_events(NULL, true);
> + return 0;
> + }
> +
> if (argc == 0) {
> print_events(NULL, false);
> return 0;
> @@ -53,8 +61,6 @@ 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)
> - print_events(NULL, true);
> else {
> char *sep = strchr(argv[i], ':'), *s;
> int sep_idx;
> --
> 2.1.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-12-31 3:52 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-29 17:02 [PATCH 1/1] perf list: Fix --raw-dump option Taesoo Kim
2014-12-30 22:49 ` Arnaldo Carvalho de Melo
-- strict thread matches above, loose matches on Subject: below --
2014-12-31 3:36 Taesoo Kim
2014-12-31 3:53 ` Namhyung Kim
2014-12-27 4:29 Taesoo Kim
2014-12-29 7:32 ` Namhyung Kim
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox