libperf: Add PERF_RECORD_HEADER_FEATURE 'struct feature_event' to perf/event.h

Move the PERF_RECORD_HEADER_FEATURE 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-20-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 0338916af4bfbf58518a011f3603868bfb9448b7..33c20e26b290803c31478c033a36e7773bc789bd 100644 (file)
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -212,7 +212,7 @@ static int process_feature_event(struct perf_session *session,
                return perf_event__process_feature(session, event);
 
        if (event->feat.feat_id != HEADER_LAST_FEATURE) {
-               pr_err("failed: wrong feature ID: %" PRIu64 "\n",
+               pr_err("failed: wrong feature ID: %" PRI_lu64 "\n",
                       event->feat.feat_id);
                return -1;
        }

diff --git a/tools/perf/lib/include/perf/event.h b/tools/perf/lib/include/perf/event.h
index 7600f53f6ad1dddcb5e438545893e9c20fd9b365..ed1c22e650e217abe89b81c13aeb24a6bef21c90 100644 (file)
--- a/tools/perf/lib/include/perf/event.h
+++ b/tools/perf/lib/include/perf/event.h
@@ -312,4 +312,10 @@ struct time_conv_event {
        __u64                    time_zero;
 };
 
+struct feature_event {
+       struct perf_event_header header;
+       __u64                    feat_id;
+       char                     data[];
+};
+
 #endif /* __LIBPERF_EVENT_H */

diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index d758485956b3dd754b5aff2a0e904970658d650f..94777ee435c2ab7658f6422b52bb27266f4983c2 100644 (file)
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -337,12 +337,6 @@ enum {
        PERF_STAT_ROUND_TYPE__FINAL     = 1,
 };
 
-struct feature_event {
-       struct perf_event_header        header;
-       u64                             feat_id;
-       char                            data[];
-};
-
 struct compressed_event {
        struct perf_event_header        header;
        char                            data[];