[PATCH 45/59] perf tools: Add add_pmu_multi callback to struct parse_events_ops

[Jiri Olsa <jolsa@redhat.com>]

Adding add_pmu_multi callback to struct parse_events_ops,
to allow custom multi pmu parsing code.

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

diff --git a/tools/lib/perf/include/internal/parse-events.h b/tools/lib/perf/include/internal/parse-events.h
index 6733068879a7..78dd3f989346 100644
--- a/tools/lib/perf/include/internal/parse-events.h
+++ b/tools/lib/perf/include/internal/parse-events.h
@@ -98,6 +98,10 @@ struct parse_events_ops {
 		       struct list_head *orig_terms,
 		       bool auto_merge_stats,
 		       bool use_alias);
+
+	int (*add_pmu_multi)(struct parse_events_state *parse_state,
+			     char *str, struct list_head *head,
+			     struct list_head **listp);
 };
 
 struct parse_events_state {
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 78f10083f917..c67634c9de0d 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -1568,6 +1568,7 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,
 	return err;
 }
 
+static
 int parse_events_multi_pmu_add(struct parse_events_state *parse_state,
 			       char *str, struct list_head *head,
 			       struct list_head **listp)
@@ -2902,4 +2903,5 @@ static struct parse_events_ops parse_state_ops = {
 	.perf_evsel__new_tp = perf_evsel__newtp_idx,
 	.perf_evsel__delete = perf_evsel__delete_helper,
 	.add_pmu            = parse_events_add_pmu,
+	.add_pmu_multi      = parse_events_multi_pmu_add,
 };
diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
index d1057942825d..fa03f8f70f33 100644
--- a/tools/perf/util/parse-events.h
+++ b/tools/perf/util/parse-events.h
@@ -100,12 +100,6 @@ struct evsel *parse_events__add_event(struct parse_events_state *parse_state,
 				      const char *name, const char *metric_id,
 				      struct perf_pmu *pmu);
 
-int parse_events_multi_pmu_add(struct parse_events_state *parse_state,
-			       char *str,
-			       struct list_head *head_config,
-			       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 5c57c8424323..f903690b3c8a 100644
--- a/tools/perf/util/parse-events.y
+++ b/tools/perf/util/parse-events.y
@@ -350,10 +350,11 @@ event_pmu_name opt_pmu_config
 |
 PE_KERNEL_PMU_EVENT sep_dc
 {
+	struct parse_events_state *parse_state = _parse_state;
 	struct list_head *list;
 	int err;
 
-	err = parse_events_multi_pmu_add(_parse_state, $1, NULL, &list);
+	err = parse_state->ops->add_pmu_multi(parse_state, $1, NULL, &list);
 	free($1);
 	if (err < 0)
 		YYABORT;
@@ -362,11 +363,12 @@ PE_KERNEL_PMU_EVENT sep_dc
 |
 PE_KERNEL_PMU_EVENT opt_pmu_config
 {
+	struct parse_events_state *parse_state = _parse_state;
 	struct list_head *list;
 	int err;
 
 	/* frees $2 */
-	err = parse_events_multi_pmu_add(_parse_state, $1, $2, &list);
+	err = parse_state->ops->add_pmu_multi(_parse_state, $1, $2, &list);
 	free($1);
 	if (err < 0)
 		YYABORT;
@@ -375,13 +377,14 @@ PE_KERNEL_PMU_EVENT opt_pmu_config
 |
 PE_PMU_EVENT_PRE '-' PE_PMU_EVENT_SUF sep_dc
 {
+	struct parse_events_state *parse_state = _parse_state;
 	struct list_head *list;
 	char pmu_name[128];
 
 	snprintf(pmu_name, sizeof(pmu_name), "%s-%s", $1, $3);
 	free($1);
 	free($3);
-	if (parse_events_multi_pmu_add(_parse_state, pmu_name, NULL, &list) < 0)
+	if (parse_state->ops->add_pmu_multi(_parse_state, pmu_name, NULL, &list) < 0)
 		YYABORT;
 	$$ = list;
 }
-- 
2.31.1