[PATCH 53/59] perf tools: Add parse_check callback to struct parse_events_ops

[Jiri Olsa <jolsa@redhat.com>]

Adding parse_check callback to struct parse_events_ops,
to allow custom parse_check method in tracing flexer code.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 tools/lib/perf/include/internal/parse-events.h |  9 +++++++++
 tools/perf/util/parse-events.c                 |  3 ++-
 tools/perf/util/parse-events.h                 | 10 ----------
 tools/perf/util/parse-events.l                 | 12 ++++++------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/tools/lib/perf/include/internal/parse-events.h b/tools/lib/perf/include/internal/parse-events.h
index 8eb9487a2519..0a8a61219885 100644
--- a/tools/lib/perf/include/internal/parse-events.h
+++ b/tools/lib/perf/include/internal/parse-events.h
@@ -46,6 +46,13 @@ enum {
 	__PARSE_EVENTS__TERM_TYPE_NR,
 };
 
+enum perf_pmu_event_symbol_type {
+	PMU_EVENT_SYMBOL_ERR,		/* not a PMU EVENT */
+	PMU_EVENT_SYMBOL,		/* normal style PMU event */
+	PMU_EVENT_SYMBOL_PREFIX,	/* prefix of pre-suf style event */
+	PMU_EVENT_SYMBOL_SUFFIX,	/* suffix of pre-suf style event */
+};
+
 struct parse_events_array {
 	size_t nr_ranges;
 	struct {
@@ -136,6 +143,8 @@ struct parse_events_ops {
 
 	void (*set_leader)(char *name, struct list_head *list,
 			   struct parse_events_state *parse_state);
+
+	enum perf_pmu_event_symbol_type (*parse_check)(const char *name);
 };
 
 struct parse_events_state {
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 2c1bc9644c42..aa79ce2f2d44 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -1889,7 +1889,7 @@ int perf_pmu__test_parse_init(void)
 	return 0;
 }
 
-enum perf_pmu_event_symbol_type
+static enum perf_pmu_event_symbol_type
 perf_pmu__parse_check(const char *name)
 {
 	struct perf_pmu_event_symbol p, *r;
@@ -2924,4 +2924,5 @@ static struct parse_events_ops parse_state_ops = {
 	.add_bpf            = parse_events_load_bpf,
 	.add_tool           = parse_events_add_tool,
 	.set_leader         = parse_events_set_leader,
+	.parse_check        = perf_pmu__parse_check,
 };
diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
index c62a2e3a1f34..7ab06ae8355f 100644
--- a/tools/perf/util/parse-events.h
+++ b/tools/perf/util/parse-events.h
@@ -49,13 +49,6 @@ int exclude_perf(const struct option *opt, const char *arg, int unset);
 
 #define EVENTS_HELP_MAX (128*1024)
 
-enum perf_pmu_event_symbol_type {
-	PMU_EVENT_SYMBOL_ERR,		/* not a PMU EVENT */
-	PMU_EVENT_SYMBOL,		/* normal style PMU event */
-	PMU_EVENT_SYMBOL_PREFIX,	/* prefix of pre-suf style event */
-	PMU_EVENT_SYMBOL_SUFFIX,	/* suffix of pre-suf style event */
-};
-
 struct perf_pmu_event_symbol {
 	char	*symbol;
 	enum perf_pmu_event_symbol_type	type;
@@ -75,9 +68,6 @@ struct evsel *parse_events__add_event(struct parse_events_state *parse_state,
 				      const char *name, const char *metric_id,
 				      struct perf_pmu *pmu);
 
-enum perf_pmu_event_symbol_type
-perf_pmu__parse_check(const char *name);
-
 void print_events(const char *event_glob, bool name_only, bool quiet,
 		  bool long_desc, bool details_flag, bool deprecated,
 		  const char *pmu_name);
diff --git a/tools/perf/util/parse-events.l b/tools/perf/util/parse-events.l
index 4efe9872c667..1cebd5fcdb5d 100644
--- a/tools/perf/util/parse-events.l
+++ b/tools/perf/util/parse-events.l
@@ -63,12 +63,12 @@ static int str(yyscan_t scanner, int token)
 	return token;
 }
 
-static int raw(yyscan_t scanner)
+static int raw(yyscan_t scanner, struct parse_events_state *parse_state)
 {
 	YYSTYPE *yylval = parse_events_get_lval(scanner);
 	char *text = parse_events_get_text(scanner);
 
-	if (perf_pmu__parse_check(text) == PMU_EVENT_SYMBOL)
+	if (parse_state->ops->parse_check(text) == PMU_EVENT_SYMBOL)
 		return str(scanner, PE_NAME);
 
 	return __value(yylval, text + 1, 16, PE_RAW);
@@ -144,7 +144,7 @@ static int pmu_str_check(yyscan_t scanner, struct parse_events_state *parse_stat
 	 * parse check can't be trusted so we return PE_PMU_EVENT_FAKE unless
 	 * an '!' is present in which case the text can't be a PMU name.
 	 */
-	switch (perf_pmu__parse_check(text)) {
+	switch (parse_state->ops->parse_check(text)) {
 		case PMU_EVENT_SYMBOL_PREFIX:
 			return PE_PMU_EVENT_PRE;
 		case PMU_EVENT_SYMBOL_SUFFIX:
@@ -300,8 +300,8 @@ percore			{ return term(yyscanner, PARSE_EVENTS__TERM_TYPE_PERCORE); }
 aux-output		{ return term(yyscanner, PARSE_EVENTS__TERM_TYPE_AUX_OUTPUT); }
 aux-sample-size		{ return term(yyscanner, PARSE_EVENTS__TERM_TYPE_AUX_SAMPLE_SIZE); }
 metric-id		{ return term(yyscanner, PARSE_EVENTS__TERM_TYPE_METRIC_ID); }
-r{num_raw_hex}		{ return raw(yyscanner); }
-r0x{num_raw_hex}	{ return raw(yyscanner); }
+r{num_raw_hex}		{ return raw(yyscanner, _parse_state); }
+r0x{num_raw_hex}	{ return raw(yyscanner, _parse_state); }
 ,			{ return ','; }
 "/"			{ BEGIN(INITIAL); return '/'; }
 {name_minus}		{ return str(yyscanner, PE_NAME); }
@@ -384,7 +384,7 @@ refs|Reference|ops|access		|
 misses|miss				{ return str(yyscanner, PE_NAME_CACHE_OP_RESULT); }
 
 mem:			{ BEGIN(mem); return PE_PREFIX_MEM; }
-r{num_raw_hex}		{ return raw(yyscanner); }
+r{num_raw_hex}		{ return raw(yyscanner, _parse_state); }
 {num_dec}		{ return value(yyscanner, 10); }
 {num_hex}		{ return value(yyscanner, 16); }
 
-- 
2.31.1