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

Commit 5ee6c66b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libprocessgroup: Handle temporarily non-empty group removal failure"... 

Merge "libprocessgroup: Handle temporarily non-empty group removal failure" am: 6cd136fc am: 7fa8f7a5 am: f9e956f4

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



Change-Id: I550342e21ae9ede80ef96e21722bb893a9f2cb4a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 49b132a0 f9e956f4

libprocessgroup/processgroup.cpp

+3 −6
Original line number Diff line number Diff line
@@ -187,10 +187,6 @@ static int RemoveProcessGroup(const char* cgroup, uid_t uid, int pid, unsigned i 
    auto uid_pid_path = ConvertUidPidToPath(cgroup, uid, pid);

    auto uid_path = ConvertUidToPath(cgroup, uid);



    if (retries == 0) {

        retries = 1;

    }



    while (retries--) {

        ret = rmdir(uid_pid_path.c_str());

        if (!ret || errno != EBUSY) break;
@@ -463,12 +459,13 @@ static int KillProcessGroup(uid_t uid, int initialPid, int signal, int retries, 
                      << " in " << static_cast<int>(ms) << "ms";

        }



        int err = RemoveProcessGroup(cgroup, uid, initialPid, retries);

        // 400 retries correspond to 2 secs max timeout

        int err = RemoveProcessGroup(cgroup, uid, initialPid, 400);



        if (isMemoryCgroupSupported() && UsePerAppMemcg()) {

            std::string memcg_apps_path;

            if (CgroupGetMemcgAppsPath(&memcg_apps_path) &&

                RemoveProcessGroup(memcg_apps_path.c_str(), uid, initialPid, retries) < 0) {

                RemoveProcessGroup(memcg_apps_path.c_str(), uid, initialPid, 400) < 0) {

                return -1;

            }

        }