[PATCH 08/12] libperf: Add read_event to perf/event.h

[Jiri Olsa]

Moving read_event event definition into libperf's event.h
header include.

In order to keep libperf simple, we switch 'u64/u32/u16/u8'
types used events to their generic '__u*' versions.

Perf added 'u*' types mainly to ease up printing __u64 values
as stated in the linux/types.h comment:

  /*
   * We define u64 as uint64_t for every architecture
   * so that we can print it with "%"PRIx64 without getting warnings.
   *
   * typedef __u64 u64;
   * typedef __s64 s64;
   */

Adding and using new PRI_lu64 and PRI_lx64 macros to be used for
that.  Using extra '_' to ease up the reading and differentiate
them from standard PRI*64 macros.

Link: http://lkml.kernel.org/n/tip-f41v4s56i2u4hbn2hzufa...@git.kernel.org
Signed-off-by: Jiri Olsa <jo...@kernel.org>
---
 tools/perf/lib/include/perf/event.h | 12 ++++++++++++
 tools/perf/util/event.h             | 12 ------------
 tools/perf/util/session.c           |  8 ++++----
 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 3bd2727ac5f9..a03dbe776a44 100644
--- a/tools/perf/lib/include/perf/event.h
+++ b/tools/perf/lib/include/perf/event.h
@@ -61,4 +61,16 @@ struct lost_samples_event {
        __u64 lost;
 };
 
+/*
+ * PERF_FORMAT_ENABLED | PERF_FORMAT_RUNNING | PERF_FORMAT_ID
+ */
+struct read_event {
+       struct perf_event_header header;
+       __u32 pid, tid;
+       __u64 value;
+       __u64 time_enabled;
+       __u64 time_running;
+       __u64 id;
+};
+
 #endif /* __LIBPERF_EVENT_H */
diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index 1bf44b73fbbf..89872279a5af 100644
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -16,18 +16,6 @@
 #define PRI_lu64 "l" PRIu64
 #define PRI_lx64 "l" PRIx64
 
-/*
- * PERF_FORMAT_ENABLED | PERF_FORMAT_RUNNING | PERF_FORMAT_ID
- */
-struct read_event {
-       struct perf_event_header header;
-       u32 pid, tid;
-       u64 value;
-       u64 time_enabled;
-       u64 time_running;
-       u64 id;
-};
-
 struct throttle_event {
        struct perf_event_header header;
        u64 time;
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 82e0438a9160..cb1d8dcd0c19 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -1260,7 +1260,7 @@ static void dump_read(struct evsel *evsel, union 
perf_event *event)
        if (!dump_trace)
                return;
 
-       printf(": %d %d %s %" PRIu64 "\n", event->read.pid, event->read.tid,
+       printf(": %d %d %s %" PRI_lu64 "\n", event->read.pid, event->read.tid,
               perf_evsel__name(evsel),
               event->read.value);
 
@@ -1270,13 +1270,13 @@ static void dump_read(struct evsel *evsel, union 
perf_event *event)
        read_format = evsel->core.attr.read_format;
 
        if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED)
-               printf("... time enabled : %" PRIu64 "\n", 
read_event->time_enabled);
+               printf("... time enabled : %" PRI_lu64 "\n", 
read_event->time_enabled);
 
        if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING)
-               printf("... time running : %" PRIu64 "\n", 
read_event->time_running);
+               printf("... time running : %" PRI_lu64 "\n", 
read_event->time_running);
 
        if (read_format & PERF_FORMAT_ID)
-               printf("... id           : %" PRIu64 "\n", read_event->id);
+               printf("... id           : %" PRI_lu64 "\n", read_event->id);
 }
 
 static struct machine *machines__find_for_cpumode(struct machines *machines,
-- 
2.21.0