[PATCH 17/23] libperf: Add PERF_RECORD_STAT_ROUND 'struct stat_round_event' to perf/event.h

Jiri Olsa
2019-08-28T13:58:03Z

Move the PERF_RECORD_STAT_ROUND 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-x7c2m4n8303nftb4maf333of@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/lib/include/perf/event.h | 6 ++++++
tools/perf/util/event.h | 6 ------
tools/perf/util/stat.c | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tools/perf/lib/include/perf/event.h b/tools/perf/lib/include/perf/event.h
index 7d1834f558d6..34d365bd2c5c 100644
--- a/tools/perf/lib/include/perf/event.h
+++ b/tools/perf/lib/include/perf/event.h
@@ -299,4 +299,10 @@ struct stat_event {
};
};

+struct stat_round_event {
+ struct perf_event_header header;
+ __u64 type;
+ __u64 time;
+};
+
#endif /* __LIBPERF_EVENT_H */
diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index f3a02e01852a..ec76412afba1 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 stat_round_event {
- struct perf_event_header header;
- u64 type;
- u64 time;
-};
-
struct time_conv_event {
struct perf_event_header header;
u64 time_shift;
diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c
index c0cd9f9bb0ea..4c7957496e7c 100644
--- a/tools/perf/util/stat.c
+++ b/tools/perf/util/stat.c
@@ -418,7 +418,7 @@ size_t perf_event__fprintf_stat_round(union perf_event *event, FILE *fp)
struct stat_round_event *rd = (struct stat_round_event *)event;
size_t ret;

- ret = fprintf(fp, "\n... time %" PRIu64 ", type %s\n", rd->time,
+ ret = fprintf(fp, "\n... time %" PRI_lu64 ", type %s\n", rd->time,
rd->type == PERF_STAT_ROUND_TYPE__FINAL ? "FINAL" : "INTERVAL");

return ret;
--
2.21.0