[PATCH 10/23] libperf: Add PERF_RECORD_AUXTRACE_ERROR 'struct auxtrace_error_event' to perf/event.h

[Jiri Olsa]

Move the PERF_RECORD_AUXTRACE_ERROR 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.

Link: http://lkml.kernel.org/n/tip-2i1ggfthfst9ont7ulmej...@git.kernel.org
Signed-off-by: Jiri Olsa <jo...@kernel.org>
---
 tools/perf/lib/include/perf/event.h | 15 +++++++++++++++
 tools/perf/util/auxtrace.c          |  2 +-
 tools/perf/util/event.h             | 15 ---------------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/tools/perf/lib/include/perf/event.h 
b/tools/perf/lib/include/perf/event.h
index 78001c2973b6..6292b7c41bac 100644
--- a/tools/perf/lib/include/perf/event.h
+++ b/tools/perf/lib/include/perf/event.h
@@ -219,4 +219,19 @@ struct auxtrace_event {
        __u32                    reserved__; /* For alignment */
 };
 
+#define MAX_AUXTRACE_ERROR_MSG 64
+
+struct auxtrace_error_event {
+       struct perf_event_header header;
+       __u32                    type;
+       __u32                    code;
+       __u32                    cpu;
+       __u32                    pid;
+       __u32                    tid;
+       __u32                    fmt;
+       __u64                    ip;
+       __u64                    time;
+       char                     msg[MAX_AUXTRACE_ERROR_MSG];
+};
+
 #endif /* __LIBPERF_EVENT_H */
diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c
index 0d2ba1397e47..cddf04c45a20 100644
--- a/tools/perf/util/auxtrace.c
+++ b/tools/perf/util/auxtrace.c
@@ -1188,7 +1188,7 @@ size_t perf_event__fprintf_auxtrace_error(union 
perf_event *event, FILE *fp)
        if (!e->fmt)
                msg = (const char *)&e->time;
 
-       ret += fprintf(fp, " cpu %d pid %d tid %d ip %#"PRIx64" code %u: %s\n",
+       ret += fprintf(fp, " cpu %d pid %d tid %d ip %#"PRI_lx64" code %u: 
%s\n",
                       e->cpu, e->pid, e->tid, e->ip, e->code, msg);
        return ret;
 }
diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index 60895a3b2c85..e334ecbe50a0 100644
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -332,21 +332,6 @@ struct events_stats {
        u32 nr_proc_map_timeout;
 };
 
-#define MAX_AUXTRACE_ERROR_MSG 64
-
-struct auxtrace_error_event {
-       struct perf_event_header header;
-       u32 type;
-       u32 code;
-       u32 cpu;
-       u32 pid;
-       u32 tid;
-       u32 fmt;
-       u64 ip;
-       u64 time;
-       char msg[MAX_AUXTRACE_ERROR_MSG];
-};
-
 struct aux_event {
        struct perf_event_header header;
        u64     aux_offset;
-- 
2.21.0