libperf: Add PERF_RECORD_AUX 'struct aux_event' to perf/event.h

Move the PERF_RECORD_AUX 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-12-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 6292b7c41bacffd4743dba904d9e89dc0f679390..d453ac833a58f20e6361503ac4e725156a0044fa 100644 (file)
--- a/tools/perf/lib/include/perf/event.h
+++ b/tools/perf/lib/include/perf/event.h
@@ -234,4 +234,11 @@ struct auxtrace_error_event {
        char                     msg[MAX_AUXTRACE_ERROR_MSG];
 };
 
+struct aux_event {
+       struct perf_event_header header;
+       __u64                    aux_offset;
+       __u64                    aux_size;
+       __u64                    flags;
+};
+
 #endif /* __LIBPERF_EVENT_H */

diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index e33dd1a040cc0e91adfa12619cb5a66761aae995..b048e6084612526d47d0e54a6d862928cdfc231c 100644 (file)
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -1449,7 +1449,7 @@ int perf_event__process_exit(struct perf_tool *tool __maybe_unused,
 
 size_t perf_event__fprintf_aux(union perf_event *event, FILE *fp)
 {
-       return fprintf(fp, " offset: %#"PRIx64" size: %#"PRIx64" flags: %#"PRIx64" [%s%s%s]\n",
+       return fprintf(fp, " offset: %#"PRI_lx64" size: %#"PRI_lx64" flags: %#"PRI_lx64" [%s%s%s]\n",
                       event->aux.aux_offset, event->aux.aux_size,
                       event->aux.flags,
                       event->aux.flags & PERF_AUX_FLAG_TRUNCATED ? "T" : "",

diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index e334ecbe50a04fad834628497e0a72508992e7ef..db901aea33afa2f43e9f208105aae3ef578322ce 100644 (file)
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -332,13 +332,6 @@ struct events_stats {
        u32 nr_proc_map_timeout;
 };
 
-struct aux_event {
-       struct perf_event_header header;
-       u64     aux_offset;
-       u64     aux_size;
-       u64     flags;
-};
-
 struct itrace_start_event {
        struct perf_event_header header;
        u32 pid, tid;