[PATCH 44/59] perf tools: Add add_pmu callback to struct parse_events_ops
From: Jiri Olsa <hidden>
Date: 2021-11-08 13:41:46
Subsystem:
performance events subsystem, the rest · Maintainers:
Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo, Namhyung Kim, Linus Torvalds
Adding add_pmu callback to struct parse_events_ops, to allow custom pmu parsing code. Signed-off-by: Jiri Olsa <jolsa@kernel.org> --- tools/lib/perf/include/internal/parse-events.h | 9 +++++++++ tools/perf/util/parse-events.c | 15 +++++++++------ tools/perf/util/parse-events.h | 6 ------ tools/perf/util/parse-events.y | 8 +++++--- 4 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/tools/lib/perf/include/internal/parse-events.h b/tools/lib/perf/include/internal/parse-events.h
index 11a85a118480..6733068879a7 100644
--- a/tools/lib/perf/include/internal/parse-events.h
+++ b/tools/lib/perf/include/internal/parse-events.h@@ -85,10 +85,19 @@ struct parse_events_error { char *first_help; }; +struct parse_events_state; + struct parse_events_ops { struct perf_evsel* (*perf_evsel__new)(struct perf_event_attr *attr, int idx, bool init_attr); struct perf_evsel* (*perf_evsel__new_tp)(const char *sys, const char *name, int idx); void (*perf_evsel__delete)(struct perf_evsel *evsel); + + int (*add_pmu)(struct parse_events_state *parse_state, + struct list_head *list, char *pmu_name, + struct list_head *head_config, + struct list_head *orig_terms, + bool auto_merge_stats, + bool use_alias); }; struct parse_events_state {
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 57f59253322d..78f10083f917 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c@@ -51,6 +51,7 @@ static int parse_events__with_hybrid_pmu(struct parse_events_state *parse_state, const char *str, char *pmu_name, struct list_head *list); +static struct parse_events_ops parse_state_ops; static struct perf_pmu_event_symbol *perf_pmu_events_list; /* * The variable indicates the number of supported pmu event symbols.
@@ -81,12 +82,6 @@ static void perf_evsel__delete_helper(struct perf_evsel *evsel) free(tmp); } -static struct parse_events_ops parse_state_ops = { - .perf_evsel__new = perf_evsel__new_idx, - .perf_evsel__new_tp = perf_evsel__newtp_idx, - .perf_evsel__delete = perf_evsel__delete_helper, -}; - #define __PERF_EVENT_FIELD(config, name) \ ((config & PERF_EVENT_##name##_MASK) >> PERF_EVENT_##name##_SHIFT)
@@ -1528,6 +1523,7 @@ static int __parse_events_add_pmu(struct parse_events_state *parse_state, return 0; } +static int parse_events_add_pmu(struct parse_events_state *parse_state, struct list_head *list, char *pmu_name, struct list_head *head_config,
@@ -2900,3 +2896,10 @@ struct evsel *parse_events__add_event_hybrid(struct parse_events_state *parse_st pmu, config_terms, /*auto_merge_stats=*/false, /*cpu_list=*/NULL); } + +static struct parse_events_ops parse_state_ops = { + .perf_evsel__new = perf_evsel__new_idx, + .perf_evsel__new_tp = perf_evsel__newtp_idx, + .perf_evsel__delete = perf_evsel__delete_helper, + .add_pmu = parse_events_add_pmu, +};
diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
index 74bf778400a9..d1057942825d 100644
--- a/tools/perf/util/parse-events.h
+++ b/tools/perf/util/parse-events.h@@ -94,12 +94,6 @@ int parse_events_add_cache(struct parse_events_state *parse_state, int parse_events_add_breakpoint(struct parse_events_state *parse_state, struct list_head *list, u64 addr, char *type, u64 len); -int parse_events_add_pmu(struct parse_events_state *parse_state, - struct list_head *list, char *name, - struct list_head *head_config, - struct list_head *orig_terms, - bool auto_merge_stats, - bool use_alias); struct evsel *parse_events__add_event(struct parse_events_state *parse_state, struct perf_event_attr *attr,
diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y
index b963c023bd40..5c57c8424323 100644
--- a/tools/perf/util/parse-events.y
+++ b/tools/perf/util/parse-events.y@@ -339,7 +339,7 @@ event_pmu_name opt_pmu_config list = alloc_list(); if (!list) CLEANUP_YYABORT; - if (parse_events_add_pmu(_parse_state, list, $1, $2, orig_terms, false, false)) + if (parse_state->ops->add_pmu(parse_state, list, $1, $2, orig_terms, false, false)) CLEANUP_YYABORT; parse_events_terms__delete($2); parse_events_terms__delete(orig_terms);
@@ -388,6 +388,7 @@ PE_PMU_EVENT_PRE '-' PE_PMU_EVENT_SUF sep_dc | PE_PMU_EVENT_FAKE sep_dc { + struct parse_events_state *parse_state = _parse_state; struct list_head *list; int err;
@@ -395,7 +396,7 @@ PE_PMU_EVENT_FAKE sep_dc if (!list) YYABORT; - err = parse_events_add_pmu(_parse_state, list, $1, NULL, NULL, false, false); + err = parse_state->ops->add_pmu(parse_state, list, $1, NULL, NULL, false, false); free($1); if (err < 0) { free(list);
@@ -406,6 +407,7 @@ PE_PMU_EVENT_FAKE sep_dc | PE_PMU_EVENT_FAKE opt_pmu_config { + struct parse_events_state *parse_state = _parse_state; struct list_head *list; int err;
@@ -413,7 +415,7 @@ PE_PMU_EVENT_FAKE opt_pmu_config if (!list) YYABORT; - err = parse_events_add_pmu(_parse_state, list, $1, $2, NULL, false, false); + err = parse_state->ops->add_pmu(parse_state, list, $1, $2, NULL, false, false); free($1); parse_events_terms__delete($2); if (err < 0) {
--
2.31.1