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

Commit 7a276ff6 authored by Wang Nan's avatar Wang Nan Committed by Arnaldo Carvalho de Melo
Browse files

perf evlist: Remove 'overwrite' parameter from perf_evlist__mmap_ex 



All users of perf_evlist__mmap_ex set !overwrite. Remove it from its
arguments list.

Signed-off-by: default avatarWang Nan <wangnan0@huawei.com>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Kan Liang <kan.liang@intel.com>
Link: http://lkml.kernel.org/r/20171203020044.81680-3-wangnan0@huawei.com


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

tools/perf/builtin-record.c

+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ static int record__mmap_evlist(struct record *rec, 
	struct record_opts *opts = &rec->opts;

	char msg[512];



	if (perf_evlist__mmap_ex(evlist, opts->mmap_pages, false,

	if (perf_evlist__mmap_ex(evlist, opts->mmap_pages,

				 opts->auxtrace_mmap_pages,

				 opts->auxtrace_snapshot_mode) < 0) {

		if (errno == EPERM) {

tools/perf/util/evlist.c

+4 −4
Original line number Diff line number Diff line
@@ -1052,14 +1052,14 @@ int perf_evlist__parse_mmap_pages(const struct option *opt, const char *str, 
 * Return: %0 on success, negative error code otherwise.

 */

int perf_evlist__mmap_ex(struct perf_evlist *evlist, unsigned int pages,

			 bool overwrite, unsigned int auxtrace_pages,

			 unsigned int auxtrace_pages,

			 bool auxtrace_overwrite)

{

	struct perf_evsel *evsel;

	const struct cpu_map *cpus = evlist->cpus;

	const struct thread_map *threads = evlist->threads;

	struct mmap_params mp = {

		.prot = PROT_READ | (overwrite ? 0 : PROT_WRITE),

		.prot = PROT_READ | PROT_WRITE,

	};



	if (!evlist->mmap)
@@ -1070,7 +1070,7 @@ int perf_evlist__mmap_ex(struct perf_evlist *evlist, unsigned int pages, 
	if (evlist->pollfd.entries == NULL && perf_evlist__alloc_pollfd(evlist) < 0)

		return -ENOMEM;



	evlist->overwrite = overwrite;

	evlist->overwrite = false;

	evlist->mmap_len = perf_evlist__mmap_size(pages);

	pr_debug("mmap size %zuB\n", evlist->mmap_len);

	mp.mask = evlist->mmap_len - page_size - 1;
@@ -1093,7 +1093,7 @@ int perf_evlist__mmap_ex(struct perf_evlist *evlist, unsigned int pages, 


int perf_evlist__mmap(struct perf_evlist *evlist, unsigned int pages)

{

	return perf_evlist__mmap_ex(evlist, pages, false, 0, false);

	return perf_evlist__mmap_ex(evlist, pages, 0, false);

}



int perf_evlist__create_maps(struct perf_evlist *evlist, struct target *target)

tools/perf/util/evlist.h

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ int perf_evlist__parse_mmap_pages(const struct option *opt, 
unsigned long perf_event_mlock_kb_in_pages(void);



int perf_evlist__mmap_ex(struct perf_evlist *evlist, unsigned int pages,

			 bool overwrite, unsigned int auxtrace_pages,

			 unsigned int auxtrace_pages,

			 bool auxtrace_overwrite);

int perf_evlist__mmap(struct perf_evlist *evlist, unsigned int pages);

void perf_evlist__munmap(struct perf_evlist *evlist);