libperf: Add PERF_RECORD_AUXTRACE 'struct auxtrace_event' to perf/event.h

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

Ipn 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-10-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 02da7349145110f4bbc93508663f5cc8c8142d72..78001c2973b66aafbb9c1a2b1f7db9f4368d0e1c 100644 (file)
--- a/tools/perf/lib/include/perf/event.h
+++ b/tools/perf/lib/include/perf/event.h
@@ -208,4 +208,15 @@ struct auxtrace_info_event {
        __u64                    priv[];
 };
 
+struct auxtrace_event {
+       struct perf_event_header header;
+       __u64                    size;
+       __u64                    offset;
+       __u64                    reference;
+       __u32                    idx;
+       __u32                    tid;
+       __u32                    cpu;
+       __u32                    reserved__; /* For alignment */
+};
+
 #endif /* __LIBPERF_EVENT_H */

diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c
index 112c24aa2cf26962c394307e582ce44ca237e74c..5edec7123328f220bca711b7b0508d30600707d4 100644 (file)
--- a/tools/perf/util/auxtrace.c
+++ b/tools/perf/util/auxtrace.c
@@ -943,7 +943,7 @@ s64 perf_event__process_auxtrace(struct perf_session *session,
        s64 err;
 
        if (dump_trace)
-               fprintf(stdout, " size: %#"PRIx64"  offset: %#"PRIx64"  ref: %#"PRIx64"  idx: %u  tid: %d  cpu: %d\n",
+               fprintf(stdout, " size: %#"PRI_lx64"  offset: %#"PRI_lx64"  ref: %#"PRI_lx64"  idx: %u  tid: %d  cpu: %d\n",
                        event->auxtrace.size, event->auxtrace.offset,
                        event->auxtrace.reference, event->auxtrace.idx,
                        event->auxtrace.tid, event->auxtrace.cpu);

diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index ca2cae332c43ee6f1f116cc250398629ad58dd5b..60895a3b2c855ccfd2c267f0d75b3986fb4f8f54 100644 (file)
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -332,17 +332,6 @@ struct events_stats {
        u32 nr_proc_map_timeout;
 };
 
-struct auxtrace_event {
-       struct perf_event_header header;
-       u64 size;
-       u64 offset;
-       u64 reference;
-       u32 idx;
-       u32 tid;
-       u32 cpu;
-       u32 reserved__; /* For alignment */
-};
-
 #define MAX_AUXTRACE_ERROR_MSG 64
 
 struct auxtrace_error_event {