The following commit has been merged into the perf/core branch of tip:

Commit-ID:     3e4c453f5cbac75afec37eedd0ffcd8dac82e23e
Gitweb:        
https://git.kernel.org/tip/3e4c453f5cbac75afec37eedd0ffcd8dac82e23e
Author:        Jiri Olsa <jo...@kernel.org>
AuthorDate:    Wed, 28 Aug 2019 15:57:08 +02:00
Committer:     Arnaldo Carvalho de Melo <a...@redhat.com>
CommitterDate: Thu, 29 Aug 2019 08:36:11 -03:00

libperf: Add PERF_RECORD_THREAD_MAP 'struct thread_map_event' to perf/event.h

Move the PERF_RECORD_THREAD_MAP 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 <jo...@kernel.org>
Cc: Alexander Shishkin <alexander.shish...@linux.intel.com>
Cc: Michael Petlan <mpet...@redhat.com>
Cc: Namhyung Kim <namhy...@kernel.org>
Cc: Peter Zijlstra <pet...@infradead.org>
Link: http://lkml.kernel.org/r/20190828135717.7245-15-jo...@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com>
---
 tools/perf/lib/include/perf/event.h | 11 +++++++++++
 tools/perf/util/event.h             | 11 -----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tools/perf/lib/include/perf/event.h 
b/tools/perf/lib/include/perf/event.h
index a7b0344..fe0ce65 100644
--- a/tools/perf/lib/include/perf/event.h
+++ b/tools/perf/lib/include/perf/event.h
@@ -253,4 +253,15 @@ struct itrace_start_event {
        __u32                    tid;
 };
 
+struct thread_map_event_entry {
+       __u64                    pid;
+       char                     comm[16];
+};
+
+struct thread_map_event {
+       struct perf_event_header         header;
+       __u64                            nr;
+       struct thread_map_event_entry    entries[];
+};
+
 #endif /* __LIBPERF_EVENT_H */
diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index 012b2ba..3a85669 100644
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -332,17 +332,6 @@ struct events_stats {
        u32 nr_proc_map_timeout;
 };
 
-struct thread_map_event_entry {
-       u64     pid;
-       char    comm[16];
-};
-
-struct thread_map_event {
-       struct perf_event_header        header;
-       u64                             nr;
-       struct thread_map_event_entry   entries[];
-};
-
 enum {
        PERF_STAT_CONFIG_TERM__AGGR_MODE        = 0,
        PERF_STAT_CONFIG_TERM__INTERVAL         = 1,

Reply via email to