tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "init: Fix signalfd support in WaitToBeReaped()" into main am: dfe6c802d0 am: 7aa325791f am: fe36333f7e

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

Change-Id: I81a89d4ae603ad942c8858af238583cfbe744d15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-11-22 19:45:02 +00:00 committed by Automerger Merge Worker
commit 742c255c39
1 changed files with 28 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
init/sigchld_handler.cpp
View file

@ -138,7 +138,7 @@ static void ReapAndRemove(std::vector<pid_t>& alive_pids) {
}
}
static void DiscardSiginfo(int signal_fd) {
static void HandleSignal(int signal_fd) {
signalfd_siginfo siginfo;
ssize_t bytes_read = TEMP_FAILURE_RETRY(read(signal_fd, &siginfo, sizeof(siginfo)));
if (bytes_read != sizeof(siginfo)) {
@ -151,22 +151,37 @@ void WaitToBeReaped(int sigchld_fd, const std::vector<pid_t>& pids,
std::chrono::milliseconds timeout) {
Timer t;
Epoll epoll;
// The init process passes a valid sigchld_fd argument but unit tests do not.
if (sigchld_fd >= 0) {
epoll.RegisterHandler(sigchld_fd, [sigchld_fd]() { DiscardSiginfo(sigchld_fd); });
}
std::vector<pid_t> alive_pids(pids.begin(), pids.end());
while (!alive_pids.empty() && t.duration() < timeout) {
ReapAndRemove(alive_pids);
if (alive_pids.empty()) {
break;
}
if (sigchld_fd >= 0) {
epoll.Wait(std::max(timeout - t.duration(), 0ms));
if (auto result = epoll.Open(); result.ok()) {
result =
epoll.RegisterHandler(sigchld_fd, [sigchld_fd]() { HandleSignal(sigchld_fd); });
if (!result.ok()) {
LOG(WARNING) << __func__
<< " RegisterHandler() failed. Falling back to sleep_for(): "
<< result.error();
sigchld_fd = -1;
}
} else {
std::this_thread::sleep_for(50ms);
LOG(WARNING) << __func__ << " Epoll::Open() failed. Falling back to sleep_for(): "
<< result.error();
sigchld_fd = -1;
}
}
std::vector<pid_t> alive_pids(pids);
ReapAndRemove(alive_pids);
while (!alive_pids.empty() && t.duration() < timeout) {
if (sigchld_fd >= 0) {
auto result = epoll.Wait(std::max(timeout - t.duration(), 0ms));
if (result.ok()) {
ReapAndRemove(alive_pids);
continue;
} else {
LOG(WARNING) << "Epoll::Wait() failed " << result.error();
}
}
std::this_thread::sleep_for(50ms);
ReapAndRemove(alive_pids);
}
LOG(INFO) << "Waiting for " << pids.size() << " pids to be reaped took " << t << " with "
<< alive_pids.size() << " of them still running";
for (pid_t pid : alive_pids) {