[PATCH 50/59] perf tools: Add add_bpf callback to struct parse_events_ops

[Jiri Olsa <jolsa@redhat.com>]

Adding add_bpf callback to struct parse_events_ops,
to allow custom bpf parsing code.

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

diff --git a/tools/lib/perf/include/internal/parse-events.h b/tools/lib/perf/include/internal/parse-events.h
index f06c86630fda..3f57cd8a935a 100644
--- a/tools/lib/perf/include/internal/parse-events.h
+++ b/tools/lib/perf/include/internal/parse-events.h
@@ -123,6 +123,12 @@ struct parse_events_ops {
 			      const char *sys, const char *event,
 			      struct parse_events_error *err,
 			      struct list_head *head_config);
+
+	int (*add_bpf)(struct parse_events_state *parse_state,
+		       struct list_head *list,
+		       char *bpf_file_name,
+		       bool source,
+		       struct list_head *head_config);
 };
 
 struct parse_events_state {
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index ad2bec6e6b37..21eb101d24af 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -779,6 +779,7 @@ split_bpf_config_terms(struct list_head *evt_head_config,
 			list_move_tail(&term->list, obj_head_config);
 }
 
+static
 int parse_events_load_bpf(struct parse_events_state *parse_state,
 			  struct list_head *list,
 			  char *bpf_file_name,
@@ -2918,4 +2919,5 @@ static struct parse_events_ops parse_state_ops = {
 	.add_cache          = parse_events_add_cache,
 	.add_breakpoint     = parse_events_add_breakpoint,
 	.add_tracepoint     = parse_events_add_tracepoint,
+	.add_bpf            = parse_events_load_bpf,
 };
diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
index 328612945503..ec94c8541698 100644
--- a/tools/perf/util/parse-events.h
+++ b/tools/perf/util/parse-events.h
@@ -63,11 +63,6 @@ struct perf_pmu_event_symbol {
 
 void parse_events__shrink_config_terms(void);
 void parse_events__clear_array(struct parse_events_array *a);
-int parse_events_load_bpf(struct parse_events_state *parse_state,
-			  struct list_head *list,
-			  char *bpf_file_name,
-			  bool source,
-			  struct list_head *head_config);
 /* Provide this function for perf test */
 struct bpf_object;
 int parse_events_load_bpf_obj(struct parse_events_state *parse_state,
diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y
index 34915b81a7f1..1c55b9fdc79e 100644
--- a/tools/perf/util/parse-events.y
+++ b/tools/perf/util/parse-events.y
@@ -690,7 +690,7 @@ PE_BPF_OBJECT opt_event_config
 
 	list = alloc_list();
 	ABORT_ON(!list);
-	err = parse_events_load_bpf(parse_state, list, $1, false, $2);
+	err = parse_state->ops->add_bpf(parse_state, list, $1, false, $2);
 	parse_events_terms__delete($2);
 	free($1);
 	if (err) {
@@ -702,12 +702,13 @@ PE_BPF_OBJECT opt_event_config
 |
 PE_BPF_SOURCE opt_event_config
 {
+	struct parse_events_state *parse_state = _parse_state;
 	struct list_head *list;
 	int err;
 
 	list = alloc_list();
 	ABORT_ON(!list);
-	err = parse_events_load_bpf(_parse_state, list, $1, true, $2);
+	err = parse_state->ops->add_bpf(parse_state, list, $1, true, $2);
 	parse_events_terms__delete($2);
 	if (err) {
 		free(list);
-- 
2.31.1