Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 006b7553 authored Oct 20, 2022 by Bart Van Assche Committed by Automerger Merge Worker Oct 20, 2022

Merge "init/epoll: Stop using smart pointers" am: 51706e77 am: f7b798d7 am: d181396a

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2255743

Change-Id: I14b734999438386f4a3d921e1b87261666435dc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 3d3d721a d181396a

init/epoll.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ Result<void> Epoll::RegisterHandler(int fd, Handler handler, uint32_t events) {
		auto [it, inserted] = epoll_handlers_.emplace(
		fd, Info{
		.events = events,
		.handler = std::make_shared<Handler>(std::move(handler)),
		.handler = std::move(handler),
		});
		if (!inserted) {
		return Error() << "Cannot specify two epoll handlers for a given FD";
		@@ -107,7 +107,7 @@ Result<int> Epoll::Wait(std::optional<std::chrono::milliseconds> timeout) {
		// Log something informational.
		LOG(ERROR) << "Received unexpected epoll event set: " << ev[i].events;
		}
		(*info.handler)();
		info.handler();
		for (auto fd : to_remove_) {
		epoll_handlers_.erase(fd);
		}

init/epoll.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ class Epoll {

		private:
		struct Info {
		std::shared_ptr<Handler> handler;
		Handler handler;
		uint32_t events;
		};