[PATCH 33/59] libperf: Move in perf_evsel__add_event function

[Jiri Olsa <jolsa@redhat.com>]

Moving perf_evsel__add_event function to libperf.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 .../lib/perf/include/internal/parse-events.h  |  9 ++++
 tools/lib/perf/parse-events.c                 | 47 +++++++++++++++++++
 tools/perf/util/parse-events.c                | 44 -----------------
 3 files changed, 56 insertions(+), 44 deletions(-)

diff --git a/tools/lib/perf/include/internal/parse-events.h b/tools/lib/perf/include/internal/parse-events.h
index b314c8639c78..7bf58f6fc53f 100644
--- a/tools/lib/perf/include/internal/parse-events.h
+++ b/tools/lib/perf/include/internal/parse-events.h
@@ -120,4 +120,13 @@ void parse_events_terms__delete(struct list_head *terms);
 void parse_events_terms__purge(struct list_head *terms);
 int parse_events_copy_term_list(struct list_head *old,
 				 struct list_head **new);
+
+struct perf_evsel *
+perf_evsel__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,
+		      struct list_head *config_terms, bool auto_merge_stats,
+		      const char *cpu_list);
 #endif /* __LIBPERF_PARSE_EVENTS_H */
diff --git a/tools/lib/perf/parse-events.c b/tools/lib/perf/parse-events.c
index cda7c1e5563e..6d840764c84d 100644
--- a/tools/lib/perf/parse-events.c
+++ b/tools/lib/perf/parse-events.c
@@ -5,6 +5,9 @@
 #include <linux/zalloc.h>
 #include <string.h>
 #include <internal/parse-events.h>
+#include <internal/pmu.h>
+#include <internal/evsel.h>
+#include <perf/cpumap.h>
 #include <stdlib.h>
 #include <errno.h>
 
@@ -302,3 +305,47 @@ void parse_events_terms__delete(struct list_head *terms)
 	parse_events_terms__purge(terms);
 	free(terms);
 }
+
+struct perf_evsel *
+perf_evsel__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,
+		      struct list_head *config_terms, bool auto_merge_stats,
+		      const char *cpu_list)
+{
+	struct perf_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);
+
+	evsel = parse_state->ops->perf_evsel__new(attr, *idx, init_attr);
+	if (!evsel) {
+		perf_cpu_map__put(cpus);
+		return NULL;
+	}
+
+	(*idx)++;
+	evsel->cpus = cpus;
+	evsel->own_cpus = perf_cpu_map__get(cpus);
+	evsel->system_wide = pmu ? pmu->is_uncore : false;
+	evsel->auto_merge_stats = auto_merge_stats;
+
+	if (name)
+		evsel->name = strdup(name);
+
+	if (metric_id)
+		evsel->metric_id = strdup(metric_id);
+
+	if (config_terms)
+		list_splice_init(config_terms, &evsel->config_terms);
+
+	if (list)
+		list_add_tail(&evsel->node, list);
+
+	return evsel;
+}
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index c971291f2ec7..77e122eb5601 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -281,50 +281,6 @@ static char *get_config_name(struct list_head *head_terms)
 	return get_config_str(head_terms, PARSE_EVENTS__TERM_TYPE_NAME);
 }
 
-static struct perf_evsel *
-perf_evsel__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,
-		      struct list_head *config_terms, bool auto_merge_stats,
-		      const char *cpu_list)
-{
-	struct perf_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);
-
-	evsel = parse_state->ops->perf_evsel__new(attr, *idx, init_attr);
-	if (!evsel) {
-		perf_cpu_map__put(cpus);
-		return NULL;
-	}
-
-	(*idx)++;
-	evsel->cpus = cpus;
-	evsel->own_cpus = perf_cpu_map__get(cpus);
-	evsel->system_wide = pmu ? pmu->is_uncore : false;
-	evsel->auto_merge_stats = auto_merge_stats;
-
-	if (name)
-		evsel->name = strdup(name);
-
-	if (metric_id)
-		evsel->metric_id = strdup(metric_id);
-
-	if (config_terms)
-		list_splice_init(config_terms, &evsel->config_terms);
-
-	if (list)
-		list_add_tail(&evsel->node, list);
-
-	return evsel;
-}
-
 static struct evsel *
 evsel__add_event(struct parse_events_state *parse_state,
 		 struct list_head *list,
-- 
2.31.1