libperf: Add PERF_RECORD_STAT_CONFIG 'struct stat_config_event' to perf/event.h

Move the PERF_RECORD_STAT_CONFIG 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-16-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 fe0ce655af172cd9c8efe322cb2dd38958211059..ba6ed243a31f2eb31b03046aa61dc3da0f44e5be 100644 (file)
--- a/tools/perf/lib/include/perf/event.h
+++ b/tools/perf/lib/include/perf/event.h
@@ -264,4 +264,22 @@ struct thread_map_event {
        struct thread_map_event_entry    entries[];
 };
 
+enum {
+       PERF_STAT_CONFIG_TERM__AGGR_MODE        = 0,
+       PERF_STAT_CONFIG_TERM__INTERVAL         = 1,
+       PERF_STAT_CONFIG_TERM__SCALE            = 2,
+       PERF_STAT_CONFIG_TERM__MAX              = 3,
+};
+
+struct stat_config_event_entry {
+       __u64                    tag;
+       __u64                    val;
+};
+
+struct stat_config_event {
+       struct perf_event_header         header;
+       __u64                            nr;
+       struct stat_config_event_entry   data[];
+};
+
 #endif /* __LIBPERF_EVENT_H */

diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index b048e6084612526d47d0e54a6d862928cdfc231c..b711019a9ed215e33bbd75645c6fe241b98d39ee 100644 (file)
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -1235,7 +1235,7 @@ void perf_event__read_stat_config(struct perf_stat_config *config,
                CASE(INTERVAL,  interval)
 #undef CASE
                default:
-                       pr_warning("unknown stat config term %" PRIu64 "\n",
+                       pr_warning("unknown stat config term %" PRI_lu64 "\n",
                                   event->data[i].tag);
                }
        }

diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index 3a856696c6b15418ab94cfc126b8b5e14cd9ea71..68531d08dcec38800ddefa9836e0b6501efec8bc 100644 (file)
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -332,24 +332,6 @@ struct events_stats {
        u32 nr_proc_map_timeout;
 };
 
-enum {
-       PERF_STAT_CONFIG_TERM__AGGR_MODE        = 0,
-       PERF_STAT_CONFIG_TERM__INTERVAL         = 1,
-       PERF_STAT_CONFIG_TERM__SCALE            = 2,
-       PERF_STAT_CONFIG_TERM__MAX              = 3,
-};
-
-struct stat_config_event_entry {
-       u64     tag;
-       u64     val;
-};
-
-struct stat_config_event {
-       struct perf_event_header        header;
-       u64                             nr;
-       struct stat_config_event_entry  data[];
-};
-
 struct stat_event {
        struct perf_event_header        header;