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

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

perf mmap: Simplify perf_mmap__consume() 



It isn't necessary to pass the 'overwrite' argument to
perf_mmap__consume().  Discard it.

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


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

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

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe 
				comm2_time = sample.time;

			}

next_event:

			perf_mmap__consume(md, false);

			perf_mmap__consume(md);

		}

		perf_mmap__read_done(md);

	}

tools/perf/builtin-kvm.c

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

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

		if (err) {

			perf_mmap__consume(md, false);

			perf_mmap__consume(md);

			pr_err("Failed to parse sample\n");

			return -1;

		}
@@ -770,7 +770,7 @@ static s64 perf_kvm__mmap_read_idx(struct perf_kvm_stat *kvm, int idx, 
		 * FIXME: Here we can't consume the event, as perf_session__queue_event will

		 *        point to it, and it'll get possibly overwritten by the kernel.

		 */

		perf_mmap__consume(md, false);

		perf_mmap__consume(md);



		if (err) {

			pr_err("Failed to enqueue sample: %d\n", err);

tools/perf/builtin-top.c

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

			++session->evlist->stats.nr_unknown_events;

next_event:

		perf_mmap__consume(md, opts->overwrite);

		perf_mmap__consume(md);

	}



	perf_mmap__read_done(md);

tools/perf/builtin-trace.c

+1 −1
Original line number Diff line number Diff line
@@ -2522,7 +2522,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv) 


			trace__handle_event(trace, event, &sample);

next_event:

			perf_mmap__consume(md, false);

			perf_mmap__consume(md);



			if (interrupted)

				goto out_disable;

tools/perf/tests/code-reading.c

+1 −1
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ static int process_events(struct machine *machine, struct perf_evlist *evlist, 


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

			ret = process_event(machine, evlist, event, state);

			perf_mmap__consume(md, false);

			perf_mmap__consume(md);

			if (ret < 0)

				return ret;

		}