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

libperf: Adopt perf_mmap__read_event() from tools/perf 



Move perf_mmap__read_event() from tools/perf to libperf and export it in
the perf/mmap.h header.

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://lore.kernel.org/lkml/20191007125344.14268-13-jolsa@kernel.org


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

tools/perf/arch/x86/tests/perf-time-to-tsc.c

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe 
		if (perf_mmap__read_init(&md->core) < 0)

			continue;



		while ((event = perf_mmap__read_event(md)) != NULL) {

		while ((event = perf_mmap__read_event(&md->core)) != NULL) {

			struct perf_sample sample;



			if (event->header.type != PERF_RECORD_COMM ||

tools/perf/builtin-kvm.c

+1 −1
Original line number Diff line number Diff line
@@ -764,7 +764,7 @@ static s64 perf_kvm__mmap_read_idx(struct perf_kvm_stat *kvm, int idx, 
	if (err < 0)

		return (err == -EAGAIN) ? 0 : -1;



	while ((event = perf_mmap__read_event(md)) != NULL) {

	while ((event = perf_mmap__read_event(&md->core)) != NULL) {

		err = perf_evlist__parse_sample_timestamp(evlist, event, &timestamp);

		if (err) {

			perf_mmap__consume(&md->core);

tools/perf/builtin-top.c

+1 −1
Original line number Diff line number Diff line
@@ -873,7 +873,7 @@ static void perf_top__mmap_read_idx(struct perf_top *top, int idx) 
	if (perf_mmap__read_init(&md->core) < 0)

		return;



	while ((event = perf_mmap__read_event(md)) != NULL) {

	while ((event = perf_mmap__read_event(&md->core)) != NULL) {

		int ret;



		ret = perf_evlist__parse_sample_timestamp(evlist, event, &last_timestamp);

tools/perf/builtin-trace.c

+1 −1
Original line number Diff line number Diff line
@@ -3804,7 +3804,7 @@ again: 
		if (perf_mmap__read_init(&md->core) < 0)

			continue;



		while ((event = perf_mmap__read_event(md)) != NULL) {

		while ((event = perf_mmap__read_event(&md->core)) != NULL) {

			++trace->nr_events;



			err = trace__deliver_event(trace, event);

tools/perf/lib/include/perf/mmap.h

+2 −0
Original line number Diff line number Diff line
@@ -5,9 +5,11 @@ 
#include <perf/core.h>



struct perf_mmap;

union perf_event;



LIBPERF_API void perf_mmap__consume(struct perf_mmap *map);

LIBPERF_API int perf_mmap__read_init(struct perf_mmap *map);

LIBPERF_API void perf_mmap__read_done(struct perf_mmap *map);

LIBPERF_API union perf_event *perf_mmap__read_event(struct perf_mmap *map);



#endif /* __LIBPERF_MMAP_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE