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

Commit 030d4bb9 authored by T.J. Mercier's avatar T.J. Mercier Committed by Automerger Merge Worker
Browse files

Merge "libprocessgroup: Convert incorrect PLOGs to LOGs" into main am: 49d3cdc9 

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



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

libprocessgroup/processgroup.cpp

+4 −4
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ bool CgroupGetAttributePathForTask(const std::string& attr_name, int tid, std::s 
    }



    if (!attr->GetPathForTask(tid, path)) {

        PLOG(ERROR) << "Failed to find cgroup for tid " << tid;

        LOG(ERROR) << "Failed to find cgroup for tid " << tid;

        return false;

    }
@@ -601,7 +601,7 @@ int createProcessGroup(uid_t uid, int initialPid, bool memControl) { 
    CHECK_GT(initialPid, 0);



    if (memControl && !UsePerAppMemcg()) {

        PLOG(ERROR) << "service memory controls are used without per-process memory cgroup support";

        LOG(ERROR) << "service memory controls are used without per-process memory cgroup support";

        return -EINVAL;

    }
@@ -623,13 +623,13 @@ int createProcessGroup(uid_t uid, int initialPid, bool memControl) { 


static bool SetProcessGroupValue(int tid, const std::string& attr_name, int64_t value) {

    if (!isMemoryCgroupSupported()) {

        PLOG(ERROR) << "Memcg is not mounted.";

        LOG(ERROR) << "Memcg is not mounted.";

        return false;

    }



    std::string path;

    if (!CgroupGetAttributePathForTask(attr_name, tid, &path)) {

        PLOG(ERROR) << "Failed to find attribute '" << attr_name << "'";

        LOG(ERROR) << "Failed to find attribute '" << attr_name << "'";

        return false;

    }