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

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

perf mmap: Simplify perf_mmap__read_event() 



It isn't necessary to pass the 'overwrite', 'start' and 'end' argument
to perf_mmap__read_event().  Discard them.

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-7-git-send-email-kan.liang@linux.intel.com


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

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

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe 
		if (perf_mmap__read_init(md, false, &start, &end) < 0)

			continue;



		while ((event = perf_mmap__read_event(md, false, &start, end)) != NULL) {

		while ((event = perf_mmap__read_event(md)) != 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
@@ -757,7 +757,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, false, &start, end)) != NULL) {

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

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

		if (err) {

			perf_mmap__consume(md);

tools/perf/builtin-top.c

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

		return;



	while ((event = perf_mmap__read_event(md, opts->overwrite, &start, end)) != NULL) {

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

		ret = perf_evlist__parse_sample(evlist, event, &sample);

		if (ret) {

			pr_err("Can't parse sample, err = %d\n", ret);

tools/perf/builtin-trace.c

+1 −1
Original line number Diff line number Diff line
@@ -2509,7 +2509,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv) 
		if (perf_mmap__read_init(md, false, &start, &end) < 0)

			continue;



		while ((event = perf_mmap__read_event(md, false, &start, end)) != NULL) {

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

			struct perf_sample sample;



			++trace->nr_events;

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

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static int count_samples(struct perf_evlist *evlist, int *sample_count, 
		u64 start, end;



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

		while ((event = perf_mmap__read_event(map, true, &start, end)) != NULL) {

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

			const u32 type = event->header.type;



			switch (type) {