libperf: Add PERF_RECORD_CPU_MAP 'struct cpu_map_event' to perf/event.h

Move the PERF_RECORD_CPU_MAP event definition to libperf's event.h.

In order to keep libperf simple, we switch 'u64/u32/u16/u8'
types used events to their generic '__u*' versions.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20190828135717.7245-3-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/lib/include/perf/event.h b/tools/perf/lib/include/perf/event.h
index bb66da57d36695ba681c3ad088c983305d2d30ab..469be778fdc1024e187beb527514b43a169f087e 100644 (file)
--- a/tools/perf/lib/include/perf/event.h
+++ b/tools/perf/lib/include/perf/event.h
@@ -115,4 +115,30 @@ struct attr_event {
        __u64                    id[];
 };
 
+enum {
+       PERF_CPU_MAP__CPUS = 0,
+       PERF_CPU_MAP__MASK = 1,
+};
+
+struct cpu_map_entries {
+       __u16                    nr;
+       __u16                    cpu[];
+};
+
+struct cpu_map_mask {
+       __u16                    nr;
+       __u16                    long_size;
+       unsigned long            mask[];
+};
+
+struct cpu_map_data {
+       __u16                    type;
+       char                     data[];
+};
+
+struct cpu_map_event {
+       struct perf_event_header header;
+       struct cpu_map_data      data;
+};
+
 #endif /* __LIBPERF_EVENT_H */

diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index 21fa6c2acea41e9b7cb7743a5e75c8cf786fe610..84bf67353635cac8a989760ab48e0bbd53590038 100644 (file)
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -337,32 +337,6 @@ struct events_stats {
        u32 nr_proc_map_timeout;
 };
 
-enum {
-       PERF_CPU_MAP__CPUS = 0,
-       PERF_CPU_MAP__MASK = 1,
-};
-
-struct cpu_map_entries {
-       u16     nr;
-       u16     cpu[];
-};
-
-struct cpu_map_mask {
-       u16     nr;
-       u16     long_size;
-       unsigned long mask[];
-};
-
-struct cpu_map_data {
-       u16     type;
-       char    data[];
-};
-
-struct cpu_map_event {
-       struct perf_event_header        header;
-       struct cpu_map_data             data;
-};
-
 enum {
        PERF_EVENT_UPDATE__UNIT  = 0,
        PERF_EVENT_UPDATE__SCALE = 1,