Thread (78 messages) 78 messages, 3 authors, 2021-11-08
STALE1698d

[PATCH 20/59] perf tools: Pass parse_state all the way down to __add_event

From: Jiri Olsa <hidden>
Date: 2021-11-08 13:40:30
Subsystem: performance events subsystem, the rest · Maintainers: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo, Namhyung Kim, Linus Torvalds 

So we can provide event allocation callbacks.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 tools/perf/util/parse-events-hybrid.c | 24 +++++++------
 tools/perf/util/parse-events-hybrid.h |  6 ++--
 tools/perf/util/parse-events.c        | 49 +++++++++++++++------------
 tools/perf/util/parse-events.h        | 15 ++++----
 tools/perf/util/parse-events.y        | 21 ++++--------
 5 files changed, 60 insertions(+), 55 deletions(-)

diff --git a/tools/perf/util/parse-events-hybrid.c b/tools/perf/util/parse-events-hybrid.c
index de901e74ce3d..49e9047d20d9 100644
--- a/tools/perf/util/parse-events-hybrid.c
+++ b/tools/perf/util/parse-events-hybrid.c
@@ -36,7 +36,8 @@ static void config_hybrid_attr(struct perf_event_attr *attr,
 	attr->config = attr->config | ((__u64)pmu_type << PERF_PMU_TYPE_SHIFT);
 }
 
-static int create_event_hybrid(__u32 config_type, int *idx,
+static int create_event_hybrid(struct parse_events_state *parse_state,
+			       __u32 config_type,
 			       struct list_head *list,
 			       struct perf_event_attr *attr, const char *name,
 			       const char *metric_id,
@@ -48,7 +49,7 @@ static int create_event_hybrid(__u32 config_type, int *idx,
 	__u64 config = attr->config;
 
 	config_hybrid_attr(attr, config_type, pmu->type);
-	evsel = parse_events__add_event_hybrid(list, idx, attr, name, metric_id,
+	evsel = parse_events__add_event_hybrid(parse_state, list, attr, name, metric_id,
 					       pmu, config_terms);
 	if (evsel)
 		evsel->pmu_name = strdup(pmu->name);
@@ -84,8 +85,8 @@ static int add_hw_hybrid(struct parse_events_state *parse_state,
 			continue;
 
 		copy_config_terms(&terms, config_terms);
-		ret = create_event_hybrid(PERF_TYPE_HARDWARE,
-					  &parse_state->idx, list, attr, name,
+		ret = create_event_hybrid(parse_state, PERF_TYPE_HARDWARE,
+					  list, attr, name,
 					  metric_id, &terms, pmu);
 		free_config_terms(&terms);
 		if (ret)
@@ -95,7 +96,8 @@ static int add_hw_hybrid(struct parse_events_state *parse_state,
 	return 0;
 }
 
-static int create_raw_event_hybrid(int *idx, struct list_head *list,
+static int create_raw_event_hybrid(struct parse_events_state *parse_state,
+				   struct list_head *list,
 				   struct perf_event_attr *attr,
 				   const char *name,
 				   const char *metric_id,
@@ -105,7 +107,7 @@ static int create_raw_event_hybrid(int *idx, struct list_head *list,
 	struct evsel *evsel;
 
 	attr->type = pmu->type;
-	evsel = parse_events__add_event_hybrid(list, idx, attr, name, metric_id,
+	evsel = parse_events__add_event_hybrid(parse_state, list, attr, name, metric_id,
 					       pmu, config_terms);
 	if (evsel)
 		evsel->pmu_name = strdup(pmu->name);
@@ -130,7 +132,7 @@ static int add_raw_hybrid(struct parse_events_state *parse_state,
 			continue;
 
 		copy_config_terms(&terms, config_terms);
-		ret = create_raw_event_hybrid(&parse_state->idx, list, attr,
+		ret = create_raw_event_hybrid(parse_state, list, attr,
 					      name, metric_id, &terms, pmu);
 		free_config_terms(&terms);
 		if (ret)
@@ -164,13 +166,13 @@ int parse_events__add_numeric_hybrid(struct parse_events_state *parse_state,
 			      config_terms);
 }
 
-int parse_events__add_cache_hybrid(struct list_head *list, int *idx,
+int parse_events__add_cache_hybrid(struct parse_events_state *parse_state,
+				   struct list_head *list,
 				   struct perf_event_attr *attr,
 				   const char *name,
 				   const char *metric_id,
 				   struct list_head *config_terms,
-				   bool *hybrid,
-				   struct parse_events_state *parse_state)
+				   bool *hybrid)
 {
 	struct perf_pmu *pmu;
 	int ret;
@@ -187,7 +189,7 @@ int parse_events__add_cache_hybrid(struct list_head *list, int *idx,
 			continue;
 
 		copy_config_terms(&terms, config_terms);
-		ret = create_event_hybrid(PERF_TYPE_HW_CACHE, idx, list,
+		ret = create_event_hybrid(parse_state, PERF_TYPE_HW_CACHE, list,
 					  attr, name, metric_id, &terms, pmu);
 		free_config_terms(&terms);
 		if (ret)
diff --git a/tools/perf/util/parse-events-hybrid.h b/tools/perf/util/parse-events-hybrid.h
index cbc05fec02a2..7e4a88a87846 100644
--- a/tools/perf/util/parse-events-hybrid.h
+++ b/tools/perf/util/parse-events-hybrid.h
@@ -15,11 +15,11 @@ int parse_events__add_numeric_hybrid(struct parse_events_state *parse_state,
 				     struct list_head *config_terms,
 				     bool *hybrid);
 
-int parse_events__add_cache_hybrid(struct list_head *list, int *idx,
+int parse_events__add_cache_hybrid(struct parse_events_state *parse_state,
+				   struct list_head *list,
 				   struct perf_event_attr *attr,
 				   const char *name, const char *metric_id,
 				   struct list_head *config_terms,
-				   bool *hybrid,
-				   struct parse_events_state *parse_state);
+				   bool *hybrid);
 
 #endif /* __PERF_PARSE_EVENTS_HYBRID_H */
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 2bacbab86b09..d3ad2c89c7a2 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -357,7 +357,8 @@ static char *get_config_name(struct list_head *head_terms)
 }
 
 static struct evsel *
-__add_event(struct list_head *list, int *idx,
+__add_event(struct parse_events_state *parse_state,
+	    struct list_head *list,
 	    struct perf_event_attr *attr,
 	    bool init_attr,
 	    const char *name, const char *metric_id, struct perf_pmu *pmu,
@@ -367,6 +368,7 @@ __add_event(struct list_head *list, int *idx,
 	struct evsel *evsel;
 	struct perf_cpu_map *cpus = pmu ? perf_cpu_map__get(pmu->cpus) :
 			       cpu_list ? perf_cpu_map__new(cpu_list) : NULL;
+	int *idx = &parse_state->idx;
 
 	if (pmu && attr->type == PERF_TYPE_RAW)
 		perf_pmu__warn_invalid_config(pmu, attr->config, name);
@@ -401,25 +403,28 @@ __add_event(struct list_head *list, int *idx,
 	return evsel;
 }
 
-struct evsel *parse_events__add_event(int idx, struct perf_event_attr *attr,
+struct evsel *parse_events__add_event(struct parse_events_state *parse_state,
+				      struct perf_event_attr *attr,
 				      const char *name, const char *metric_id,
 				      struct perf_pmu *pmu)
 {
-	return __add_event(/*list=*/NULL, &idx, attr, /*init_attr=*/false, name,
+	return __add_event(parse_state, /*list=*/NULL, attr, /*init_attr=*/false, name,
 			   metric_id, pmu, /*config_terms=*/NULL,
 			   /*auto_merge_stats=*/false, /*cpu_list=*/NULL);
 }
 
-static int add_event(struct list_head *list, int *idx,
+static int add_event(struct parse_events_state *parse_state,
+		     struct list_head *list,
 		     struct perf_event_attr *attr, const char *name,
 		     const char *metric_id, struct list_head *config_terms)
 {
-	return __add_event(list, idx, attr, /*init_attr*/true, name, metric_id,
+	return __add_event(parse_state, list, attr, /*init_attr*/true, name, metric_id,
 			   /*pmu=*/NULL, config_terms,
 			   /*auto_merge_stats=*/false, /*cpu_list=*/NULL) ? 0 : -ENOMEM;
 }
 
-static int add_event_tool(struct list_head *list, int *idx,
+static int add_event_tool(struct parse_events_state *parse_state,
+			  struct list_head *list,
 			  enum perf_tool_event tool_event)
 {
 	struct evsel *evsel;
@@ -428,7 +433,7 @@ static int add_event_tool(struct list_head *list, int *idx,
 		.config = PERF_COUNT_SW_DUMMY,
 	};
 
-	evsel = __add_event(list, idx, &attr, /*init_attr=*/true, /*name=*/NULL,
+	evsel = __add_event(parse_state, list, &attr, /*init_attr=*/true, /*name=*/NULL,
 			    /*metric_id=*/NULL, /*pmu=*/NULL,
 			    /*config_terms=*/NULL, /*auto_merge_stats=*/false,
 			    /*cpu_list=*/"0");
@@ -469,11 +474,11 @@ static int config_attr(struct perf_event_attr *attr,
 		       struct parse_events_error *err,
 		       config_term_func_t config_term);
 
-int parse_events_add_cache(struct list_head *list, int *idx,
+int parse_events_add_cache(struct parse_events_state *parse_state,
+			   struct list_head *list,
 			   char *type, char *op_result1, char *op_result2,
 			   struct parse_events_error *err,
-			   struct list_head *head_config,
-			   struct parse_events_state *parse_state)
+			   struct list_head *head_config)
 {
 	struct perf_event_attr attr;
 	LIST_HEAD(config_terms);
@@ -544,15 +549,15 @@ int parse_events_add_cache(struct list_head *list, int *idx,
 	}
 
 	metric_id = get_config_metric_id(head_config);
-	ret = parse_events__add_cache_hybrid(list, idx, &attr,
+	ret = parse_events__add_cache_hybrid(parse_state, list, &attr,
 					     config_name ? : name,
 					     metric_id,
 					     &config_terms,
-					     &hybrid, parse_state);
+					     &hybrid);
 	if (hybrid)
 		goto out_free_terms;
 
-	ret = add_event(list, idx, &attr, config_name ? : name, metric_id,
+	ret = add_event(parse_state, list, &attr, config_name ? : name, metric_id,
 			&config_terms);
 out_free_terms:
 	free_config_terms(&config_terms);
@@ -1006,7 +1011,8 @@ do {					\
 	return 0;
 }
 
-int parse_events_add_breakpoint(struct list_head *list, int *idx,
+int parse_events_add_breakpoint(struct parse_events_state *parse_state,
+				struct list_head *list,
 				u64 addr, char *type, u64 len)
 {
 	struct perf_event_attr attr;
@@ -1030,7 +1036,7 @@ int parse_events_add_breakpoint(struct list_head *list, int *idx,
 	attr.type = PERF_TYPE_BREAKPOINT;
 	attr.sample_period = 1;
 
-	return add_event(list, idx, &attr, /*name=*/NULL, /*mertic_id=*/NULL,
+	return add_event(parse_state, list, &attr, /*name=*/NULL, /*mertic_id=*/NULL,
 			 /*config_terms=*/NULL);
 }
 
@@ -1487,7 +1493,7 @@ int parse_events_add_numeric(struct parse_events_state *parse_state,
 	if (hybrid)
 		goto out_free_terms;
 
-	ret = add_event(list, &parse_state->idx, &attr, name, metric_id,
+	ret = add_event(parse_state, list, &attr, name, metric_id,
 			&config_terms);
 out_free_terms:
 	free_config_terms(&config_terms);
@@ -1498,7 +1504,7 @@ int parse_events_add_tool(struct parse_events_state *parse_state,
 			  struct list_head *list,
 			  int tool_event)
 {
-	return add_event_tool(list, &parse_state->idx, tool_event);
+	return add_event_tool(parse_state, list, tool_event);
 }
 
 static bool config_term_percore(struct list_head *config_terms)
@@ -1589,7 +1595,7 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,
 
 	if (!head_config) {
 		attr.type = pmu->type;
-		evsel = __add_event(list, &parse_state->idx, &attr,
+		evsel = __add_event(parse_state, list, &attr,
 				    /*init_attr=*/true, /*name=*/NULL,
 				    /*metric_id=*/NULL, pmu,
 				    /*config_terms=*/NULL, auto_merge_stats,
@@ -1646,7 +1652,7 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,
 		return -EINVAL;
 	}
 
-	evsel = __add_event(list, &parse_state->idx, &attr, /*init_attr=*/true,
+	evsel = __add_event(parse_state, list, &attr, /*init_attr=*/true,
 			    get_config_name(head_config),
 			    get_config_metric_id(head_config), pmu,
 			    &config_terms, auto_merge_stats, /*cpu_list=*/NULL);
@@ -3380,14 +3386,15 @@ char *parse_events_formats_error_string(char *additional_terms)
 	return NULL;
 }
 
-struct evsel *parse_events__add_event_hybrid(struct list_head *list, int *idx,
+struct evsel *parse_events__add_event_hybrid(struct parse_events_state *parse_state,
+					     struct list_head *list,
 					     struct perf_event_attr *attr,
 					     const char *name,
 					     const char *metric_id,
 					     struct perf_pmu *pmu,
 					     struct list_head *config_terms)
 {
-	return __add_event(list, idx, attr, /*init_attr=*/true, name, metric_id,
+	return __add_event(parse_state, list, attr, /*init_attr=*/true, name, metric_id,
 			   pmu, config_terms, /*auto_merge_stats=*/false,
 			   /*cpu_list=*/NULL);
 }
diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
index f60a661a2247..218a282d8b3d 100644
--- a/tools/perf/util/parse-events.h
+++ b/tools/perf/util/parse-events.h
@@ -186,12 +186,13 @@ int parse_events_add_numeric(struct parse_events_state *parse_state,
 int parse_events_add_tool(struct parse_events_state *parse_state,
 			  struct list_head *list,
 			  int tool_event);
-int parse_events_add_cache(struct list_head *list, int *idx,
+int parse_events_add_cache(struct parse_events_state *parse_state,
+			   struct list_head *list,
 			   char *type, char *op_result1, char *op_result2,
 			   struct parse_events_error *error,
-			   struct list_head *head_config,
-			   struct parse_events_state *parse_state);
-int parse_events_add_breakpoint(struct list_head *list, int *idx,
+			   struct list_head *head_config);
+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,
@@ -199,7 +200,8 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,
 			 bool auto_merge_stats,
 			 bool use_alias);
 
-struct evsel *parse_events__add_event(int idx, struct perf_event_attr *attr,
+struct evsel *parse_events__add_event(struct parse_events_state *parse_state,
+				      struct perf_event_attr *attr,
 				      const char *name, const char *metric_id,
 				      struct perf_pmu *pmu);
 
@@ -268,7 +270,8 @@ static inline bool is_sdt_event(char *str __maybe_unused)
 
 int perf_pmu__test_parse_init(void);
 
-struct evsel *parse_events__add_event_hybrid(struct list_head *list, int *idx,
+struct evsel *parse_events__add_event_hybrid(struct parse_events_state *parse_state,
+					     struct list_head *list,
 					     struct perf_event_attr *attr,
 					     const char *name,
 					     const char *metric_id,
diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y
index 2d60f3cbe42b..30c382d4a605 100644
--- a/tools/perf/util/parse-events.y
+++ b/tools/perf/util/parse-events.y
@@ -478,8 +478,7 @@ PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_RESULT '-' PE_NAME_CACHE_OP_RESULT opt_e
 
 	list = alloc_list();
 	ABORT_ON(!list);
-	err = parse_events_add_cache(list, &parse_state->idx, $1, $3, $5, error, $6,
-				     parse_state);
+	err = parse_events_add_cache(parse_state, list, $1, $3, $5, error, $6);
 	parse_events_terms__delete($6);
 	free($1);
 	free($3);
@@ -500,8 +499,7 @@ PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_RESULT opt_event_config
 
 	list = alloc_list();
 	ABORT_ON(!list);
-	err = parse_events_add_cache(list, &parse_state->idx, $1, $3, NULL, error, $4,
-				     parse_state);
+	err = parse_events_add_cache(parse_state, list, $1, $3, NULL, error, $4);
 	parse_events_terms__delete($4);
 	free($1);
 	free($3);
@@ -521,8 +519,7 @@ PE_NAME_CACHE_TYPE opt_event_config
 
 	list = alloc_list();
 	ABORT_ON(!list);
-	err = parse_events_add_cache(list, &parse_state->idx, $1, NULL, NULL, error, $2,
-				     parse_state);
+	err = parse_events_add_cache(parse_state, list, $1, NULL, NULL, error, $2);
 	parse_events_terms__delete($2);
 	free($1);
 	if (err) {
@@ -541,8 +538,7 @@ PE_PREFIX_MEM PE_VALUE '/' PE_VALUE ':' PE_MODIFIER_BP sep_dc
 
 	list = alloc_list();
 	ABORT_ON(!list);
-	err = parse_events_add_breakpoint(list, &parse_state->idx,
-					  $2, $6, $4);
+	err = parse_events_add_breakpoint(parse_state, list, $2, $6, $4);
 	free($6);
 	if (err) {
 		free(list);
@@ -558,8 +554,7 @@ PE_PREFIX_MEM PE_VALUE '/' PE_VALUE sep_dc
 
 	list = alloc_list();
 	ABORT_ON(!list);
-	if (parse_events_add_breakpoint(list, &parse_state->idx,
-					$2, NULL, $4)) {
+	if (parse_events_add_breakpoint(parse_state, list, $2, NULL, $4)) {
 		free(list);
 		YYABORT;
 	}
@@ -574,8 +569,7 @@ PE_PREFIX_MEM PE_VALUE ':' PE_MODIFIER_BP sep_dc
 
 	list = alloc_list();
 	ABORT_ON(!list);
-	err = parse_events_add_breakpoint(list, &parse_state->idx,
-					  $2, $4, 0);
+	err = parse_events_add_breakpoint(parse_state, list, $2, $4, 0);
 	free($4);
 	if (err) {
 		free(list);
@@ -591,8 +585,7 @@ PE_PREFIX_MEM PE_VALUE sep_dc
 
 	list = alloc_list();
 	ABORT_ON(!list);
-	if (parse_events_add_breakpoint(list, &parse_state->idx,
-					$2, NULL, 0)) {
+	if (parse_events_add_breakpoint(parse_state, list, $2, NULL, 0)) {
 		free(list);
 		YYABORT;
 	}
-- 
2.31.1
Other recent patches touching these files
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help