[PATCH 39/59] libperf: Move in parse_events__handle_error function

[Jiri Olsa <jolsa@redhat.com>]

Moving parse_events__handle_error function to libperf.

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

diff --git a/tools/lib/perf/include/internal/parse-events.h b/tools/lib/perf/include/internal/parse-events.h
index 88195ae2eb10..9706ce11e2fd 100644
--- a/tools/lib/perf/include/internal/parse-events.h
+++ b/tools/lib/perf/include/internal/parse-events.h
@@ -132,4 +132,6 @@ perf_evsel__add_event(struct parse_events_state *parse_state,
 		      const char *cpu_list);
 int parse_events__modifier_event(struct list_head *list, char *str, bool add, bool guest);
 int parse_events__modifier_group(struct list_head *list, char *event_mod, bool guest);
+void parse_events__handle_error(struct parse_events_error *err, int idx,
+				char *str, char *help);
 #endif /* __LIBPERF_PARSE_EVENTS_H */
diff --git a/tools/lib/perf/parse-events.c b/tools/lib/perf/parse-events.c
index 3b93528f4569..d2d538f89ff9 100644
--- a/tools/lib/perf/parse-events.c
+++ b/tools/lib/perf/parse-events.c
@@ -11,6 +11,8 @@
 #include <perf/cpumap.h>
 #include <stdlib.h>
 #include <errno.h>
+#include <asm/bug.h>
+#include "internal.h"
 
 struct event_symbol event_symbols_hw[PERF_COUNT_HW_MAX] = {
 	[PERF_COUNT_HW_CPU_CYCLES] = {
@@ -536,3 +538,36 @@ int parse_events__modifier_group(struct list_head *list,
 {
 	return parse_events__modifier_event(list, event_mod, true, guest);
 }
+
+void parse_events__handle_error(struct parse_events_error *err, int idx,
+				char *str, char *help)
+{
+	if (WARN(!str, "WARNING: failed to provide error string\n")) {
+		free(help);
+		return;
+	}
+	switch (err->num_errors) {
+	case 0:
+		err->idx = idx;
+		err->str = str;
+		err->help = help;
+		break;
+	case 1:
+		err->first_idx = err->idx;
+		err->idx = idx;
+		err->first_str = err->str;
+		err->str = str;
+		err->first_help = err->help;
+		err->help = help;
+		break;
+	default:
+		pr_debug("Multiple errors dropping message: %s (%s)\n",
+			err->str, err->help);
+		free(err->str);
+		err->str = str;
+		free(err->help);
+		err->help = help;
+		break;
+	}
+	err->num_errors++;
+}
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index ecbb7f284158..8cc29dd8743a 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -116,39 +116,6 @@ static int tp_event_has_id(const char *dir_path, struct dirent *evt_dir)
 
 #define MAX_EVENT_LENGTH 512
 
-void parse_events__handle_error(struct parse_events_error *err, int idx,
-				char *str, char *help)
-{
-	if (WARN(!str, "WARNING: failed to provide error string\n")) {
-		free(help);
-		return;
-	}
-	switch (err->num_errors) {
-	case 0:
-		err->idx = idx;
-		err->str = str;
-		err->help = help;
-		break;
-	case 1:
-		err->first_idx = err->idx;
-		err->idx = idx;
-		err->first_str = err->str;
-		err->str = str;
-		err->first_help = err->help;
-		err->help = help;
-		break;
-	default:
-		pr_debug("Multiple errors dropping message: %s (%s)\n",
-			err->str, err->help);
-		free(err->str);
-		err->str = str;
-		free(err->help);
-		err->help = help;
-		break;
-	}
-	err->num_errors++;
-}
-
 struct tracepoint_path *tracepoint_id_to_path(u64 config)
 {
 	struct tracepoint_path *path = NULL;
diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
index 78a8fa799b09..c058488ef8e2 100644
--- a/tools/perf/util/parse-events.h
+++ b/tools/perf/util/parse-events.h
@@ -61,8 +61,6 @@ struct perf_pmu_event_symbol {
 	enum perf_pmu_event_symbol_type	type;
 };
 
-void parse_events__handle_error(struct parse_events_error *err, int idx,
-				char *str, char *help);
 void parse_events__shrink_config_terms(void);
 void parse_events__clear_array(struct parse_events_array *a);
 int parse_events_name(struct list_head *list, const char *name);
-- 
2.31.1