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, maddy@linux.vnet.ibm.com,
linuxppc-dev@lists.ozlabs.org, <linux-kernel@vger.kernel.org>
Subject: [PATCH v20 10/20] perf, tools, jevents: Add support for long descriptions
Date: Mon, 20 Jun 2016 21:02:40 -0700 [thread overview]
Message-ID: <1466481770-25290-11-git-send-email-sukadev@linux.vnet.ibm.com> (raw)
In-Reply-To: <1466481770-25290-1-git-send-email-sukadev@linux.vnet.ibm.com>
Implement support in jevents to parse long descriptions for events
that may have them in the JSON files. A follow on patch will make this
long description available to user through the 'perf list' command.
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>
---
Changelog[v14]
- [Jiri Olsa] Break up independent parts of the patch into
separate patches.
---
tools/perf/pmu-events/jevents.c | 32 ++++++++++++++++++++++++--------
tools/perf/pmu-events/jevents.h | 3 ++-
tools/perf/pmu-events/pmu-events.h | 1 +
3 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c
index aeafa82..51b864a 100644
--- a/tools/perf/pmu-events/jevents.c
+++ b/tools/perf/pmu-events/jevents.c
@@ -203,7 +203,7 @@ static void print_events_table_prefix(FILE *fp, const char *tblname)
}
static int print_events_table_entry(void *data, char *name, char *event,
- char *desc)
+ char *desc, char *long_desc)
{
FILE *outfp = data;
/*
@@ -215,6 +215,8 @@ static int print_events_table_entry(void *data, char *name, char *event,
fprintf(outfp, "\t.name = \"%s\",\n", name);
fprintf(outfp, "\t.event = \"%s\",\n", event);
fprintf(outfp, "\t.desc = \"%s\",\n", desc);
+ if (long_desc && long_desc[0])
+ fprintf(outfp, "\t.long_desc = \"%s\",\n", long_desc);
fprintf(outfp, "},\n");
@@ -235,7 +237,8 @@ static void print_events_table_suffix(FILE *outfp)
/* Call func with each event in the json file */
int json_events(const char *fn,
- int (*func)(void *data, char *name, char *event, char *desc),
+ int (*func)(void *data, char *name, char *event, char *desc,
+ char *long_desc),
void *data)
{
int err = -EIO;
@@ -254,6 +257,8 @@ int json_events(const char *fn,
tok = tokens + 1;
for (i = 0; i < tokens->size; i++) {
char *event = NULL, *desc = NULL, *name = NULL;
+ char *long_desc = NULL;
+ char *extra_desc = NULL;
struct msrmap *msr = NULL;
jsmntok_t *msrval = NULL;
jsmntok_t *precise = NULL;
@@ -279,6 +284,10 @@ int json_events(const char *fn,
} else if (json_streq(map, field, "BriefDescription")) {
addfield(map, &desc, "", "", val);
fixdesc(desc);
+ } else if (json_streq(map, field,
+ "PublicDescription")) {
+ addfield(map, &long_desc, "", "", val);
+ fixdesc(long_desc);
} else if (json_streq(map, field, "PEBS") && nz) {
precise = val;
} else if (json_streq(map, field, "MSRIndex") && nz) {
@@ -287,10 +296,10 @@ int json_events(const char *fn,
msrval = val;
} else if (json_streq(map, field, "Errata") &&
!json_streq(map, val, "null")) {
- addfield(map, &desc, ". ",
+ addfield(map, &extra_desc, ". ",
" Spec update: ", val);
} else if (json_streq(map, field, "Data_LA") && nz) {
- addfield(map, &desc, ". ",
+ addfield(map, &extra_desc, ". ",
" Supports address when precise",
NULL);
}
@@ -298,19 +307,26 @@ int json_events(const char *fn,
}
if (precise && !strstr(desc, "(Precise Event)")) {
if (json_streq(map, precise, "2"))
- addfield(map, &desc, " ", "(Must be precise)",
- NULL);
+ addfield(map, &extra_desc, " ",
+ "(Must be precise)", NULL);
else
- addfield(map, &desc, " ",
+ addfield(map, &extra_desc, " ",
"(Precise event)", NULL);
}
+ if (desc && extra_desc)
+ addfield(map, &desc, " ", extra_desc, NULL);
+ if (long_desc && extra_desc)
+ addfield(map, &long_desc, " ", extra_desc, NULL);
if (msr != NULL)
addfield(map, &event, ",", msr->pname, msrval);
fixname(name);
- err = func(data, name, event, desc);
+
+ err = func(data, name, event, desc, long_desc);
free(event);
free(desc);
free(name);
+ free(long_desc);
+ free(extra_desc);
if (err)
break;
tok += j;
diff --git a/tools/perf/pmu-events/jevents.h b/tools/perf/pmu-events/jevents.h
index 996601f..b0eb274 100644
--- a/tools/perf/pmu-events/jevents.h
+++ b/tools/perf/pmu-events/jevents.h
@@ -2,7 +2,8 @@
#define JEVENTS_H 1
int json_events(const char *fn,
- int (*func)(void *data, char *name, char *event, char *desc),
+ int (*func)(void *data, char *name, char *event, char *desc,
+ char *long_desc),
void *data);
char *get_cpu_str(void);
diff --git a/tools/perf/pmu-events/pmu-events.h b/tools/perf/pmu-events/pmu-events.h
index 39fec04..711f049 100644
--- a/tools/perf/pmu-events/pmu-events.h
+++ b/tools/perf/pmu-events/pmu-events.h
@@ -8,6 +8,7 @@ struct pmu_event {
const char *name;
const char *event;
const char *desc;
+ const char *long_desc;
};
/*
--
2.5.3
next prev parent reply other threads:[~2016-06-21 8:29 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-21 4:02 [PATCH v20 00/20] perf, tools: Add support for PMU events in JSON format Sukadev Bhattiprolu
2016-06-21 4:02 ` [PATCH v20 01/20] perf, tools: Add jsmn `jasmine' JSON parser Sukadev Bhattiprolu
2016-06-21 4:02 ` [PATCH v20 02/20] perf, tools, jevents: Program to convert JSON file to C style file Sukadev Bhattiprolu
2016-06-21 4:02 ` [PATCH v20 03/20] perf, tools: Use pmu_events table to create aliases Sukadev Bhattiprolu
2016-06-21 4:02 ` [PATCH v20 04/20] perf, tools: Support CPU ID matching for Powerpc Sukadev Bhattiprolu
2016-06-21 4:02 ` [PATCH v20 05/20] perf, tools: Support CPU id matching for x86 v2 Sukadev Bhattiprolu
2016-06-21 4:02 ` [PATCH v20 06/20] perf, tools: Support alias descriptions Sukadev Bhattiprolu
2016-06-21 4:02 ` [PATCH v20 07/20] perf, tools: Query terminal width and use in perf list Sukadev Bhattiprolu
2016-06-21 4:02 ` [PATCH v20 08/20] perf, tools: Add a --no-desc flag to " Sukadev Bhattiprolu
2016-06-21 4:02 ` [PATCH v20 09/20] perf, tools: Add override support for event list CPUID Sukadev Bhattiprolu
2016-06-21 4:02 ` Sukadev Bhattiprolu [this message]
2016-06-21 4:02 ` [PATCH v20 11/20] perf, tools: Add alias support for long descriptions Sukadev Bhattiprolu
2016-06-21 4:02 ` [PATCH v20 12/20] perf, tools: Support long descriptions with perf list Sukadev Bhattiprolu
2016-06-21 4:02 ` [PATCH v20 13/20] perf, tools, jevents: Add support for event topics Sukadev Bhattiprolu
2016-06-21 4:02 ` [PATCH v20 14/20] perf, tools: Add support for event list topics Sukadev Bhattiprolu
2016-06-21 4:02 ` [PATCH v20 15/20] perf, tools: Handle header line in mapfile Sukadev Bhattiprolu
2016-06-21 4:02 ` [PATCH v20 16/20] perf, tools: Add README for info on parsing JSON/map files Sukadev Bhattiprolu
2016-06-21 4:02 ` [PATCH v20 17/20] perf, tools: Make alias matching case-insensitive Sukadev Bhattiprolu
2016-06-21 4:02 ` [PATCH v20 18/20] perf, tools, pmu-events: Fix fixed counters on Intel Sukadev Bhattiprolu
2016-06-21 4:02 ` [PATCH v20 19/20] perf, tools, pmu-events: Add Skylake frontend MSR support Sukadev Bhattiprolu
2016-06-21 4:02 ` [PATCH v20 20/20] Allow period= in perf stat CPU event descriptions Sukadev Bhattiprolu
2016-08-31 11:42 ` [PATCH v20 00/20] perf, tools: Add support for PMU events in JSON format Jiri Olsa
2016-08-31 14:42 ` Andi Kleen
2016-08-31 14:54 ` Jiri Olsa
2016-08-31 16:15 ` Andi Kleen
2016-09-01 6:46 ` Jiri Olsa
2016-09-14 1:53 ` Michael Ellerman
2016-09-14 5:45 ` Ingo Molnar
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=1466481770-25290-11-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=maddy@linux.vnet.ibm.com \
--cc=mingo@redhat.com \
--cc=mpe@ellerman.id.au \
--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: 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).