Em Thu, Oct 06, 2016 at 12:23:25PM -0700, Andi Kleen escreveu:
> From: Andi Kleen <a...@linux.intel.com>
>
> Add an argument to perf list to only list json events. To be used
> for the command line completion script. This requires adding
> a new flag to the alias structure.
Thanks, applied.
> Signed-off-by: Andi Kleen <a...@linux.intel.com>
> ---
> tools/perf/Documentation/perf-list.txt | 2 +-
> tools/perf/builtin-list.c | 9 ++++++---
> tools/perf/util/parse-events.c | 2 +-
> tools/perf/util/pmu.c | 14 ++++++++++----
> tools/perf/util/pmu.h | 3 ++-
> 5 files changed, 20 insertions(+), 10 deletions(-)
>
> diff --git a/tools/perf/Documentation/perf-list.txt
> b/tools/perf/Documentation/perf-list.txt
> index 41857cce5e86..50a35b27a64d 100644
> --- a/tools/perf/Documentation/perf-list.txt
> +++ b/tools/perf/Documentation/perf-list.txt
> @@ -8,7 +8,7 @@ perf-list - List all symbolic event types
> SYNOPSIS
> --------
> [verse]
> -'perf list' [--no-desc] [--long-desc] [hw|sw|cache|tracepoint|pmu|event_glob]
> +'perf list' [--no-desc] [--long-desc]
> [hw|sw|cache|tracepoint|pmu|json|sdt|event_glob]
>
> DESCRIPTION
> -----------
> diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c
> index ba9322ff858b..b9ccdc7ec733 100644
> --- a/tools/perf/builtin-list.c
> +++ b/tools/perf/builtin-list.c
> @@ -32,7 +32,7 @@ int cmd_list(int argc, const char **argv, const char
> *prefix __maybe_unused)
> OPT_END()
> };
> const char * const list_usage[] = {
> - "perf list [<options>]
> [hw|sw|cache|tracepoint|pmu|sdt|event_glob]",
> + "perf list [<options>]
> [hw|sw|cache|tracepoint|pmu|sdt|json|event_glob]",
> NULL
> };
>
> @@ -69,9 +69,12 @@ int cmd_list(int argc, const char **argv, const char
> *prefix __maybe_unused)
> print_hwcache_events(NULL, raw_dump);
> else if (strcmp(argv[i], "pmu") == 0)
> print_pmu_events(NULL, raw_dump, !desc_flag,
> - long_desc_flag);
> + long_desc_flag, false);
> else if (strcmp(argv[i], "sdt") == 0)
> print_sdt_events(NULL, NULL, raw_dump);
> + else if (strcmp(argv[i], "json") == 0)
> + print_pmu_events(NULL, raw_dump, !desc_flag,
> + long_desc_flag, true);
> else if ((sep = strchr(argv[i], ':')) != NULL) {
> int sep_idx;
>
> @@ -100,7 +103,7 @@ int cmd_list(int argc, const char **argv, const char
> *prefix __maybe_unused)
> event_symbols_sw,
> PERF_COUNT_SW_MAX, raw_dump);
> print_hwcache_events(s, raw_dump);
> print_pmu_events(s, raw_dump, !desc_flag,
> - long_desc_flag);
> + long_desc_flag, false);
> print_tracepoint_events(NULL, s, raw_dump);
> print_sdt_events(NULL, s, raw_dump);
> free(s);
> diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
> index 4e778eae1510..948ef84e4c6a 100644
> --- a/tools/perf/util/parse-events.c
> +++ b/tools/perf/util/parse-events.c
> @@ -2275,7 +2275,7 @@ void print_events(const char *event_glob, bool
> name_only, bool quiet_flag,
>
> print_hwcache_events(event_glob, name_only);
>
> - print_pmu_events(event_glob, name_only, quiet_flag, long_desc);
> + print_pmu_events(event_glob, name_only, quiet_flag, long_desc, false);
>
> if (event_glob != NULL)
> return;
> diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
> index b1474dcadfa2..d8d7d4c0319c 100644
> --- a/tools/perf/util/pmu.c
> +++ b/tools/perf/util/pmu.c
> @@ -224,7 +224,7 @@ static int perf_pmu__parse_snapshot(struct perf_pmu_alias
> *alias,
>
> static int __perf_pmu__new_alias(struct list_head *list, char *dir, char
> *name,
> char *desc, char *val, char *long_desc,
> - char *topic)
> + char *topic, bool json)
> {
> struct perf_pmu_alias *alias;
> int ret;
> @@ -238,6 +238,7 @@ static int __perf_pmu__new_alias(struct list_head *list,
> char *dir, char *name,
> alias->unit[0] = '\0';
> alias->per_pkg = false;
> alias->snapshot = false;
> + alias->json = json;
>
> ret = parse_events_terms(&alias->terms, val);
> if (ret) {
> @@ -278,7 +279,7 @@ static int perf_pmu__new_alias(struct list_head *list,
> char *dir, char *name, FI
>
> buf[ret] = 0;
>
> - return __perf_pmu__new_alias(list, dir, name, NULL, buf, NULL, NULL);
> + return __perf_pmu__new_alias(list, dir, name, NULL, buf, NULL, NULL,
> false);
> }
>
> static inline bool pmu_alias_info_file(char *name)
> @@ -537,7 +538,8 @@ static void pmu_add_cpu_aliases(struct list_head *head)
> /* need type casts to override 'const' */
> __perf_pmu__new_alias(head, NULL, (char *)pe->name,
> (char *)pe->desc, (char *)pe->event,
> - (char *)pe->long_desc, (char *)pe->topic);
> + (char *)pe->long_desc, (char *)pe->topic,
> + true);
> }
>
> out:
> @@ -1103,7 +1105,7 @@ static void wordwrap(char *s, int start, int max, int
> corr)
> }
>
> void print_pmu_events(const char *event_glob, bool name_only, bool
> quiet_flag,
> - bool long_desc)
> + bool long_desc, bool json_only)
> {
> struct perf_pmu *pmu;
> struct perf_pmu_alias *alias;
> @@ -1134,6 +1136,9 @@ void print_pmu_events(const char *event_glob, bool
> name_only, bool quiet_flag,
> format_alias(buf, sizeof(buf), pmu, alias);
> bool is_cpu = !strcmp(pmu->name, "cpu");
>
> + if (json_only && !alias->json)
> + continue;
> +
> if (event_glob != NULL &&
> !(strglobmatch(name, event_glob) ||
> (!is_cpu && strglobmatch(alias->name,
> @@ -1158,6 +1163,7 @@ void print_pmu_events(const char *event_glob, bool
> name_only, bool quiet_flag,
> j++;
> }
> if (pmu->selectable &&
> + !json_only &&
> (event_glob == NULL || strglobmatch(pmu->name,
> event_glob))) {
> char *s;
> if (asprintf(&s, "%s//", pmu->name) < 0)
> diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h
> index 25712034c815..19fa2e19dbe9 100644
> --- a/tools/perf/util/pmu.h
> +++ b/tools/perf/util/pmu.h
> @@ -49,6 +49,7 @@ struct perf_pmu_alias {
> double scale;
> bool per_pkg;
> bool snapshot;
> + bool json;
> };
>
> struct perf_pmu *perf_pmu__find(const char *name);
> @@ -75,7 +76,7 @@ int perf_pmu__format_parse(char *dir, struct list_head
> *head);
> struct perf_pmu *perf_pmu__scan(struct perf_pmu *pmu);
>
> void print_pmu_events(const char *event_glob, bool name_only, bool quiet,
> - bool long_desc);
> + bool long_desc, bool json_only);
> bool pmu_have_event(const char *pname, const char *name);
>
> int perf_pmu__scan_file(struct perf_pmu *pmu, const char *name, const char
> *fmt,
> --
> 2.5.5
