ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "init/epoll: Switch to aggregate initialization" am: 44d7397b98

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

Change-Id: I6692472cc2af35c7e8a598ed48b62bb15e5cb499
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bart Van Assche 2022-10-20 17:06:29 +00:00 • committed by Automerger Merge Worker
commit ba1e74fadf
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
init/epoll.cpp
View file

@ -45,16 +45,18 @@ Result<void> Epoll::RegisterHandler(int fd, Handler handler, uint32_t events) {
return Error() << "Must specify events";
}
Info info;
info.events = events;
info.handler = std::make_shared<decltype(handler)>(std::move(handler));
auto [it, inserted] = epoll_handlers_.emplace(fd, std::move(info));
auto [it, inserted] = epoll_handlers_.emplace(
fd, Info{
.events = events,
.handler = std::make_shared<Handler>(std::move(handler)),
});
if (!inserted) {
return Error() << "Cannot specify two epoll handlers for a given FD";
}
epoll_event ev;
ev.events = events;
ev.data.fd = fd;
epoll_event ev = {
.events = events,
.data.fd = fd,
};
if (epoll_ctl(epoll_fd_, EPOLL_CTL_ADD, fd, &ev) == -1) {
Result<void> result = ErrnoError() << "epoll_ctl failed to add fd";
epoll_handlers_.erase(fd);