Commit b66ced19 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

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.

Signed-off-by: default avatarJiri 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: https://lkml.kernel.org/n/tip-ufs9ityr5w2xqwtd5w3p6dm4@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 1345e2ee

tools/perf/lib/include/perf/event.h

+15 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE