perf evlist: Tidy duplicated munmap code
The same lines of code are used in three places. Make it a new function '__perf_evlist__munmap()'. Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Acked-by: Jiri Olsa <jolsa@redhat.com> Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Mike Galbraith <efault@gmx.de> Cc: Namhyung Kim <namhyung@gmail.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/r/1372944040-32690-8-git-send-email-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
b6b96fb48f
commit
93edcbd91d
|
@ -403,16 +403,20 @@ union perf_event *perf_evlist__mmap_read(struct perf_evlist *evlist, int idx)
|
||||||
return event;
|
return event;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void __perf_evlist__munmap(struct perf_evlist *evlist, int idx)
|
||||||
|
{
|
||||||
|
if (evlist->mmap[idx].base != NULL) {
|
||||||
|
munmap(evlist->mmap[idx].base, evlist->mmap_len);
|
||||||
|
evlist->mmap[idx].base = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void perf_evlist__munmap(struct perf_evlist *evlist)
|
void perf_evlist__munmap(struct perf_evlist *evlist)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i = 0; i < evlist->nr_mmaps; i++) {
|
for (i = 0; i < evlist->nr_mmaps; i++)
|
||||||
if (evlist->mmap[i].base != NULL) {
|
__perf_evlist__munmap(evlist, i);
|
||||||
munmap(evlist->mmap[i].base, evlist->mmap_len);
|
|
||||||
evlist->mmap[i].base = NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
free(evlist->mmap);
|
free(evlist->mmap);
|
||||||
evlist->mmap = NULL;
|
evlist->mmap = NULL;
|
||||||
|
@ -477,12 +481,8 @@ static int perf_evlist__mmap_per_cpu(struct perf_evlist *evlist, int prot, int m
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
out_unmap:
|
out_unmap:
|
||||||
for (cpu = 0; cpu < nr_cpus; cpu++) {
|
for (cpu = 0; cpu < nr_cpus; cpu++)
|
||||||
if (evlist->mmap[cpu].base != NULL) {
|
__perf_evlist__munmap(evlist, cpu);
|
||||||
munmap(evlist->mmap[cpu].base, evlist->mmap_len);
|
|
||||||
evlist->mmap[cpu].base = NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -517,12 +517,8 @@ static int perf_evlist__mmap_per_thread(struct perf_evlist *evlist, int prot, in
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
out_unmap:
|
out_unmap:
|
||||||
for (thread = 0; thread < nr_threads; thread++) {
|
for (thread = 0; thread < nr_threads; thread++)
|
||||||
if (evlist->mmap[thread].base != NULL) {
|
__perf_evlist__munmap(evlist, thread);
|
||||||
munmap(evlist->mmap[thread].base, evlist->mmap_len);
|
|
||||||
evlist->mmap[thread].base = NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue