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: namhyung@kernel.org, maddy@linux.vnet.ibm.com,
linuxppc-dev@lists.ozlabs.org, <linux-kernel@vger.kernel.org>
Subject: [PATCH v17 13/19] perf, tools, jevents: Add support for event topics
Date: Mon, 28 Sep 2015 17:50:51 -0700 [thread overview]
Message-ID: <1443487857-26281-14-git-send-email-sukadev@linux.vnet.ibm.com> (raw)
In-Reply-To: <1443487857-26281-1-git-send-email-sukadev@linux.vnet.ibm.com>
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 a8507c9..ea3474b 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;
@@ -297,6 +300,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",
@@ -320,12 +325,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;
};
/*
--
2.5.3
next prev parent reply other threads:[~2015-09-29 0:53 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-29 0:50 [PATCH v17 00/19] perf, tools: Add support for PMU events in JSON format Sukadev Bhattiprolu
2015-09-29 0:50 ` [PATCH v17 01/19] perf, tools: Add jsmn `jasmine' JSON parser Sukadev Bhattiprolu
2015-09-29 0:50 ` [PATCH v17 02/19] perf, tools, jevents: Program to convert JSON file to C style file Sukadev Bhattiprolu
2015-09-29 0:50 ` [PATCH v17 03/19] perf, tools: Use pmu_events table to create aliases Sukadev Bhattiprolu
2015-09-29 0:50 ` [PATCH v17 04/19] perf, tools: Support CPU ID matching for Powerpc Sukadev Bhattiprolu
2015-09-29 0:50 ` [PATCH v17 05/19] perf, tools: Support CPU id matching for x86 v2 Sukadev Bhattiprolu
2015-09-29 0:50 ` [PATCH v17 06/19] perf, tools: Support alias descriptions Sukadev Bhattiprolu
2015-09-29 0:50 ` [PATCH v17 07/19] perf, tools: Query terminal width and use in perf list Sukadev Bhattiprolu
2015-09-29 0:50 ` [PATCH v17 08/19] perf, tools: Add a --no-desc flag to " Sukadev Bhattiprolu
2015-09-29 0:50 ` [PATCH v17 09/19] perf, tools: Add override support for event list CPUID Sukadev Bhattiprolu
2015-09-29 0:50 ` [PATCH v17 10/19] perf, tools, jevents: Add support for long descriptions Sukadev Bhattiprolu
2015-09-29 0:50 ` [PATCH v17 11/19] perf, tools: Add alias " Sukadev Bhattiprolu
2015-09-29 0:50 ` [PATCH v17 12/19] perf, tools: Support long descriptions with perf list Sukadev Bhattiprolu
2015-09-29 0:50 ` Sukadev Bhattiprolu [this message]
2015-09-29 0:50 ` [PATCH v17 14/19] perf, tools: Add support for event list topics Sukadev Bhattiprolu
2015-09-29 0:50 ` [PATCH v17 15/19] perf, tools: Handle header line in mapfile Sukadev Bhattiprolu
2015-09-29 0:50 ` [PATCH v17 16/19] perf, tools: Add README for info on parsing JSON/map files Sukadev Bhattiprolu
2015-09-29 0:50 ` [PATCH v17 17/19] perf, tools: Make alias matching case-insensitive Sukadev Bhattiprolu
2015-09-29 0:50 ` [PATCH v17 18/19] perf, tools, pmu-events: Fix fixed counters on Intel Sukadev Bhattiprolu
2015-09-29 0:50 ` [PATCH v17 19/19] perf, tools, pmu-events: Add Skylake frontend MSR support Sukadev Bhattiprolu
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=1443487857-26281-14-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=namhyung@kernel.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).