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.
Link: http://lkml.kernel.org/n/[email protected]
Signed-off-by: Jiri Olsa <[email protected]>
---
tools/perf/builtin-report.c | 2 +-
tools/perf/lib/include/perf/event.h | 6 ++++++
tools/perf/util/event.h | 6 ------
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 318b0b95c14c..0d71f26a8a44 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -211,7 +211,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 7600f53f6ad1..ed1c22e650e2 100644
--- 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 d758485956b3..94777ee435c2 100644
--- 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[];
--
2.21.0
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 1b8896fb296f4087c45c997c4b212544c639e272
Gitweb: https://git.kernel.org/tip/1b8896fb296f4087c45c997c4b212544c639e272
Author: Jiri Olsa <[email protected]>
AuthorDate: Wed, 28 Aug 2019 15:57:13 +02:00
Committer: Arnaldo Carvalho de Melo <[email protected]>
CommitterDate: Thu, 29 Aug 2019 08:36:12 -03:00
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 <[email protected]>
Cc: Alexander Shishkin <[email protected]>
Cc: Michael Petlan <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
tools/perf/builtin-report.c | 2 +-
tools/perf/lib/include/perf/event.h | 6 ++++++
tools/perf/util/event.h | 6 ------
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 0338916..33c20e2 100644
--- 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 7600f53..ed1c22e 100644
--- 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 d758485..94777ee 100644
--- 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[];