libperf: Add PERF_RECORD_THROTTLE 'struct throttle_event' to perf/event.h

Move the PERF_RECORD_THROTTLE 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;
   */

Add and use new PRI_lu64 and PRI_lx64 macros for that.  Use extra '_' to
ease up the reading and differentiate them from standard PRI*64 macros.

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/20190825181752.722-10-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/lib/include/perf/event.h b/tools/perf/lib/include/perf/event.h
index f1830702e49a43c2ca21d028a1f6d42e36ebc6f1..ef5ec66b566ebbbb8445864f8dcea6b727e3ce69 100644 (file)
--- a/tools/perf/lib/include/perf/event.h
+++ b/tools/perf/lib/include/perf/event.h
@@ -73,4 +73,11 @@ struct read_event {
        __u64                    id;
 };
 
+struct throttle_event {
+       struct perf_event_header header;
+       __u64                    time;
+       __u64                    id;
+       __u64                    stream_id;
+};
+
 #endif /* __LIBPERF_EVENT_H */

diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index 008a2839d667317737e41158bba92f2bcdc1f6b3..40020f5b0484184858d9f1ad49a22f5a6dd058e3 100644 (file)
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -27,13 +27,6 @@
 #define PRI_lx64 PRIx64
 #endif
 
-struct throttle_event {
-       struct perf_event_header header;
-       u64 time;
-       u64 id;
-       u64 stream_id;
-};
-
 #ifndef KSYM_NAME_LEN
 #define KSYM_NAME_LEN 256
 #endif

diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c
index 5be85f50cd1c9002f2f6893f14e59e9b75ae2c6d..d21e270c7823cf538c2c379f274017aebe855d8e 100644 (file)
--- a/tools/perf/util/python.c
+++ b/tools/perf/util/python.c
@@ -233,8 +233,8 @@ static PyObject *pyrf_throttle_event__repr(struct pyrf_event *pevent)
 {
        struct throttle_event *te = (struct throttle_event *)(&pevent->event.header + 1);
 
-       return _PyUnicode_FromFormat("{ type: %sthrottle, time: %" PRIu64 ", id: %" PRIu64
-                                  ", stream_id: %" PRIu64 " }",
+       return _PyUnicode_FromFormat("{ type: %sthrottle, time: %" PRI_lu64 ", id: %" PRI_lu64
+                                  ", stream_id: %" PRI_lu64 " }",
                                   pevent->event.header.type == PERF_RECORD_THROTTLE ? "" : "un",
                                   te->time, te->id, te->stream_id);
 }