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

Commit b9bae2c8 authored by Kan Liang's avatar Kan Liang Committed by Arnaldo Carvalho de Melo
Browse files

perf mmap: Simplify perf_mmap__read_init() 



It isn't necessary to pass the 'start', 'end' and 'overwrite' arguments
to perf_mmap__read_init().  The data is stored in the struct perf_mmap.

Discard the parameters.

Signed-off-by: default avatarKan Liang <kan.liang@linux.intel.com>
Suggested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1520350567-80082-8-git-send-email-kan.liang@linux.intel.com


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

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

+1 −2
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe 
	u64 test_tsc, comm1_tsc, comm2_tsc;

	u64 test_time, comm1_time = 0, comm2_time = 0;

	struct perf_mmap *md;

	u64 end, start;



	threads = thread_map__new(-1, getpid(), UINT_MAX);

	CHECK_NOT_NULL__(threads);
@@ -112,7 +111,7 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe 


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

		md = &evlist->mmap[i];

		if (perf_mmap__read_init(md, false, &start, &end) < 0)

		if (perf_mmap__read_init(md) < 0)

			continue;



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

tools/perf/builtin-kvm.c

+1 −2
Original line number Diff line number Diff line
@@ -746,14 +746,13 @@ static s64 perf_kvm__mmap_read_idx(struct perf_kvm_stat *kvm, int idx, 
	struct perf_evlist *evlist = kvm->evlist;

	union perf_event *event;

	struct perf_mmap *md;

	u64 end, start;

	u64 timestamp;

	s64 n = 0;

	int err;



	*mmap_time = ULLONG_MAX;

	md = &evlist->mmap[idx];

	err = perf_mmap__read_init(md, false, &start, &end);

	err = perf_mmap__read_init(md);

	if (err < 0)

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

tools/perf/builtin-top.c

+1 −2
Original line number Diff line number Diff line
@@ -817,11 +817,10 @@ static void perf_top__mmap_read_idx(struct perf_top *top, int idx) 
	struct perf_session *session = top->session;

	union perf_event *event;

	struct machine *machine;

	u64 end, start;

	int ret;



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

	if (perf_mmap__read_init(md, opts->overwrite, &start, &end) < 0)

	if (perf_mmap__read_init(md) < 0)

		return;



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

tools/perf/builtin-trace.c

+1 −2
Original line number Diff line number Diff line
@@ -2503,10 +2503,9 @@ static int trace__run(struct trace *trace, int argc, const char **argv) 
	for (i = 0; i < evlist->nr_mmaps; i++) {

		union perf_event *event;

		struct perf_mmap *md;

		u64 end, start;



		md = &evlist->mmap[i];

		if (perf_mmap__read_init(md, false, &start, &end) < 0)

		if (perf_mmap__read_init(md) < 0)

			continue;



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

tools/perf/tests/backward-ring-buffer.c

+1 −2
Original line number Diff line number Diff line
@@ -33,9 +33,8 @@ static int count_samples(struct perf_evlist *evlist, int *sample_count, 
	for (i = 0; i < evlist->nr_mmaps; i++) {

		struct perf_mmap *map = &evlist->overwrite_mmap[i];

		union perf_event *event;

		u64 start, end;



		perf_mmap__read_init(map, true, &start, &end);

		perf_mmap__read_init(map);

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

			const u32 type = event->header.type;