From: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> To: mingo@redhat.com, ak@linux.intel.com, Michael Ellerman <mpe@ellerman.id.au>, Jiri Olsa <jolsa@redhat.com>, Arnaldo Carvalho de Melo <acme@kernel.org> Cc: peterz@infradead.org, namhyung@kernel.org, linuxppc-dev@lists.ozlabs.org, <linux-kernel@vger.kernel.org> Subject: [PATCH v9 03/11] perf, tools, list: Update perf list to output descriptions Date: Mon, 13 Apr 2015 23:40:56 -0700 [thread overview] Message-ID: <1428993665-2133-4-git-send-email-sukadev@linux.vnet.ibm.com> (raw) In-Reply-To: <1428993665-2133-1-git-send-email-sukadev@linux.vnet.ibm.com> From: Andi Kleen <ak@linux.intel.com> Add support to perf list to print aliases with descriptions. Support word wrapping for descriptions. Fix up the sorting code to put aliases with descriptions last. Signed-off-by: Andi Kleen <ak@linux.intel.com> Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> --- Changelov[v9] by Sukadev Bhattiprolu Rebase to 4.0 and fix conflicts in tools/perf/util/pmu.c --- tools/perf/util/pmu.c | 86 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 70 insertions(+), 16 deletions(-) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 527da74..623b107 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -877,11 +877,51 @@ static char *format_alias_or(char *buf, int len, struct perf_pmu *pmu, return buf; } -static int cmp_string(const void *a, const void *b) +struct pair { + char *name; + char *desc; +}; + +static int cmp_pair(const void *a, const void *b) { - const char * const *as = a; - const char * const *bs = b; - return strcmp(*as, *bs); + const struct pair *as = a; + const struct pair *bs = b; + + /* Put downloaded event list last */ + if (!!as->desc != !!bs->desc) + return !!as->desc - !!bs->desc; + return strcmp(as->name, bs->name); +} + +static void wordwrap(char *s, int start, int max, int corr) +{ + int column = start; + int n; + + while (*s) { + int wlen = strcspn(s, " \t"); + + if (column + wlen >= max && column > start) { + printf("\n%*s", start, ""); + column = start + corr; + } + n = printf("%s%.*s", column > start ? " " : "", wlen, s); + if (n <= 0) + break; + s += wlen; + column += n; + while (isspace(*s)) + s++; + } +} + +static int get_columns(void) +{ + /* + * Should ask the terminal with TIOCGWINSZ here, but we + * need the original fd before the pager. + */ + return 79; } void print_pmu_events(const char *event_glob, bool name_only) @@ -891,7 +931,9 @@ void print_pmu_events(const char *event_glob, bool name_only) char buf[1024]; int printed = 0; int len, j; - char **aliases; + struct pair *aliases; + int numdesc = 0; + int columns = get_columns(); pmu = NULL; len = 0; @@ -901,14 +943,15 @@ void print_pmu_events(const char *event_glob, bool name_only) if (pmu->selectable) len++; } - aliases = zalloc(sizeof(char *) * len); + aliases = zalloc(sizeof(struct pair) * len); if (!aliases) goto out_enomem; pmu = NULL; j = 0; while ((pmu = perf_pmu__scan(pmu)) != NULL) { list_for_each_entry(alias, &pmu->aliases, list) { - char *name = format_alias(buf, sizeof(buf), pmu, alias); + char *name = alias->desc ? alias->name : + format_alias(buf, sizeof(buf), pmu, alias); bool is_cpu = !strcmp(pmu->name, "cpu"); if (event_glob != NULL && @@ -917,11 +960,14 @@ void print_pmu_events(const char *event_glob, bool name_only) event_glob)))) continue; - if (is_cpu && !name_only) - name = format_alias_or(buf, sizeof(buf), pmu, alias); + aliases[j].name = name; + if (is_cpu && !name_only && !alias->desc) + aliases[j].name = format_alias_or(buf, + sizeof(buf), pmu, alias); - aliases[j] = strdup(name); - if (aliases[j] == NULL) + aliases[j].name = strdup(aliases[j].name); + aliases[j].desc = alias->desc; + if (aliases[j].name == NULL) goto out_enomem; j++; } @@ -929,25 +975,33 @@ void print_pmu_events(const char *event_glob, bool name_only) char *s; if (asprintf(&s, "%s//", pmu->name) < 0) goto out_enomem; - aliases[j] = s; + aliases[j].name = s; j++; } } len = j; - qsort(aliases, len, sizeof(char *), cmp_string); + qsort(aliases, len, sizeof(struct pair), cmp_pair); for (j = 0; j < len; j++) { if (name_only) { - printf("%s ", aliases[j]); + printf("%s ", aliases[j].name); continue; } - printf(" %-50s [Kernel PMU event]\n", aliases[j]); + if (aliases[j].desc) { + if (numdesc++ == 0 && printed) + printf("\n"); + printf(" %-50s [", aliases[j].name); + wordwrap(aliases[j].desc, 53, columns, 1); + printf("]\n"); + } else + printf(" %-50s [Kernel PMU event]\n", aliases[j].name); + zfree(&aliases[j].name); printed++; } if (printed) printf("\n"); out_free: for (j = 0; j < len; j++) - zfree(&aliases[j]); + zfree(&aliases[j].name); zfree(&aliases); return; -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> To: mingo@redhat.com, ak@linux.intel.com, Michael Ellerman <mpe@ellerman.id.au>, Jiri Olsa <jolsa@redhat.com>, Arnaldo Carvalho de Melo <acme@kernel.org> Cc: peterz@infradead.org, namhyung@kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH v9 03/11] perf, tools, list: Update perf list to output descriptions Date: Mon, 13 Apr 2015 23:40:56 -0700 [thread overview] Message-ID: <1428993665-2133-4-git-send-email-sukadev@linux.vnet.ibm.com> (raw) In-Reply-To: <1428993665-2133-1-git-send-email-sukadev@linux.vnet.ibm.com> From: Andi Kleen <ak@linux.intel.com> Add support to perf list to print aliases with descriptions. Support word wrapping for descriptions. Fix up the sorting code to put aliases with descriptions last. Signed-off-by: Andi Kleen <ak@linux.intel.com> Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> --- Changelov[v9] by Sukadev Bhattiprolu Rebase to 4.0 and fix conflicts in tools/perf/util/pmu.c --- tools/perf/util/pmu.c | 86 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 70 insertions(+), 16 deletions(-) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 527da74..623b107 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -877,11 +877,51 @@ static char *format_alias_or(char *buf, int len, struct perf_pmu *pmu, return buf; } -static int cmp_string(const void *a, const void *b) +struct pair { + char *name; + char *desc; +}; + +static int cmp_pair(const void *a, const void *b) { - const char * const *as = a; - const char * const *bs = b; - return strcmp(*as, *bs); + const struct pair *as = a; + const struct pair *bs = b; + + /* Put downloaded event list last */ + if (!!as->desc != !!bs->desc) + return !!as->desc - !!bs->desc; + return strcmp(as->name, bs->name); +} + +static void wordwrap(char *s, int start, int max, int corr) +{ + int column = start; + int n; + + while (*s) { + int wlen = strcspn(s, " \t"); + + if (column + wlen >= max && column > start) { + printf("\n%*s", start, ""); + column = start + corr; + } + n = printf("%s%.*s", column > start ? " " : "", wlen, s); + if (n <= 0) + break; + s += wlen; + column += n; + while (isspace(*s)) + s++; + } +} + +static int get_columns(void) +{ + /* + * Should ask the terminal with TIOCGWINSZ here, but we + * need the original fd before the pager. + */ + return 79; } void print_pmu_events(const char *event_glob, bool name_only) @@ -891,7 +931,9 @@ void print_pmu_events(const char *event_glob, bool name_only) char buf[1024]; int printed = 0; int len, j; - char **aliases; + struct pair *aliases; + int numdesc = 0; + int columns = get_columns(); pmu = NULL; len = 0; @@ -901,14 +943,15 @@ void print_pmu_events(const char *event_glob, bool name_only) if (pmu->selectable) len++; } - aliases = zalloc(sizeof(char *) * len); + aliases = zalloc(sizeof(struct pair) * len); if (!aliases) goto out_enomem; pmu = NULL; j = 0; while ((pmu = perf_pmu__scan(pmu)) != NULL) { list_for_each_entry(alias, &pmu->aliases, list) { - char *name = format_alias(buf, sizeof(buf), pmu, alias); + char *name = alias->desc ? alias->name : + format_alias(buf, sizeof(buf), pmu, alias); bool is_cpu = !strcmp(pmu->name, "cpu"); if (event_glob != NULL && @@ -917,11 +960,14 @@ void print_pmu_events(const char *event_glob, bool name_only) event_glob)))) continue; - if (is_cpu && !name_only) - name = format_alias_or(buf, sizeof(buf), pmu, alias); + aliases[j].name = name; + if (is_cpu && !name_only && !alias->desc) + aliases[j].name = format_alias_or(buf, + sizeof(buf), pmu, alias); - aliases[j] = strdup(name); - if (aliases[j] == NULL) + aliases[j].name = strdup(aliases[j].name); + aliases[j].desc = alias->desc; + if (aliases[j].name == NULL) goto out_enomem; j++; } @@ -929,25 +975,33 @@ void print_pmu_events(const char *event_glob, bool name_only) char *s; if (asprintf(&s, "%s//", pmu->name) < 0) goto out_enomem; - aliases[j] = s; + aliases[j].name = s; j++; } } len = j; - qsort(aliases, len, sizeof(char *), cmp_string); + qsort(aliases, len, sizeof(struct pair), cmp_pair); for (j = 0; j < len; j++) { if (name_only) { - printf("%s ", aliases[j]); + printf("%s ", aliases[j].name); continue; } - printf(" %-50s [Kernel PMU event]\n", aliases[j]); + if (aliases[j].desc) { + if (numdesc++ == 0 && printed) + printf("\n"); + printf(" %-50s [", aliases[j].name); + wordwrap(aliases[j].desc, 53, columns, 1); + printf("]\n"); + } else + printf(" %-50s [Kernel PMU event]\n", aliases[j].name); + zfree(&aliases[j].name); printed++; } if (printed) printf("\n"); out_free: for (j = 0; j < len; j++) - zfree(&aliases[j]); + zfree(&aliases[j].name); zfree(&aliases); return; -- 1.7.9.5
next prev parent reply other threads:[~2015-04-14 6:41 UTC|newest] Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-04-14 6:40 [PATCH v9 00/11] Add support for JSON event files Sukadev Bhattiprolu 2015-04-14 6:40 ` Sukadev Bhattiprolu 2015-04-14 6:40 ` [PATCH v9 01/11] perf, tools: Add jsmn `jasmine' JSON parser Sukadev Bhattiprolu 2015-04-14 6:40 ` Sukadev Bhattiprolu 2015-04-14 6:40 ` [PATCH v9 02/11] perf, tools: Add support for text descriptions of events and alias add Sukadev Bhattiprolu 2015-04-14 6:40 ` Sukadev Bhattiprolu 2015-04-14 6:40 ` Sukadev Bhattiprolu [this message] 2015-04-14 6:40 ` [PATCH v9 03/11] perf, tools, list: Update perf list to output descriptions Sukadev Bhattiprolu 2015-04-14 6:40 ` [PATCH v9 04/11] perf, tools: Add support for reading JSON event files Sukadev Bhattiprolu 2015-04-14 6:40 ` Sukadev Bhattiprolu 2015-04-14 6:40 ` [PATCH v9 05/11] perf, tools: Automatically look for event file name for cpu Sukadev Bhattiprolu 2015-04-14 6:40 ` Sukadev Bhattiprolu 2015-04-14 6:40 ` [PATCH v9 06/11] powerpc/perf: Implement get_cpu_str() Sukadev Bhattiprolu 2015-04-14 6:40 ` Sukadev Bhattiprolu 2015-04-14 6:41 ` [PATCH v9 07/11] perf, tools: Query terminal width and use in perf list Sukadev Bhattiprolu 2015-04-14 6:41 ` Sukadev Bhattiprolu 2015-04-14 6:41 ` [PATCH v9 08/11] perf, tools: Add a new pmu interface to iterate over all events Sukadev Bhattiprolu 2015-04-14 6:41 ` Sukadev Bhattiprolu 2015-04-14 6:41 ` [PATCH v9 09/11] perf, tools, test: Add test case for alias and JSON parsing Sukadev Bhattiprolu 2015-04-14 6:41 ` Sukadev Bhattiprolu 2015-04-14 6:41 ` [PATCH v9 10/11] perf, tools: Add a --no-desc flag to perf list Sukadev Bhattiprolu 2015-04-14 6:41 ` Sukadev Bhattiprolu 2015-04-14 6:41 ` [PATCH v9 11/11] perf-download: Download the events json file Sukadev Bhattiprolu 2015-04-14 6:41 ` Sukadev Bhattiprolu 2015-04-14 8:55 ` 'perf upgrade' (was: Re: [PATCH v9 00/11] Add support for JSON event files.) Ingo Molnar 2015-04-14 8:55 ` Ingo Molnar 2015-04-14 11:21 ` Michael Ellerman 2015-04-14 11:21 ` Michael Ellerman 2015-04-14 12:58 ` Ingo Molnar 2015-04-14 12:58 ` Ingo Molnar 2015-04-14 18:03 ` Sukadev Bhattiprolu 2015-04-14 18:03 ` Sukadev Bhattiprolu 2015-04-14 22:53 ` Michael Ellerman 2015-04-14 22:53 ` Michael Ellerman 2015-04-15 9:25 ` Ingo Molnar 2015-04-15 9:25 ` Ingo Molnar 2015-04-15 19:17 ` Andi Kleen 2015-04-15 19:17 ` Andi Kleen 2015-04-15 20:50 ` Sukadev Bhattiprolu 2015-04-15 20:50 ` Sukadev Bhattiprolu 2015-04-17 15:31 ` Jiri Olsa 2015-04-17 15:31 ` Jiri Olsa 2015-04-17 20:09 ` Andi Kleen 2015-04-17 20:09 ` Andi Kleen 2015-04-18 13:05 ` Jiri Olsa 2015-04-18 13:05 ` Jiri Olsa 2015-04-18 13:12 ` Jiri Olsa 2015-04-18 13:12 ` Jiri Olsa 2015-04-14 20:16 ` Andi Kleen 2015-04-14 20:16 ` 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=1428993665-2133-4-git-send-email-sukadev@linux.vnet.ibm.com \ --to=sukadev@linux.vnet.ibm.com \ --cc=acme@kernel.org \ --cc=ak@linux.intel.com \ --cc=jolsa@redhat.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=mingo@redhat.com \ --cc=mpe@ellerman.id.au \ --cc=namhyung@kernel.org \ --cc=peterz@infradead.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.