Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1280513
| From | Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v19 13/19] perf, tools, jevents: Add support for event topics |
| Date | 2015-12-01 04:00 +0100 |
| Message-ID | <qAJkB-3EM-7@gated-at.bofh.it> (permalink) |
| References | <qAJkB-3EM-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Allow assigning categories "Topics" field to the PMU events i.e.
process the topic field from the JSON file and add a corresponding
topic field to the generated C events tables.
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] Move this independent code off into a separate patch.
---
tools/perf/pmu-events/jevents.c | 12 +++++++++---
tools/perf/pmu-events/jevents.h | 2 +-
tools/perf/pmu-events/pmu-events.h | 1 +
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c
index 7ee1507..8e6e813 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 *long_desc)
+ char *desc, char *long_desc, char *topic)
{
FILE *outfp = data;
/*
@@ -217,6 +217,8 @@ static int print_events_table_entry(void *data, char *name, char *event,
fprintf(outfp, "\t.desc = \"%s\",\n", desc);
if (long_desc && long_desc[0])
fprintf(outfp, "\t.long_desc = \"%s\",\n", long_desc);
+ if (topic)
+ fprintf(outfp, "\t.topic = \"%s\",\n", topic);
fprintf(outfp, "},\n");
@@ -238,7 +240,7 @@ 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,
- char *long_desc),
+ char *long_desc, char *topic),
void *data)
{
int err = -EIO;
@@ -259,6 +261,7 @@ int json_events(const char *fn,
char *event = NULL, *desc = NULL, *name = NULL;
char *long_desc = NULL;
char *extra_desc = NULL;
+ char *topic = NULL;
struct msrmap *msr = NULL;
jsmntok_t *msrval = NULL;
jsmntok_t *precise = NULL;
@@ -298,6 +301,8 @@ int json_events(const char *fn,
!json_streq(map, val, "null")) {
addfield(map, &extra_desc, ". ",
" Spec update: ", val);
+ } else if (json_streq(map, field, "Topic")) {
+ addfield(map, &topic, "", "", val);
} else if (json_streq(map, field, "Data_LA") && nz) {
addfield(map, &extra_desc, ". ",
" Supports address when precise",
@@ -321,12 +326,13 @@ int json_events(const char *fn,
addfield(map, &event, ",", msr->pname, msrval);
fixname(name);
- err = func(data, name, event, desc, long_desc);
+ err = func(data, name, event, desc, long_desc, topic);
free(event);
free(desc);
free(name);
free(long_desc);
free(extra_desc);
+ free(topic);
if (err)
break;
tok += j;
diff --git a/tools/perf/pmu-events/jevents.h b/tools/perf/pmu-events/jevents.h
index b0eb274..9ffcb89 100644
--- a/tools/perf/pmu-events/jevents.h
+++ b/tools/perf/pmu-events/jevents.h
@@ -3,7 +3,7 @@
int json_events(const char *fn,
int (*func)(void *data, char *name, char *event, char *desc,
- char *long_desc),
+ char *long_desc, char *topic),
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 711f049..6b69f4b 100644
--- a/tools/perf/pmu-events/pmu-events.h
+++ b/tools/perf/pmu-events/pmu-events.h
@@ -9,6 +9,7 @@ struct pmu_event {
const char *event;
const char *desc;
const char *long_desc;
+ const char *topic;
};
/*
--
1.8.3.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v19 00/19] perf, tools: Add support for PMU events in JSON format Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:00 +0100 [PATCH v19 19/19] perf, tools, pmu-events: Add Skylake frontend MSR support Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:00 +0100 [PATCH v19 08/19] perf, tools: Add a --no-desc flag to perf list Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:00 +0100 [PATCH v19 13/19] perf, tools, jevents: Add support for event topics Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:00 +0100 [PATCH v19 15/19] perf, tools: Handle header line in mapfile Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:00 +0100 [PATCH v19 17/19] perf, tools: Make alias matching case-insensitive Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:00 +0100 [PATCH v19 01/19] perf, tools: Add jsmn `jasmine' JSON parser Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:00 +0100 [PATCH v19 16/19] perf, tools: Add README for info on parsing JSON/map files Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:00 +0100 [PATCH v19 14/19] perf, tools: Add support for event list topics Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:00 +0100 [PATCH v19 18/19] perf, tools, pmu-events: Fix fixed counters on Intel Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:00 +0100 [PATCH v19 10/19] perf, tools, jevents: Add support for long descriptions Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:00 +0100 [PATCH v19 07/19] perf, tools: Query terminal width and use in perf list Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:10 +0100 [PATCH v19 05/19] perf, tools: Support CPU id matching for x86 v2 Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:10 +0100 [PATCH v19 03/19] perf, tools: Use pmu_events table to create aliases Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:10 +0100 [PATCH v19 12/19] perf, tools: Support long descriptions with perf list Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:10 +0100 [PATCH v19 11/19] perf, tools: Add alias support for long descriptions Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:10 +0100 [PATCH v19 06/19] perf, tools: Support alias descriptions Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:10 +0100 [PATCH v19 04/19] perf, tools: Support CPU ID matching for Powerpc Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:10 +0100 [PATCH v19 09/19] perf, tools: Add override support for event list CPUID Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:10 +0100 [PATCH v19 02/19] perf, tools, jevents: Program to convert JSON file to C style file Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:10 +0100 Re: [PATCH v19 00/19] perf, tools: Add support for PMU events in JSON format Andi Kleen <ak@linux.intel.com> - 2015-12-03 22:10 +0100
csiph-web