libperf: Move the pollfd allocation from tools/perf to libperf (230662e1) · Commits · 戴 / test

tools/perf/lib/evlist.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,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,
		@@ -114,6 +115,7 @@ void perf_evlist__delete(struct perf_evlist *evlist)
		return;

		perf_evlist__munmap(evlist);
		fdarray__exit(&evlist->pollfd);
		free(evlist);
		}

		@@ -525,6 +527,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);

+0 −4

Original line number	Diff line number	Diff line
		@@ -58,7 +58,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;
		}
		@@ -829,9 +828,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;