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

Commit 0ae79628 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "init: Introduce the function ReapAndRemove()" into main am: c93c5eff am: b0e5d640 

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



Change-Id: I6380d6a5753f1ce98721703d628defcf446ce217
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 07f8aa3b b0e5d640

init/sigchld_handler.cpp

+18 −9
Original line number Diff line number Diff line
@@ -118,8 +118,23 @@ static pid_t ReapOneProcess() { 
    return pid;

}



void ReapAnyOutstandingChildren() {

    while (ReapOneProcess() != 0) {

std::set<pid_t> ReapAnyOutstandingChildren() {

    std::set<pid_t> reaped_pids;

    for (;;) {

        const pid_t pid = ReapOneProcess();

        if (pid <= 0) {

            return reaped_pids;

        }

        reaped_pids.emplace(pid);

    }

}



static void ReapAndRemove(std::vector<pid_t>& alive_pids) {

    for (auto pid : ReapAnyOutstandingChildren()) {

        const auto it = std::find(alive_pids.begin(), alive_pids.end(), pid);

        if (it != alive_pids.end()) {

            alive_pids.erase(it);

        }

    }

}
@@ -142,13 +157,7 @@ void WaitToBeReaped(int sigchld_fd, const std::vector<pid_t>& pids, 
    }

    std::vector<pid_t> alive_pids(pids.begin(), pids.end());

    while (!alive_pids.empty() && t.duration() < timeout) {

        pid_t pid;

        while ((pid = ReapOneProcess()) != 0) {

            auto it = std::find(alive_pids.begin(), alive_pids.end(), pid);

            if (it != alive_pids.end()) {

                alive_pids.erase(it);

            }

        }

        ReapAndRemove(alive_pids);

        if (alive_pids.empty()) {

            break;

        }

init/sigchld_handler.h

+2 −1
Original line number Diff line number Diff line
@@ -18,12 +18,13 @@ 
#define _INIT_SIGCHLD_HANDLER_H_



#include <chrono>

#include <set>

#include <vector>



namespace android {

namespace init {



void ReapAnyOutstandingChildren();

std::set<pid_t> ReapAnyOutstandingChildren();



void WaitToBeReaped(int sigchld_fd, const std::vector<pid_t>& pids,

                    std::chrono::milliseconds timeout);