diff options
author | Jiri Olsa <jolsa@kernel.org> | 2019-08-16 10:19:55 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2019-09-25 08:51:44 -0400 |
commit | db6b7b138506ad537edd12d98f674722a643c150 (patch) | |
tree | f22a0b1b694e01aa0aa74be886f7951d4257cb35 /tools | |
parent | 9521b5f2d9d3e3fd6092fb9d7b00c914e7fa7d33 (diff) |
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: 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>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/tests/backward-ring-buffer.c | 2 | ||||
-rw-r--r-- | tools/perf/util/evlist.c | 12 | ||||
-rw-r--r-- | tools/perf/util/evlist.h | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/tools/perf/tests/backward-ring-buffer.c b/tools/perf/tests/backward-ring-buffer.c index f1eb7e9c1d7d..3073a68d17b9 100644 --- a/tools/perf/tests/backward-ring-buffer.c +++ b/tools/perf/tests/backward-ring-buffer.c | |||
@@ -75,7 +75,7 @@ static int do_test(struct evlist *evlist, int mmap_pages, | |||
75 | evlist__disable(evlist); | 75 | evlist__disable(evlist); |
76 | 76 | ||
77 | err = count_samples(evlist, sample_count, comm_count); | 77 | err = count_samples(evlist, sample_count, comm_count); |
78 | perf_evlist__munmap(evlist); | 78 | evlist__munmap(evlist); |
79 | return err; | 79 | return err; |
80 | } | 80 | } |
81 | 81 | ||
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index e8afe4fdc1b2..888472c7bf9c 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c | |||
@@ -149,7 +149,7 @@ void evlist__delete(struct evlist *evlist) | |||
149 | if (evlist == NULL) | 149 | if (evlist == NULL) |
150 | return; | 150 | return; |
151 | 151 | ||
152 | perf_evlist__munmap(evlist); | 152 | evlist__munmap(evlist); |
153 | evlist__close(evlist); | 153 | evlist__close(evlist); |
154 | perf_cpu_map__put(evlist->core.cpus); | 154 | perf_cpu_map__put(evlist->core.cpus); |
155 | perf_thread_map__put(evlist->core.threads); | 155 | perf_thread_map__put(evlist->core.threads); |
@@ -673,7 +673,7 @@ static int perf_evlist__resume(struct evlist *evlist) | |||
673 | return perf_evlist__set_paused(evlist, false); | 673 | return perf_evlist__set_paused(evlist, false); |
674 | } | 674 | } |
675 | 675 | ||
676 | static void perf_evlist__munmap_nofree(struct evlist *evlist) | 676 | static void evlist__munmap_nofree(struct evlist *evlist) |
677 | { | 677 | { |
678 | int i; | 678 | int i; |
679 | 679 | ||
@@ -686,9 +686,9 @@ static void perf_evlist__munmap_nofree(struct evlist *evlist) | |||
686 | perf_mmap__munmap(&evlist->overwrite_mmap[i]); | 686 | perf_mmap__munmap(&evlist->overwrite_mmap[i]); |
687 | } | 687 | } |
688 | 688 | ||
689 | void perf_evlist__munmap(struct evlist *evlist) | 689 | void evlist__munmap(struct evlist *evlist) |
690 | { | 690 | { |
691 | perf_evlist__munmap_nofree(evlist); | 691 | evlist__munmap_nofree(evlist); |
692 | zfree(&evlist->mmap); | 692 | zfree(&evlist->mmap); |
693 | zfree(&evlist->overwrite_mmap); | 693 | zfree(&evlist->overwrite_mmap); |
694 | } | 694 | } |
@@ -835,7 +835,7 @@ static int evlist__mmap_per_cpu(struct evlist *evlist, | |||
835 | return 0; | 835 | return 0; |
836 | 836 | ||
837 | out_unmap: | 837 | out_unmap: |
838 | perf_evlist__munmap_nofree(evlist); | 838 | evlist__munmap_nofree(evlist); |
839 | return -1; | 839 | return -1; |
840 | } | 840 | } |
841 | 841 | ||
@@ -861,7 +861,7 @@ static int evlist__mmap_per_thread(struct evlist *evlist, | |||
861 | return 0; | 861 | return 0; |
862 | 862 | ||
863 | out_unmap: | 863 | out_unmap: |
864 | perf_evlist__munmap_nofree(evlist); | 864 | evlist__munmap_nofree(evlist); |
865 | return -1; | 865 | return -1; |
866 | } | 866 | } |
867 | 867 | ||
diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h index aaf06182c1b8..f07501602353 100644 --- a/tools/perf/util/evlist.h +++ b/tools/perf/util/evlist.h | |||
@@ -175,7 +175,7 @@ int evlist__mmap_ex(struct evlist *evlist, unsigned int pages, | |||
175 | bool auxtrace_overwrite, int nr_cblocks, | 175 | bool auxtrace_overwrite, int nr_cblocks, |
176 | int affinity, int flush, int comp_level); | 176 | int affinity, int flush, int comp_level); |
177 | int evlist__mmap(struct evlist *evlist, unsigned int pages); | 177 | int evlist__mmap(struct evlist *evlist, unsigned int pages); |
178 | void perf_evlist__munmap(struct evlist *evlist); | 178 | void evlist__munmap(struct evlist *evlist); |
179 | 179 | ||
180 | size_t evlist__mmap_size(unsigned long pages); | 180 | size_t evlist__mmap_size(unsigned long pages); |
181 | 181 | ||