[PATCH 10/59] libperf: Move metric_id to perf_evsel

[Jiri Olsa <jolsa@redhat.com>]

Moving metric_id to perf_evsel struct.

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

diff --git a/tools/lib/perf/include/internal/evsel.h b/tools/lib/perf/include/internal/evsel.h
index ef5a85de7ba9..dafa1d6be731 100644
--- a/tools/lib/perf/include/internal/evsel.h
+++ b/tools/lib/perf/include/internal/evsel.h
@@ -61,6 +61,7 @@ struct perf_evsel {
                 char			*name;
 		bool			auto_merge_stats;
 		struct list_head	config_terms;
+		const char		*metric_id;
 	};
 };
 
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index bc5a213b3955..52781210a874 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -410,9 +410,9 @@ struct evsel *evsel__clone(struct evsel *orig)
 		if (evsel->filter == NULL)
 			goto out_err;
 	}
-	if (orig->metric_id) {
-		evsel->metric_id = strdup(orig->metric_id);
-		if (evsel->metric_id == NULL)
+	if (orig->core.metric_id) {
+		evsel->core.metric_id = strdup(orig->core.metric_id);
+		if (evsel->core.metric_id == NULL)
 			goto out_err;
 	}
 	evsel->cgrp = cgroup__get(orig->cgrp);
@@ -786,8 +786,8 @@ const char *evsel__name(struct evsel *evsel)
 
 const char *evsel__metric_id(const struct evsel *evsel)
 {
-	if (evsel->metric_id)
-		return evsel->metric_id;
+	if (evsel->core.metric_id)
+		return evsel->core.metric_id;
 
 	if (evsel->core.attr.type == PERF_TYPE_SOFTWARE && evsel->tool_event)
 		return "duration_time";
@@ -1439,7 +1439,7 @@ void evsel__exit(struct evsel *evsel)
 	zfree(&evsel->group_name);
 	zfree(&evsel->core.name);
 	zfree(&evsel->pmu_name);
-	zfree(&evsel->metric_id);
+	zfree(&evsel->core.metric_id);
 	evsel__zero_per_pkg(evsel);
 	hashmap__free(evsel->per_pkg_mask);
 	evsel->per_pkg_mask = NULL;
diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index b703e78ace23..b55173bf8f70 100644
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -67,7 +67,6 @@ struct evsel {
 		double			scale;
 		const char		*unit;
 		struct cgroup		*cgrp;
-		const char		*metric_id;
 		enum perf_tool_event	tool_event;
 		/* parse modifier helper */
 		int			exclude_GH;
diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
index b54856cb14d0..3c8afef83ebd 100644
--- a/tools/perf/util/metricgroup.c
+++ b/tools/perf/util/metricgroup.c
@@ -669,20 +669,20 @@ static int decode_all_metric_ids(struct evlist *perf_evlist, const char *modifie
 	int ret = 0;
 
 	evlist__for_each_entry(perf_evlist, ev) {
-		if (!ev->metric_id)
+		if (!ev->core.metric_id)
 			continue;
 
 		ret = strbuf_setlen(&sb, 0);
 		if (ret)
 			break;
 
-		ret = decode_metric_id(&sb, ev->metric_id);
+		ret = decode_metric_id(&sb, ev->core.metric_id);
 		if (ret)
 			break;
 
-		free((char *)ev->metric_id);
-		ev->metric_id = strdup(sb.buf);
-		if (!ev->metric_id) {
+		free((char *)ev->core.metric_id);
+		ev->core.metric_id = strdup(sb.buf);
+		if (!ev->core.metric_id) {
 			ret = -ENOMEM;
 			break;
 		}
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index c08b7fa8dae4..ee04fec441e7 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -390,7 +390,7 @@ __add_event(struct list_head *list, int *idx,
 		evsel->core.name = strdup(name);
 
 	if (metric_id)
-		evsel->metric_id = strdup(metric_id);
+		evsel->core.metric_id = strdup(metric_id);
 
 	if (config_terms)
 		list_splice_init(config_terms, &evsel->core.config_terms);
-- 
2.31.1