From: Andi Kleen <andi@firstfloor.org>
To: acme@kernel.org
Cc: jolsa@kernel.org, linux-kernel@vger.kernel.org,
Andi Kleen <ak@linux.intel.com>
Subject: [PATCH 03/10] perf, tools: Factor out PMU matching in parser
Date: Tue, 28 Feb 2017 22:49:17 -0800 [thread overview]
Message-ID: <20170301064924.32172-4-andi@firstfloor.org> (raw)
In-Reply-To: <20170301064924.32172-1-andi@firstfloor.org>
From: Andi Kleen <ak@linux.intel.com>
Factor out the PMU name matching in the event parser into a separate function,
to use the same code for other grammar rules later.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
tools/perf/util/parse-events.c | 46 ++++++++++++++++++++++++++++++++++++++++++
tools/perf/util/parse-events.h | 5 +++++
tools/perf/util/parse-events.y | 30 +--------------------------
3 files changed, 52 insertions(+), 29 deletions(-)
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 281e44af31e2..5563c47c92df 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -1259,6 +1259,52 @@ int parse_events_add_pmu(struct parse_events_evlist *data,
return evsel ? 0 : -ENOMEM;
}
+int parse_events_multi_pmu_add(struct parse_events_evlist *data,
+ char *str, struct list_head **listp)
+{
+ struct list_head *head;
+ struct parse_events_term *term;
+ struct list_head *list;
+ struct perf_pmu *pmu = NULL;
+ int ok = 0;
+
+ *listp = NULL;
+ /* Add it for all PMUs that support the alias */
+ list = malloc(sizeof(struct list_head));
+ if (!list)
+ return -1;
+ INIT_LIST_HEAD(list);
+ while ((pmu = perf_pmu__scan(pmu)) != NULL) {
+ struct perf_pmu_alias *alias;
+
+ list_for_each_entry(alias, &pmu->aliases, list) {
+ if (!strcasecmp(alias->name, str)) {
+ head = malloc(sizeof(struct list_head));
+ if (!head)
+ return -1;
+ INIT_LIST_HEAD(head);
+ if (parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER,
+ str, 1, &str, NULL) < 0)
+ return -1;
+ list_add_tail(&term->list, head);
+
+ if (!parse_events_add_pmu(data, list,
+ pmu->name, head)) {
+ pr_debug("%s -> %s/%s/\n", str,
+ pmu->name, alias->str);
+ ok++;
+ }
+
+ parse_events_terms__delete(head);
+ }
+ }
+ }
+ if (!ok)
+ return -1;
+ *listp = list;
+ return 0;
+}
+
int parse_events__modifier_group(struct list_head *list,
char *event_mod)
{
diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
index da246a3ddb69..fb755ec248ab 100644
--- a/tools/perf/util/parse-events.h
+++ b/tools/perf/util/parse-events.h
@@ -164,6 +164,11 @@ int parse_events_add_breakpoint(struct list_head *list, int *idx,
int parse_events_add_pmu(struct parse_events_evlist *data,
struct list_head *list, char *name,
struct list_head *head_config);
+
+int parse_events_multi_pmu_add(struct parse_events_evlist *data,
+ char *str,
+ struct list_head **listp);
+
enum perf_pmu_event_symbol_type
perf_pmu__parse_check(const char *name);
void parse_events__set_leader(char *name, struct list_head *list);
diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y
index a14b47ab3879..6b2bc918fc94 100644
--- a/tools/perf/util/parse-events.y
+++ b/tools/perf/util/parse-events.y
@@ -236,37 +236,9 @@ PE_NAME opt_event_config
|
PE_KERNEL_PMU_EVENT sep_dc
{
- struct parse_events_evlist *data = _data;
- struct list_head *head;
- struct parse_events_term *term;
struct list_head *list;
- struct perf_pmu *pmu = NULL;
- int ok = 0;
- /* Add it for all PMUs that support the alias */
- ALLOC_LIST(list);
- while ((pmu = perf_pmu__scan(pmu)) != NULL) {
- struct perf_pmu_alias *alias;
-
- list_for_each_entry(alias, &pmu->aliases, list) {
- if (!strcasecmp(alias->name, $1)) {
- ALLOC_LIST(head);
- ABORT_ON(parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER,
- $1, 1, &@1, NULL));
- list_add_tail(&term->list, head);
-
- if (!parse_events_add_pmu(data, list,
- pmu->name, head)) {
- pr_debug("%s -> %s/%s/\n", $1,
- pmu->name, alias->str);
- ok++;
- }
-
- parse_events_terms__delete(head);
- }
- }
- }
- if (!ok)
+ if (parse_events_multi_pmu_add(_data, $1, &list) < 0)
YYABORT;
$$ = list;
}
--
2.9.3
next prev parent reply other threads:[~2017-03-01 6:55 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-01 6:49 perf: Improve support for uncore JSON event lists Andi Kleen
2017-03-01 6:49 ` [PATCH 01/10] perf, tools, stat: Factor out callback for collecting event values Andi Kleen
2017-03-03 10:33 ` Jiri Olsa
2017-03-03 23:16 ` Andi Kleen
2017-03-05 17:01 ` Jiri Olsa
2017-03-01 6:49 ` [PATCH 02/10] perf, tools, stat: Collapse identically named events Andi Kleen
2017-03-05 17:55 ` Jiri Olsa
2017-03-07 10:02 ` Jiri Olsa
2017-03-01 6:49 ` Andi Kleen [this message]
2017-03-07 10:03 ` [PATCH 03/10] perf, tools: Factor out PMU matching in parser Jiri Olsa
2017-03-01 6:49 ` [PATCH 04/10] perf, tools: Expand PMU events by prefix match Andi Kleen
2017-03-01 6:49 ` [PATCH 05/10] perf, tools: Special case uncore_ prefix Andi Kleen
2017-03-01 6:49 ` [PATCH 06/10] perf, tools: Add a simple expression parser for JSON Andi Kleen
2017-03-01 6:49 ` [PATCH 07/10] perf, tools: Support MetricExpr header in JSON event list Andi Kleen
2017-03-01 6:49 ` [PATCH 08/10] perf, tools, stat: Output JSON MetricExpr metric Andi Kleen
2017-03-07 10:03 ` Jiri Olsa
2017-03-01 6:49 ` [PATCH 09/10] perf, tools, list: Support printing MetricExpr with -v Andi Kleen
2017-03-01 6:49 ` [PATCH 10/10] perf, tools: Add support for MetricName JSON attribute Andi Kleen
2017-03-07 10:03 ` Jiri Olsa
2017-03-07 10:04 ` perf: Improve support for uncore JSON event lists Jiri Olsa
-- strict thread matches above, loose matches on Subject: below --
2017-02-24 0:10 [PATCH 01/10] perf, tools, stat: Factor out callback for collecting event values Andi Kleen
2017-02-24 0:10 ` [PATCH 03/10] perf, tools: Factor out PMU matching in parser Andi Kleen
2017-02-27 8:35 ` Jiri Olsa
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=20170301064924.32172-4-andi@firstfloor.org \
--to=andi@firstfloor.org \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.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).