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

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

libperf: Add PERF_RECORD_AUXTRACE_ERROR 'struct auxtrace_error_event' to perf/event.h 



Move the PERF_RECORD_AUXTRACE_ERROR 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-11-jolsa@kernel.org


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

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

+15 −0
Original line number Diff line number Diff line
@@ -219,4 +219,19 @@ struct auxtrace_event { 
	__u32			 reserved__; /* For alignment */

};



#define MAX_AUXTRACE_ERROR_MSG 64



struct auxtrace_error_event {

	struct perf_event_header header;

	__u32			 type;

	__u32			 code;

	__u32			 cpu;

	__u32			 pid;

	__u32			 tid;

	__u32			 fmt;

	__u64			 ip;

	__u64			 time;

	char			 msg[MAX_AUXTRACE_ERROR_MSG];

};



#endif /* __LIBPERF_EVENT_H */

tools/perf/util/auxtrace.c

+1 −1
Original line number Diff line number Diff line
@@ -1189,7 +1189,7 @@ size_t perf_event__fprintf_auxtrace_error(union perf_event *event, FILE *fp) 
	if (!e->fmt)

		msg = (const char *)&e->time;



	ret += fprintf(fp, " cpu %d pid %d tid %d ip %#"PRIx64" code %u: %s\n",

	ret += fprintf(fp, " cpu %d pid %d tid %d ip %#"PRI_lx64" code %u: %s\n",

		       e->cpu, e->pid, e->tid, e->ip, e->code, msg);

	return ret;

}

tools/perf/util/event.h

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

};



#define MAX_AUXTRACE_ERROR_MSG 64



struct auxtrace_error_event {

	struct perf_event_header header;

	u32 type;

	u32 code;

	u32 cpu;

	u32 pid;

	u32 tid;

	u32 fmt;

	u64 ip;

	u64 time;

	char msg[MAX_AUXTRACE_ERROR_MSG];

};



struct aux_event {

	struct perf_event_header header;

	u64	aux_offset;