[PATCH 09/59] libperf: Move config_terms to perf_evsel

[Jiri Olsa <jolsa@redhat.com>]

Moving config_terms to perf_evsel struct.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 tools/lib/perf/include/internal/evsel.h |  1 +
 tools/perf/builtin-top.c                |  2 +-
 tools/perf/util/evsel.c                 | 10 +++++-----
 tools/perf/util/evsel.h                 |  1 -
 tools/perf/util/parse-events.c          |  6 +++---
 tools/perf/util/record.c                |  2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tools/lib/perf/include/internal/evsel.h b/tools/lib/perf/include/internal/evsel.h
index be30dc1ed9a7..ef5a85de7ba9 100644
--- a/tools/lib/perf/include/internal/evsel.h
+++ b/tools/lib/perf/include/internal/evsel.h
@@ -60,6 +60,7 @@ struct perf_evsel {
         struct {
                 char			*name;
 		bool			auto_merge_stats;
+		struct list_head	config_terms;
 	};
 };
 
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 020c4f110c10..c307d3015cfa 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -951,7 +951,7 @@ static int perf_top__overwrite_check(struct perf_top *top)
 
 	evlist__for_each_entry(evlist, evsel) {
 		set = -1;
-		config_terms = &evsel->config_terms;
+		config_terms = &evsel->core.config_terms;
 		list_for_each_entry(term, config_terms, list) {
 			if (term->type == EVSEL__CONFIG_TERM_OVERWRITE)
 				set = term->val.overwrite ? 1 : 0;
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 10ba2f91d5a2..bc5a213b3955 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -247,7 +247,7 @@ void evsel__init(struct evsel *evsel,
 	evsel->evlist	   = NULL;
 	evsel->bpf_obj	   = NULL;
 	evsel->bpf_fd	   = -1;
-	INIT_LIST_HEAD(&evsel->config_terms);
+	INIT_LIST_HEAD(&evsel->core.config_terms);
 	INIT_LIST_HEAD(&evsel->bpf_counter_list);
 	perf_evsel__object.init(evsel);
 	evsel->sample_size = __evsel__sample_size(attr->sample_type);
@@ -357,7 +357,7 @@ int copy_config_terms(struct list_head *dst, struct list_head *src)
 
 static int evsel__copy_config_terms(struct evsel *dst, struct evsel *src)
 {
-	return copy_config_terms(&dst->config_terms, &src->config_terms);
+	return copy_config_terms(&dst->core.config_terms, &src->core.config_terms);
 }
 
 /**
@@ -917,7 +917,7 @@ static void evsel__apply_config_terms(struct evsel *evsel,
 				      struct record_opts *opts, bool track)
 {
 	struct evsel_config_term *term;
-	struct list_head *config_terms = &evsel->config_terms;
+	struct list_head *config_terms = &evsel->core.config_terms;
 	struct perf_event_attr *attr = &evsel->core.attr;
 	/* callgraph default */
 	struct callchain_param param = {
@@ -1050,7 +1050,7 @@ struct evsel_config_term *__evsel__get_config_term(struct evsel *evsel, enum evs
 {
 	struct evsel_config_term *term, *found_term = NULL;
 
-	list_for_each_entry(term, &evsel->config_terms, list) {
+	list_for_each_entry(term, &evsel->core.config_terms, list) {
 		if (term->type == type)
 			found_term = term;
 	}
@@ -1420,7 +1420,7 @@ void free_config_terms(struct list_head *config_terms)
 
 static void evsel__free_config_terms(struct evsel *evsel)
 {
-	free_config_terms(&evsel->config_terms);
+	free_config_terms(&evsel->core.config_terms);
 }
 
 void evsel__exit(struct evsel *evsel)
diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index ead2c3f3ea05..b703e78ace23 100644
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -84,7 +84,6 @@ struct evsel {
 		bool			use_config_name;
 		int			bpf_fd;
 		struct bpf_object	*bpf_obj;
-		struct list_head	config_terms;
 	};
 
 	/*
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 09fbb128df63..c08b7fa8dae4 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -393,7 +393,7 @@ __add_event(struct list_head *list, int *idx,
 		evsel->metric_id = strdup(metric_id);
 
 	if (config_terms)
-		list_splice_init(config_terms, &evsel->config_terms);
+		list_splice_init(config_terms, &evsel->core.config_terms);
 
 	if (list)
 		list_add_tail(&evsel->core.node, list);
@@ -607,7 +607,7 @@ static int add_tracepoint(struct list_head *list, int *idx,
 
 		if (get_config_terms(head_config, &config_terms))
 			return -ENOMEM;
-		list_splice(&config_terms, &evsel->config_terms);
+		list_splice(&config_terms, &evsel->core.config_terms);
 	}
 
 	list_add_tail(&evsel->core.node, list);
@@ -1658,7 +1658,7 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,
 
 	evsel->pmu_name = name ? strdup(name) : NULL;
 	evsel->use_uncore_alias = use_uncore_alias;
-	evsel->percore = config_term_percore(&evsel->config_terms);
+	evsel->percore = config_term_percore(&evsel->core.config_terms);
 
 	if (parse_state->fake_pmu)
 		return 0;
diff --git a/tools/perf/util/record.c b/tools/perf/util/record.c
index bff669b615ee..83e3a8cce9ba 100644
--- a/tools/perf/util/record.c
+++ b/tools/perf/util/record.c
@@ -41,7 +41,7 @@ static struct evsel *evsel__read_sampler(struct evsel *evsel, struct evlist *evl
 static u64 evsel__config_term_mask(struct evsel *evsel)
 {
 	struct evsel_config_term *term;
-	struct list_head *config_terms = &evsel->config_terms;
+	struct list_head *config_terms = &evsel->core.config_terms;
 	u64 term_types = 0;
 
 	list_for_each_entry(term, config_terms, list) {
-- 
2.31.1