[PATCH 61/73] libperf: Move pollfd allocation to libperf

[Jiri Olsa]

It's needed in libperf only, moving it to
perf_evlist__mmap_ops function.

Link: http://lkml.kernel.org/n/tip-7lmjzpk6k2wfhh1os8qw1...@git.kernel.org
Signed-off-by: Jiri Olsa <jo...@kernel.org>
---
 tools/perf/lib/evlist.c  | 5 +++++
 tools/perf/util/evlist.c | 4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/perf/lib/evlist.c b/tools/perf/lib/evlist.c
index ec83022cd62f..e27fe1fcef3d 100644
--- a/tools/perf/lib/evlist.c
+++ b/tools/perf/lib/evlist.c
@@ -32,6 +32,7 @@ void perf_evlist__init(struct perf_evlist *evlist)
                INIT_HLIST_HEAD(&evlist->heads[i]);
        INIT_LIST_HEAD(&evlist->entries);
        evlist->nr_entries = 0;
+       fdarray__init(&evlist->pollfd, 64);
 }
 
 static void __perf_evlist__propagate_maps(struct perf_evlist *evlist,
@@ -110,6 +111,7 @@ void perf_evlist__delete(struct perf_evlist *evlist)
 {
        free(evlist->mmap);
        free(evlist->mmap_ovw);
+       fdarray__exit(&evlist->pollfd);
        free(evlist);
 }
 
@@ -489,6 +491,9 @@ int perf_evlist__mmap_ops(struct perf_evlist *evlist,
                        return -ENOMEM;
        }
 
+       if (evlist->pollfd.entries == NULL && perf_evlist__alloc_pollfd(evlist) 
< 0)
+               return -ENOMEM;
+
        if (perf_cpu_map__empty(cpus))
                return mmap_per_thread(evlist, ops, mp);
 
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 94d8a1d96b81..728a15cddda7 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -57,7 +57,6 @@ void evlist__init(struct evlist *evlist, struct perf_cpu_map 
*cpus,
 {
        perf_evlist__init(&evlist->core);
        perf_evlist__set_maps(&evlist->core, cpus, threads);
-       fdarray__init(&evlist->core.pollfd, 64);
        evlist->workload.pid = -1;
        evlist->bkw_mmap_state = BKW_MMAP_NOTREADY;
 }
@@ -804,9 +803,6 @@ int evlist__mmap_ex(struct evlist *evlist, unsigned int 
pages,
        if (!evlist->mmap)
                return -ENOMEM;
 
-       if (evlist->core.pollfd.entries == NULL && 
perf_evlist__alloc_pollfd(&evlist->core) < 0)
-               return -ENOMEM;
-
        evlist->core.mmap_len = evlist__mmap_size(pages);
        pr_debug("mmap size %zuB\n", evlist->core.mmap_len);
        mp.core.mask = evlist->core.mmap_len - page_size - 1;
-- 
2.21.0