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

Commit 0d7762d3 authored by Inseob Kim's avatar Inseob Kim Committed by Automerger Merge Worker
Browse files

Merge "Don't retry kill if cgroups isn't available" am: eb3912ea 

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



Change-Id: I11198e6d710b5ad13b2fe40db30a0a5a879629a4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ab4683b3 eb3912ea

libprocessgroup/processgroup.cpp

+5 −0
Original line number Diff line number Diff line
@@ -471,6 +471,11 @@ static int KillProcessGroup(uid_t uid, int initialPid, int signal, int retries, 
            *max_processes = processes;

        }

        LOG(VERBOSE) << "Killed " << processes << " processes for processgroup " << initialPid;

        if (!CgroupsAvailable()) {

            // makes no sense to retry, because there are no cgroup_procs file

            processes = 0;  // no remaining processes

            break;

        }

        if (retry > 0) {

            std::this_thread::sleep_for(5ms);

            --retry;