aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/util
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2014-01-03 15:25:49 -0500
committerArnaldo Carvalho de Melo <acme@redhat.com>2014-01-13 08:06:22 -0500
commit983874d173568f584a5988888645725496c09f24 (patch)
treeb0c08482c765c885bd8c1b019b556377ba107956 /tools/perf/util
parentf26e1c7cb279051d83e0b671f48b30fe88c2c788 (diff)
perf evlist: Auto unmap on destructor
Removing further boilerplate after making sure perf_evlist__munmap can be called multiple times for the same evlist. Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Mike Galbraith <efault@gmx.de> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/n/tip-o0luenuld4abupm4nmrgzm6f@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util')
-rw-r--r--tools/perf/util/evlist.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index a083bdc4680e..0810f5ca77d7 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -107,6 +107,7 @@ void perf_evlist__exit(struct perf_evlist *evlist)
107 107
108void perf_evlist__delete(struct perf_evlist *evlist) 108void perf_evlist__delete(struct perf_evlist *evlist)
109{ 109{
110 perf_evlist__munmap(evlist);
110 perf_evlist__close(evlist); 111 perf_evlist__close(evlist);
111 cpu_map__delete(evlist->cpus); 112 cpu_map__delete(evlist->cpus);
112 thread_map__delete(evlist->threads); 113 thread_map__delete(evlist->threads);
@@ -587,6 +588,9 @@ void perf_evlist__munmap(struct perf_evlist *evlist)
587{ 588{
588 int i; 589 int i;
589 590
591 if (evlist->mmap == NULL)
592 return;
593
590 for (i = 0; i < evlist->nr_mmaps; i++) 594 for (i = 0; i < evlist->nr_mmaps; i++)
591 __perf_evlist__munmap(evlist, i); 595 __perf_evlist__munmap(evlist, i);
592 596