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

libperf: Adopt perf_mmap__read_done() from tools/perf 



Move perf_mmap__read_init() 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-12-jolsa@kernel.org


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

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

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

			perf_mmap__consume(&md->core);

		}

		perf_mmap__read_done(md);

		perf_mmap__read_done(&md->core);

	}



	if (!comm1_time || !comm2_time)

tools/perf/builtin-kvm.c

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

	}



	perf_mmap__read_done(md);

	perf_mmap__read_done(&md->core);

	return n;

}

tools/perf/builtin-top.c

+1 −1
Original line number Diff line number Diff line
@@ -894,7 +894,7 @@ static void perf_top__mmap_read_idx(struct perf_top *top, int idx) 
		}

	}



	perf_mmap__read_done(md);

	perf_mmap__read_done(&md->core);

}



static void perf_top__mmap_read(struct perf_top *top)

tools/perf/builtin-trace.c

+1 −1
Original line number Diff line number Diff line
@@ -3821,7 +3821,7 @@ again: 
				draining = true;

			}

		}

		perf_mmap__read_done(md);

		perf_mmap__read_done(&md->core);

	}



	if (trace->nr_events == before) {

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

+1 −0
Original line number Diff line number Diff line
@@ -8,5 +8,6 @@ struct perf_mmap; 


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);



#endif /* __LIBPERF_MMAP_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE