GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-25 16:11:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

perf tools: Rename perf_evlist__munmap() to evlist__munmap()

Browse source 
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: Jiri 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: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa 2019-08-16 16:19:55 +02:00 • committed by Arnaldo Carvalho de Melo
parent 9521b5f2d9
commit db6b7b1385
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tools/perf/tests/backward-ring-buffer.c
View file

@ -75,7 +75,7 @@ static int do_test(struct evlist *evlist, int mmap_pages,
evlist__disable(evlist); evlist__disable(evlist);
err = count_samples(evlist, sample_count, comm_count); err = count_samples(evlist, sample_count, comm_count);
perf_evlist__munmap(evlist); evlist__munmap(evlist);
return err; return err;
} }

12
tools/perf/util/evlist.c
View file

@ -149,7 +149,7 @@ void evlist__delete(struct evlist *evlist)
if (evlist == NULL) if (evlist == NULL)
return; return;
perf_evlist__munmap(evlist); evlist__munmap(evlist);
evlist__close(evlist); evlist__close(evlist);
perf_cpu_map__put(evlist->core.cpus); perf_cpu_map__put(evlist->core.cpus);
perf_thread_map__put(evlist->core.threads); 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); 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; int i;
@ -686,9 +686,9 @@ static void perf_evlist__munmap_nofree(struct evlist *evlist)
perf_mmap__munmap(&evlist->overwrite_mmap[i]); 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->mmap);
zfree(&evlist->overwrite_mmap); zfree(&evlist->overwrite_mmap);
} }
@ -835,7 +835,7 @@ static int evlist__mmap_per_cpu(struct evlist *evlist,
return 0; return 0;
out_unmap: out_unmap:
perf_evlist__munmap_nofree(evlist); evlist__munmap_nofree(evlist);
return -1; return -1;
} }
@ -861,7 +861,7 @@ static int evlist__mmap_per_thread(struct evlist *evlist,
return 0; return 0;
out_unmap: out_unmap:
perf_evlist__munmap_nofree(evlist); evlist__munmap_nofree(evlist);
return -1; return -1;
} }

2
tools/perf/util/evlist.h
View file

@ -175,7 +175,7 @@ int evlist__mmap_ex(struct evlist *evlist, unsigned int pages,
bool auxtrace_overwrite, int nr_cblocks, bool auxtrace_overwrite, int nr_cblocks,
int affinity, int flush, int comp_level); int affinity, int flush, int comp_level);
int evlist__mmap(struct evlist *evlist, unsigned int pages); 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); size_t evlist__mmap_size(unsigned long pages);