[tip: perf/core] libperf: Add PERF_RECORD_COMPRESSED 'struct compressed_event' to perf/event.h

tip-bot2 for Jiri Olsa
2019-08-29T19:03:13Z

The following commit has been merged into the perf/core branch of tip:

Commit-ID: f5f684321791eb5ebb8c56d7d223e71fe08b5dd9
Gitweb: https://git.kernel.org/tip/f5f684321791eb5ebb8c56d7d223e71fe08b5dd9
Author: Jiri Olsa <jolsa@kernel.org>
AuthorDate: Wed, 28 Aug 2019 15:57:14 +02:00
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitterDate: Thu, 29 Aug 2019 08:36:12 -03:00

libperf: Add PERF_RECORD_COMPRESSED 'struct compressed_event' to perf/event.h

Move the PERF_RECORD_COMPRESSED 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-21-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/lib/include/perf/event.h | 5 +++++
tools/perf/util/event.h | 5 -----
2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/perf/lib/include/perf/event.h b/tools/perf/lib/include/perf/event.h
index ed1c22e..ef7a46e 100644
--- a/tools/perf/lib/include/perf/event.h
+++ b/tools/perf/lib/include/perf/event.h
@@ -318,4 +318,9 @@ struct feature_event {
char data[];
};

+struct compressed_event {
+ struct perf_event_header header;
+ char data[];
+};
+
#endif /* __LIBPERF_EVENT_H */
diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index 94777ee..ee2ee23 100644
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -337,11 +337,6 @@ enum {
PERF_STAT_ROUND_TYPE__FINAL = 1,
};

-struct compressed_event {
- struct perf_event_header header;
- char data[];
-};
-
union perf_event {
struct perf_event_header header;
struct perf_record_mmap mmap;