--- v13
+++ v15
@@ -1,45 +1,141 @@
-From: Andi Kleen <ak@linux.intel.com>
-
-Support a header line in the mapfile.csv, to match the existing
-mapfiles
+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[v2]
- All architectures may not use the "Family" to identify. So,
- assume first line is header.
+Changelog[v14]
+ - [Jiri Olsa] Break up independent parts of the patch into
+ separate patches.
---
- tools/perf/pmu-events/jevents.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
+ tools/perf/pmu-events/jevents.c | 31 +++++++++++++++++++++++--------
+ tools/perf/pmu-events/jevents.h | 3 ++-
+ tools/perf/pmu-events/pmu-events.h | 1 +
+ 3 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c
-index 14707fb..8d365f2 100644
+index 5f7603b..a8507c9 100644
--- a/tools/perf/pmu-events/jevents.c
+++ b/tools/perf/pmu-events/jevents.c
-@@ -461,7 +461,12 @@ static int process_mapfile(FILE *outfp, char *fpath)
-
- print_mapping_table_prefix(outfp);
-
-- line_num = 0;
-+ /* Skip first line (header) */
-+ p = fgets(line, n, mapfp);
-+ if (!p)
-+ goto out;
-+
-+ line_num = 1;
- while (1) {
- char *cpuid, *version, *type, *fname;
-
-@@ -505,8 +510,8 @@ static int process_mapfile(FILE *outfp, char *fpath)
- fprintf(outfp, "},\n");
- }
-
-+out:
- print_mapping_table_suffix(outfp);
--
- return 0;
+@@ -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,9 @@ 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 +295,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 +306,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;
+ };
+
+ /*
--
-1.7.9.5
+1.8.3.1