[PATCH 21/25] perf evsel: Switch to libperf's cpumap.h

From: Arnaldo Carvalho de Melo
Date: Thu Aug 22 2019 - 17:02:43 EST


From: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

We don't need what is in perf's util/cpumap.h, just the struct cpu_map
that is in libperf's internal/cpumap.h file to cover this one case:

tools/perf/util/evsel.h:215:27: error: dereferencing pointer to incomplete type âstruct perf_cpu_mapâ
215 | return evsel__cpus(evsel)->nr;

So switch to libperf's cpumap.h and add some missing struct foward
declarations and include sys/types.h to get pid_t.

Cc: Adrian Hunter <adrian.hunter@xxxxxxxxx>
Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
Link: https://lkml.kernel.org/n/tip-ufjkpohijti05ggk69s91ktf@xxxxxxxxxxxxxx
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
---
tools/perf/util/evsel.h | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index cd336cf2eaa9..5a351cae66df 100644
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -5,14 +5,17 @@
#include <linux/list.h>
#include <stdbool.h>
#include <stdio.h>
+#include <sys/types.h>
#include <linux/perf_event.h>
#include <linux/types.h>
#include <internal/evsel.h>
#include <perf/evsel.h>
#include "symbol_conf.h"
-#include "cpumap.h"
+#include <internal/cpumap.h>

+struct addr_location;
struct evsel;
+union perf_event;

/*
* Per fd, to map back from PERF_SAMPLE_ID to evsel, only used when there are
--
2.21.0