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

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

perf tools: Rename perf_evlist__munmap() to evlist__munmap() 



Rename perf_evlist__munmap() to evlist__munmap(), so we don't have a
name clash when we add perf_evlist__munmap() 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-6-jolsa@kernel.org


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

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

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static int do_test(struct evlist *evlist, int mmap_pages, 
	evlist__disable(evlist);



	err = count_samples(evlist, sample_count, comm_count);

	perf_evlist__munmap(evlist);

	evlist__munmap(evlist);

	return err;

}

tools/perf/util/evlist.c

+6 −6
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ void evlist__delete(struct evlist *evlist) 
	if (evlist == NULL)

		return;



	perf_evlist__munmap(evlist);

	evlist__munmap(evlist);

	evlist__close(evlist);

	perf_cpu_map__put(evlist->core.cpus);

	perf_thread_map__put(evlist->core.threads);
@@ -673,7 +673,7 @@ static int perf_evlist__resume(struct evlist *evlist) 
	return perf_evlist__set_paused(evlist, false);

}



static void perf_evlist__munmap_nofree(struct evlist *evlist)

static void evlist__munmap_nofree(struct evlist *evlist)

{

	int i;
@@ -686,9 +686,9 @@ static void perf_evlist__munmap_nofree(struct evlist *evlist) 
			perf_mmap__munmap(&evlist->overwrite_mmap[i]);

}



void perf_evlist__munmap(struct evlist *evlist)

void evlist__munmap(struct evlist *evlist)

{

	perf_evlist__munmap_nofree(evlist);

	evlist__munmap_nofree(evlist);

	zfree(&evlist->mmap);

	zfree(&evlist->overwrite_mmap);

}
@@ -835,7 +835,7 @@ static int evlist__mmap_per_cpu(struct evlist *evlist, 
	return 0;



out_unmap:

	perf_evlist__munmap_nofree(evlist);

	evlist__munmap_nofree(evlist);

	return -1;

}
@@ -861,7 +861,7 @@ static int evlist__mmap_per_thread(struct evlist *evlist, 
	return 0;



out_unmap:

	perf_evlist__munmap_nofree(evlist);

	evlist__munmap_nofree(evlist);

	return -1;

}

tools/perf/util/evlist.h

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ int evlist__mmap_ex(struct evlist *evlist, unsigned int pages, 
			 bool auxtrace_overwrite, int nr_cblocks,

			 int affinity, int flush, int comp_level);

int evlist__mmap(struct evlist *evlist, unsigned int pages);

void perf_evlist__munmap(struct evlist *evlist);

void evlist__munmap(struct evlist *evlist);



size_t evlist__mmap_size(unsigned long pages);