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

Commit 9521b5f2 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Rename perf_evlist__mmap() to evlist__mmap() 



Rename perf_evlist__mmap() to evlist__mmap(), so we don't have a name
clash when we add perf_evlist__mmap() in libperf.

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 <a.p.zijlstra@chello.nl>
Link: http://lore.kernel.org/lkml/20190913132355.21634-5-jolsa@kernel.org


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

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

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


	CHECK__(evlist__open(evlist));



	CHECK__(perf_evlist__mmap(evlist, UINT_MAX));

	CHECK__(evlist__mmap(evlist, UINT_MAX));



	pc = evlist->mmap[0].base;

	ret = perf_read_tsc_conversion(pc, &tc);

tools/perf/builtin-kvm.c

+1 −1
Original line number Diff line number Diff line
@@ -1060,7 +1060,7 @@ static int kvm_live_open_events(struct perf_kvm_stat *kvm) 
		goto out;

	}



	if (perf_evlist__mmap(evlist, kvm->opts.mmap_pages) < 0) {

	if (evlist__mmap(evlist, kvm->opts.mmap_pages) < 0) {

		ui__error("Failed to mmap the events: %s\n",

			  str_error_r(errno, sbuf, sizeof(sbuf)));

		evlist__close(evlist);

tools/perf/builtin-record.c

+3 −3
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ static int record__mmap_flush_parse(const struct option *opt, 
	if (!opts->mmap_flush)

		opts->mmap_flush = MMAP_FLUSH_DEFAULT;



	flush_max = perf_evlist__mmap_size(opts->mmap_pages);

	flush_max = evlist__mmap_size(opts->mmap_pages);

	flush_max /= 4;

	if (opts->mmap_flush > flush_max)

		opts->mmap_flush = flush_max;
@@ -707,7 +707,7 @@ static int record__mmap_evlist(struct record *rec, 
	if (opts->affinity != PERF_AFFINITY_SYS)

		cpu__setup_cpunode_map();



	if (perf_evlist__mmap_ex(evlist, opts->mmap_pages,

	if (evlist__mmap_ex(evlist, opts->mmap_pages,

				 opts->auxtrace_mmap_pages,

				 opts->auxtrace_snapshot_mode,

				 opts->nr_cblocks, opts->affinity,
@@ -1980,7 +1980,7 @@ static int record__parse_mmap_pages(const struct option *opt, 


static void switch_output_size_warn(struct record *rec)

{

	u64 wakeup_size = perf_evlist__mmap_size(rec->opts.mmap_pages);

	u64 wakeup_size = evlist__mmap_size(rec->opts.mmap_pages);

	struct switch_output *s = &rec->switch_output;



	wakeup_size /= 2;

tools/perf/builtin-top.c

+1 −1
Original line number Diff line number Diff line
@@ -1042,7 +1042,7 @@ static int perf_top__start_counters(struct perf_top *top) 
		}

	}



	if (perf_evlist__mmap(evlist, opts->mmap_pages) < 0) {

	if (evlist__mmap(evlist, opts->mmap_pages) < 0) {

		ui__error("Failed to mmap with %d (%s)\n",

			    errno, str_error_r(errno, msg, sizeof(msg)));

		goto out_err;

tools/perf/builtin-trace.c

+1 −1
Original line number Diff line number Diff line
@@ -3409,7 +3409,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv) 
	if (trace->dump.map)

		bpf_map__fprintf(trace->dump.map, trace->output);



	err = perf_evlist__mmap(evlist, trace->opts.mmap_pages);

	err = evlist__mmap(evlist, trace->opts.mmap_pages);

	if (err < 0)

		goto out_error_mmap;