Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

libperf: Add PERF_RECORD_AUX 'struct aux_event' to perf/event.h 



Move the PERF_RECORD_AUX 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: 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: http://lkml.kernel.org/r/20190828135717.7245-12-jolsa@kernel.org


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

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

+7 −0
Original line number Diff line number Diff line
@@ -234,4 +234,11 @@ struct auxtrace_error_event { 
	char			 msg[MAX_AUXTRACE_ERROR_MSG];

};



struct aux_event {

	struct perf_event_header header;

	__u64			 aux_offset;

	__u64			 aux_size;

	__u64			 flags;

};



#endif /* __LIBPERF_EVENT_H */

tools/perf/util/event.c

+1 −1
Original line number Diff line number Diff line
@@ -1449,7 +1449,7 @@ int perf_event__process_exit(struct perf_tool *tool __maybe_unused, 


size_t perf_event__fprintf_aux(union perf_event *event, FILE *fp)

{

	return fprintf(fp, " offset: %#"PRIx64" size: %#"PRIx64" flags: %#"PRIx64" [%s%s%s]\n",

	return fprintf(fp, " offset: %#"PRI_lx64" size: %#"PRI_lx64" flags: %#"PRI_lx64" [%s%s%s]\n",

		       event->aux.aux_offset, event->aux.aux_size,

		       event->aux.flags,

		       event->aux.flags & PERF_AUX_FLAG_TRUNCATED ? "T" : "",

tools/perf/util/event.h

+0 −7
Original line number Diff line number Diff line
@@ -332,13 +332,6 @@ struct events_stats { 
	u32 nr_proc_map_timeout;

};



struct aux_event {

	struct perf_event_header header;

	u64	aux_offset;

	u64	aux_size;

	u64	flags;

};



struct itrace_start_event {

	struct perf_event_header header;

	u32 pid, tid;