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

libperf: Adopt perf_mmap__read_init() from tools/perf 



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

And add pr_debug2()/pr_debug3() macros support, because the code is
using them.

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


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

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

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe 


	for (i = 0; i < evlist->core.nr_mmaps; i++) {

		md = &evlist->mmap[i];

		if (perf_mmap__read_init(md) < 0)

		if (perf_mmap__read_init(&md->core) < 0)

			continue;



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

tools/perf/builtin-kvm.c

+1 −1
Original line number Diff line number Diff line
@@ -760,7 +760,7 @@ static s64 perf_kvm__mmap_read_idx(struct perf_kvm_stat *kvm, int idx, 


	*mmap_time = ULLONG_MAX;

	md = &evlist->mmap[idx];

	err = perf_mmap__read_init(md);

	err = perf_mmap__read_init(&md->core);

	if (err < 0)

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

tools/perf/builtin-top.c

+1 −1
Original line number Diff line number Diff line
@@ -870,7 +870,7 @@ static void perf_top__mmap_read_idx(struct perf_top *top, int idx) 
	union perf_event *event;



	md = opts->overwrite ? &evlist->overwrite_mmap[idx] : &evlist->mmap[idx];

	if (perf_mmap__read_init(md) < 0)

	if (perf_mmap__read_init(&md->core) < 0)

		return;



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

tools/perf/builtin-trace.c

+1 −1
Original line number Diff line number Diff line
@@ -3801,7 +3801,7 @@ again: 
		struct mmap *md;



		md = &evlist->mmap[i];

		if (perf_mmap__read_init(md) < 0)

		if (perf_mmap__read_init(&md->core) < 0)

			continue;



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

tools/perf/lib/include/perf/core.h

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ enum libperf_print_level { 
	LIBPERF_WARN,

	LIBPERF_INFO,

	LIBPERF_DEBUG,

	LIBPERF_DEBUG2,

	LIBPERF_DEBUG3,

};



typedef int (*libperf_print_fn_t)(enum libperf_print_level level,

CRA Git | Maintained and supported by SUSTech CRA and CCSE