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

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

libperf: Add PERF_RECORD_STAT_CONFIG 'struct stat_config_event' to perf/event.h 



Move the PERF_RECORD_STAT_CONFIG 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-16-jolsa@kernel.org


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

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

+18 −0
Original line number Diff line number Diff line
@@ -264,4 +264,22 @@ struct thread_map_event { 
	struct thread_map_event_entry	 entries[];

};



enum {

	PERF_STAT_CONFIG_TERM__AGGR_MODE	= 0,

	PERF_STAT_CONFIG_TERM__INTERVAL		= 1,

	PERF_STAT_CONFIG_TERM__SCALE		= 2,

	PERF_STAT_CONFIG_TERM__MAX		= 3,

};



struct stat_config_event_entry {

	__u64			 tag;

	__u64			 val;

};



struct stat_config_event {

	struct perf_event_header	 header;

	__u64				 nr;

	struct stat_config_event_entry	 data[];

};



#endif /* __LIBPERF_EVENT_H */

tools/perf/util/event.c

+1 −1
Original line number Diff line number Diff line
@@ -1235,7 +1235,7 @@ void perf_event__read_stat_config(struct perf_stat_config *config, 
		CASE(INTERVAL,  interval)

#undef CASE

		default:

			pr_warning("unknown stat config term %" PRIu64 "\n",

			pr_warning("unknown stat config term %" PRI_lu64 "\n",

				   event->data[i].tag);

		}

	}

tools/perf/util/event.h

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

};



enum {

	PERF_STAT_CONFIG_TERM__AGGR_MODE	= 0,

	PERF_STAT_CONFIG_TERM__INTERVAL		= 1,

	PERF_STAT_CONFIG_TERM__SCALE		= 2,

	PERF_STAT_CONFIG_TERM__MAX		= 3,

};



struct stat_config_event_entry {

	u64	tag;

	u64	val;

};



struct stat_config_event {

	struct perf_event_header	header;

	u64				nr;

	struct stat_config_event_entry	data[];

};



struct stat_event {

	struct perf_event_header	header;