From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Cc: peterz@infradead.org, maddy@linux.vnet.ibm.com,
linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v21 11/19] perf, tools: Add alias support for long descriptions
Date: Mon, 3 Oct 2016 21:20:51 -0300 [thread overview]
Message-ID: <20161004002051.GB7143@kernel.org> (raw)
In-Reply-To: <1473978296-20712-12-git-send-email-sukadev@linux.vnet.ibm.com>
Em Thu, Sep 15, 2016 at 03:24:48PM -0700, Sukadev Bhattiprolu escreveu:
> Previously we were dropping the useful longer descriptions that some
> events have in the event list completely. Now that jevents provides
> support for longer descriptions (see previous patch), add support for
> parsing the long descriptions
>
> Signed-off-by: Andi Kleen <ak@linux.intel.com>
> Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
> Acked-by: Jiri Olsa <jolsa@redhat.com>
> Acked-by: Ingo Molnar <mingo@kernel.org>
> ---
This patch doesn't build, fixing... probably needs stuff that is in a
following patch.
- Arnaldo
> Changelog[v14]
> - [Jiri Olsa] Break up independent parts of the patch into
> separate patches.
> ---
> tools/perf/util/parse-events.c | 5 +++--
> tools/perf/util/parse-events.h | 3 ++-
> tools/perf/util/pmu.c | 15 ++++++++++-----
> tools/perf/util/pmu.h | 4 +++-
> 4 files changed, 18 insertions(+), 9 deletions(-)
>
> diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
> index a3c7739..9abd60d 100644
> --- a/tools/perf/util/parse-events.c
> +++ b/tools/perf/util/parse-events.c
> @@ -2229,7 +2229,8 @@ out_enomem:
> /*
> * Print the help text for the event symbols:
> */
> -void print_events(const char *event_glob, bool name_only, bool quiet_flag)
> +void print_events(const char *event_glob, bool name_only, bool quiet_flag,
> + bool long_desc)
> {
> print_symbol_events(event_glob, PERF_TYPE_HARDWARE,
> event_symbols_hw, PERF_COUNT_HW_MAX, name_only);
> @@ -2239,7 +2240,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);
> + print_pmu_events(event_glob, name_only, quiet_flag, long_desc);
>
> if (event_glob != NULL)
> return;
> diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
> index 795f2579..7efde4a 100644
> --- a/tools/perf/util/parse-events.h
> +++ b/tools/perf/util/parse-events.h
> @@ -171,7 +171,8 @@ void parse_events_update_lists(struct list_head *list_event,
> void parse_events_evlist_error(struct parse_events_evlist *data,
> int idx, const char *str);
>
> -void print_events(const char *event_glob, bool name_only, bool quiet);
> +void print_events(const char *event_glob, bool name_only, bool quiet,
> + bool long_desc);
>
> struct event_symbol {
> const char *symbol;
> diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
> index 2291d2a..43838b3 100644
> --- a/tools/perf/util/pmu.c
> +++ b/tools/perf/util/pmu.c
> @@ -223,7 +223,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 *desc, char *val, char *long_desc)
> {
> struct perf_pmu_alias *alias;
> int ret;
> @@ -257,6 +257,8 @@ static int __perf_pmu__new_alias(struct list_head *list, char *dir, char *name,
> }
>
> alias->desc = desc ? strdup(desc) : NULL;
> + alias->long_desc = long_desc ? strdup(long_desc) :
> + desc ? strdup(desc) : NULL;
>
> list_add_tail(&alias->list, list);
>
> @@ -274,7 +276,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);
> + return __perf_pmu__new_alias(list, dir, name, NULL, buf, NULL);
> }
>
> static inline bool pmu_alias_info_file(char *name)
> @@ -532,7 +534,8 @@ static int 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->desc, (char *)pe->event,
> + (char *)pe->long_desc);
> }
>
> out:
> @@ -1091,7 +1094,8 @@ 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)
> +void print_pmu_events(const char *event_glob, bool name_only, bool quiet_flag,
> + bool long_desc)
> {
> struct perf_pmu *pmu;
> struct perf_pmu_alias *alias;
> @@ -1139,7 +1143,8 @@ void print_pmu_events(const char *event_glob, bool name_only, bool quiet_flag)
> if (!aliases[j].name)
> goto out_enomem;
>
> - aliases[j].desc = alias->desc;
> + aliases[j].desc = long_desc ? alias->long_desc :
> + alias->desc;
> j++;
> }
> if (pmu->selectable &&
> diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h
> index 42999c7..1aa614e 100644
> --- a/tools/perf/util/pmu.h
> +++ b/tools/perf/util/pmu.h
> @@ -39,6 +39,7 @@ struct perf_pmu_info {
> struct perf_pmu_alias {
> char *name;
> char *desc;
> + char *long_desc;
> struct list_head terms; /* HEAD struct parse_events_term -> list */
> struct list_head list; /* ELEM */
> char unit[UNIT_MAX_LEN+1];
> @@ -70,7 +71,8 @@ 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);
> +void print_pmu_events(const char *event_glob, bool name_only, bool quiet,
> + bool long_desc);
> 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,
> --
> 1.8.3.1
next prev parent reply other threads:[~2016-10-04 0:21 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-15 22:24 [PATCH v21 00/20] perf, tools: Add support for PMU events in JSON format Sukadev Bhattiprolu
2016-09-15 22:24 ` [PATCH v21 01/19] perf, tools: Add jsmn `jasmine' JSON parser Sukadev Bhattiprolu
2016-10-04 8:11 ` [tip:perf/urgent] perf " tip-bot for Andi Kleen
2016-09-15 22:24 ` [PATCH v21 02/19] perf, tools, jevents: Program to convert JSON file to C style file Sukadev Bhattiprolu
2016-09-15 22:24 ` [PATCH v21 03/19] perf, tools: Use pmu_events table to create aliases Sukadev Bhattiprolu
2016-09-27 13:16 ` Arnaldo Carvalho de Melo
2016-10-04 8:12 ` [tip:perf/urgent] perf pmu: " tip-bot for Sukadev Bhattiprolu
2016-09-15 22:24 ` [PATCH v21 04/19] perf, tools: Support CPU ID matching for Powerpc Sukadev Bhattiprolu
2016-10-04 8:13 ` [tip:perf/urgent] perf powerpc: " tip-bot for Sukadev Bhattiprolu
2016-09-15 22:24 ` [PATCH v21 05/19] perf, tools: Support CPU id matching for x86 v2 Sukadev Bhattiprolu
2016-10-04 8:13 ` [tip:perf/urgent] perf " tip-bot for Andi Kleen
2016-09-15 22:24 ` [PATCH v21 06/19] perf, tools: Support alias descriptions Sukadev Bhattiprolu
2016-09-27 17:41 ` Arnaldo Carvalho de Melo
2016-09-27 18:11 ` Sukadev Bhattiprolu
2016-09-28 13:57 ` Arnaldo Carvalho de Melo
2016-09-28 18:29 ` Sukadev Bhattiprolu
2016-09-28 19:08 ` Arnaldo Carvalho de Melo
2016-10-03 20:52 ` Arnaldo Carvalho de Melo
2016-10-04 8:14 ` [tip:perf/urgent] perf pmu: " tip-bot for Andi Kleen
2016-09-15 22:24 ` [PATCH v21 07/19] perf, tools: Query terminal width and use in perf list Sukadev Bhattiprolu
2016-10-04 8:14 ` [tip:perf/urgent] perf " tip-bot for Andi Kleen
2016-09-15 22:24 ` [PATCH v21 08/19] perf, tools: Add a --no-desc flag to " Sukadev Bhattiprolu
2016-10-04 8:15 ` [tip:perf/urgent] perf list: Add a --no-desc flag tip-bot for Andi Kleen
2016-09-15 22:24 ` [PATCH v21 09/19] perf, tools: Add override support for event list CPUID Sukadev Bhattiprolu
2016-10-04 8:15 ` [tip:perf/urgent] perf pmu: " tip-bot for Andi Kleen
2016-09-15 22:24 ` [PATCH v21 10/19] perf, tools, jevents: Add support for long descriptions Sukadev Bhattiprolu
2016-10-04 8:16 ` [tip:perf/urgent] perf " tip-bot for Sukadev Bhattiprolu
2016-09-15 22:24 ` [PATCH v21 11/19] perf, tools: Add alias " Sukadev Bhattiprolu
2016-10-04 0:20 ` Arnaldo Carvalho de Melo [this message]
2016-09-15 22:24 ` [PATCH v21 12/19] perf, tools: Support long descriptions with perf list Sukadev Bhattiprolu
2016-10-04 0:26 ` Arnaldo Carvalho de Melo
2016-10-04 8:16 ` [tip:perf/urgent] perf list: Support long jevents descriptions tip-bot for Sukadev Bhattiprolu
2016-09-15 22:24 ` [PATCH v21 13/19] perf, tools: Add support for event list topics Sukadev Bhattiprolu
2016-10-04 8:16 ` [tip:perf/urgent] perf list jevents: " tip-bot for Andi Kleen
2016-09-15 22:24 ` [PATCH v21 14/19] perf, tools, jevents: Handle header line in mapfile Sukadev Bhattiprolu
2016-10-04 0:36 ` Arnaldo Carvalho de Melo
2016-10-04 8:13 ` [tip:perf/urgent] perf " tip-bot for Andi Kleen
2016-09-15 22:24 ` [PATCH v21 15/19] perf, tools: Add README for info on parsing JSON/map files Sukadev Bhattiprolu
2016-10-04 0:38 ` Arnaldo Carvalho de Melo
2016-10-04 8:17 ` [tip:perf/urgent] perf " tip-bot for Sukadev Bhattiprolu
2016-09-15 22:24 ` [PATCH v21 16/19] perf, tools: Make alias matching case-insensitive Sukadev Bhattiprolu
2016-10-04 0:47 ` Arnaldo Carvalho de Melo
2016-10-04 0:54 ` Arnaldo Carvalho de Melo
2016-10-04 8:19 ` Jiri Olsa
2016-10-04 8:19 ` Jiri Olsa
2016-10-04 8:18 ` [tip:perf/urgent] perf " tip-bot for Andi Kleen
2016-09-15 22:24 ` [PATCH v21 17/19] perf, tools, pmu-events: Fix fixed counters on Intel Sukadev Bhattiprolu
2016-10-04 8:18 ` [tip:perf/urgent] perf " tip-bot for Andi Kleen
2016-09-15 22:24 ` [PATCH v21 18/19] perf, tools, pmu-events: Add Skylake frontend MSR support Sukadev Bhattiprolu
2016-10-04 8:19 ` [tip:perf/urgent] perf " tip-bot for Andi Kleen
2016-09-15 22:24 ` [PATCH v21 19/19] perf, tools: Allow period= in perf stat CPU event descriptions Sukadev Bhattiprolu
2016-10-04 8:17 ` [tip:perf/urgent] perf " tip-bot for Sukadev Bhattiprolu
2016-09-19 16:58 ` [PATCH v21 00/20] perf, tools: Add support for PMU events in JSON format Sukadev Bhattiprolu
2016-09-19 21:20 ` Arnaldo Carvalho de Melo
2016-09-19 23:31 ` Arnaldo Carvalho de Melo
2016-09-19 23:37 ` Arnaldo Carvalho de Melo
2016-09-20 0:02 ` Arnaldo Carvalho de Melo
2016-09-20 0:28 ` Arnaldo Carvalho de Melo
2016-09-22 14:56 ` Arnaldo Carvalho de Melo
2016-09-22 15:00 ` Jiri Olsa
2016-09-22 16:27 ` Jiri Olsa
2016-09-26 8:35 ` Jiri Olsa
2016-09-26 15:03 ` Arnaldo Carvalho de Melo
2016-09-26 16:59 ` Andi Kleen
2016-09-27 14:18 ` Jiri Olsa
2016-09-29 22:19 ` Arnaldo Carvalho de Melo
2016-09-30 9:10 ` Jiri Olsa
2016-10-04 8:10 ` [tip:perf/urgent] tools build: Add support for host programs format tip-bot for Jiri Olsa
2016-10-04 8:11 ` [tip:perf/urgent] tools build: Make fixdep a hostprog tip-bot for Jiri Olsa
2016-10-04 8:12 ` [tip:perf/urgent] perf jevents: Program to convert JSON file tip-bot for Andi Kleen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161004002051.GB7143@kernel.org \
--to=acme@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=maddy@linux.vnet.ibm.com \
--cc=peterz@infradead.org \
--cc=sukadev@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).