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

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

libperf: Add PERF_RECORD_STAT 'struct stat_event' to perf/event.h 



Move the PERF_RECORD_STAT 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-17-jolsa@kernel.org


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

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

+17 −0
Original line number Diff line number Diff line
@@ -282,4 +282,21 @@ struct stat_config_event { 
	struct stat_config_event_entry	 data[];

};



struct stat_event {

	struct perf_event_header header;



	__u64			 id;

	__u32			 cpu;

	__u32			 thread;



	union {

		struct {

			__u64	 val;

			__u64	 ena;

			__u64	 run;

		};

		__u64		 values[3];

	};

};



#endif /* __LIBPERF_EVENT_H */

tools/perf/util/event.h

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

};



struct stat_event {

	struct perf_event_header	header;



	u64	id;

	u32	cpu;

	u32	thread;



	union {

		struct {

			u64 val;

			u64 ena;

			u64 run;

		};

		u64 values[3];

	};

};



enum {

	PERF_STAT_ROUND_TYPE__INTERVAL	= 0,

	PERF_STAT_ROUND_TYPE__FINAL	= 1,

tools/perf/util/stat.c

+2 −2
Original line number Diff line number Diff line
@@ -405,9 +405,9 @@ size_t perf_event__fprintf_stat(union perf_event *event, FILE *fp) 
	struct stat_event *st = (struct stat_event *) event;

	size_t ret;



	ret  = fprintf(fp, "\n... id %" PRIu64 ", cpu %d, thread %d\n",

	ret  = fprintf(fp, "\n... id %" PRI_lu64 ", cpu %d, thread %d\n",

		       st->id, st->cpu, st->thread);

	ret += fprintf(fp, "... value %" PRIu64 ", enabled %" PRIu64 ", running %" PRIu64 "\n",

	ret += fprintf(fp, "... value %" PRI_lu64 ", enabled %" PRI_lu64 ", running %" PRI_lu64 "\n",

		       st->val, st->ena, st->run);



	return ret;