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

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

libperf: Add PERF_RECORD_AUXTRACE 'struct auxtrace_event' to perf/event.h 



Move the PERF_RECORD_AUXTRACE event definition to libperf's event.h.

Ipn 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-10-jolsa@kernel.org


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

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

+11 −0
Original line number Diff line number Diff line
@@ -208,4 +208,15 @@ struct auxtrace_info_event { 
	__u64			 priv[];

};



struct auxtrace_event {

	struct perf_event_header header;

	__u64			 size;

	__u64			 offset;

	__u64			 reference;

	__u32			 idx;

	__u32			 tid;

	__u32			 cpu;

	__u32			 reserved__; /* For alignment */

};



#endif /* __LIBPERF_EVENT_H */

tools/perf/util/auxtrace.c

+1 −1
Original line number Diff line number Diff line
@@ -943,7 +943,7 @@ s64 perf_event__process_auxtrace(struct perf_session *session, 
	s64 err;



	if (dump_trace)

		fprintf(stdout, " size: %#"PRIx64"  offset: %#"PRIx64"  ref: %#"PRIx64"  idx: %u  tid: %d  cpu: %d\n",

		fprintf(stdout, " size: %#"PRI_lx64"  offset: %#"PRI_lx64"  ref: %#"PRI_lx64"  idx: %u  tid: %d  cpu: %d\n",

			event->auxtrace.size, event->auxtrace.offset,

			event->auxtrace.reference, event->auxtrace.idx,

			event->auxtrace.tid, event->auxtrace.cpu);

tools/perf/util/event.h

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

};



struct auxtrace_event {

	struct perf_event_header header;

	u64 size;

	u64 offset;

	u64 reference;

	u32 idx;

	u32 tid;

	u32 cpu;

	u32 reserved__; /* For alignment */

};



#define MAX_AUXTRACE_ERROR_MSG 64



struct auxtrace_error_event {