Commit 003c66fe authored Aug 25, 2019 by Jiri Olsa Committed by Arnaldo Carvalho de Melo Aug 26, 2019

libperf: Add PERF_RECORD_THROTTLE 'struct throttle_event' to perf/event.h



Move the PERF_RECORD_THROTTLE event definition into libperf's event.h
header include.

In order to keep libperf simple, we switch 'u64/u32/u16/u8' types used
events to their generic '__u*' versions.

Perf added 'u*' types mainly to ease up printing __u64 values as stated
in the linux/types.h comment:

  /*
   * We define u64 as uint64_t for every architecture
   * so that we can print it with "%"PRIx64 without getting warnings.
   *
   * typedef __u64 u64;
   * typedef __s64 s64;
   */

Add and use new PRI_lu64 and PRI_lx64 macros for that.  Use extra '_' to
ease up the reading and differentiate them from standard PRI*64 macros.

Signed-off-by: Jiri 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/20190825181752.722-10-jolsa@kernel.org


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 213a6c1d

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -73,4 +73,11 @@ struct read_event {
		__u64 id;
		};

		struct throttle_event {
		struct perf_event_header header;
		__u64 time;
		__u64 id;
		__u64 stream_id;
		};

		#endif /* __LIBPERF_EVENT_H */

tools/perf/util/event.h

+0 −7

Original line number	Diff line number	Diff line
		@@ -27,13 +27,6 @@
		#define PRI_lx64 PRIx64
		#endif

		struct throttle_event {
		struct perf_event_header header;
		u64 time;
		u64 id;
		u64 stream_id;
		};

		#ifndef KSYM_NAME_LEN
		#define KSYM_NAME_LEN 256
		#endif

tools/perf/util/python.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -233,8 +233,8 @@ static PyObject pyrf_throttle_event__repr(struct pyrf_event pevent)
		{
		struct throttle_event te = (struct throttle_event )(&pevent->event.header + 1);

		return _PyUnicode_FromFormat("{ type: %sthrottle, time: %" PRIu64 ", id: %" PRIu64
		", stream_id: %" PRIu64 " }",
		return _PyUnicode_FromFormat("{ type: %sthrottle, time: %" PRI_lu64 ", id: %" PRI_lu64
		", stream_id: %" PRI_lu64 " }",
		pevent->event.header.type == PERF_RECORD_THROTTLE ? "" : "un",
		te->time, te->id, te->stream_id);
		}

Admin message