libperf: Add PERF_RECORD_MMAP2 'struct mmap2_event' to perf/event.h
A message that is not in the archive (sent off-list or not yet received): [email protected]
The following commit has been merged into the perf/core branch of tip:
Commit-ID: b66ced19c9f64dbe707cf318fae9fca82b999564 Gitweb: https://git.kernel.org/tip/b66ced19c9f64dbe707cf318fae9fca82b999564 Author: Jiri Olsa <[email protected]> AuthorDate: Sun, 25 Aug 2019 20:17:42 +02:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Mon, 26 Aug 2019 19:39:09 -03:00
libperf: Add PERF_RECORD_MMAP2 'struct mmap2_event' to perf/event.h
Moving mmap2_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.
--- tools/perf/lib/include/perf/event.h | 15 +++++++++++++++ tools/perf/util/event.c | 6 +++--- tools/perf/util/event.h | 15 --------------- 3 files changed, 18 insertions(+), 18 deletions(-)
tools/perf/lib/include/perf/event.h +15 -0
@@ -15,4 +15,19 @@ struct mmap_event { char filename[PATH_MAX]; }; +struct mmap2_event { +struct perf_event_header header; +__u32 pid, tid; +__u64 start; +__u64 len; +__u64 pgoff; +__u32 maj; +__u32 min; +__u64 ino; +__u64 ino_generation; +__u32 prot; +__u32 flags; +char filename[PATH_MAX ]; +}; +#endif /* __LIBPERF_EVENT_H */
tools/perf/util/event.c +3 -3
@@ -387,7 +387,7 @@ int perf_event__synthesize_mmap_events(struct perf_tool *tool,strcpy (execname,"" );/* 00400000-0040c000 r-xp 00000000 fd:01 41038 /bin/cat */ - n = sscanf(bf, "%"PRIx64"-%"PRIx64" %s %"PRIx64" %x:%x %u %[^\n]\n", + n = sscanf(bf, "%"PRI_lx64"-%"PRI_lx64" %s %"PRI_lx64" %x:%x %u %[^\n]\n", &event->mmap2.start, &event->mmap2.len, prot, &event->mmap2.pgoff, &event->mmap2.maj, &event->mmap2.min,
@@ -1362,8 +1362,8 @@ size_t perf_event__fprintf_mmap(union perf_event *event, FILE *fp)size_t perf_event__fprintf_mmap2 (union perf_event *event,FILE *fp) { - return fprintf(fp, " %d/%d: [%#" PRIx64 "(%#" PRIx64 ") @ %#" PRIx64 - " %02x:%02x %"PRIu64" %"PRIu64"]: %c%c%c%c %s\n", + return fprintf(fp, " %d/%d: [%#" PRI_lx64 "(%#" PRI_lx64 ") @ %#" PRI_lx64 + " %02x:%02x %"PRI_lu64" %"PRI_lu64"]: %c%c%c%c %s\n", event->mmap2.pid, event->mmap2.tid, event->mmap2.start, event->mmap2.len, event->mmap2.pgoff, event->mmap2.maj, event->mmap2.min, event->mmap2.ino,
tools/perf/util/event.h +0 -15
@@ -27,21 +27,6 @@#define PRI_lx64 PRIx64#endif -struct mmap2_event { -struct perf_event_header header; -u32 pid, tid; -u64 start; -u64 len; -u64 pgoff; -u32 maj; -u32 min; -u64 ino; -u64 ino_generation; -u32 prot; -u32 flags; -char filename[PATH_MAX ]; -}; -struct comm_event {struct perf_event_header header;u32 pid, tid;