ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "libprocessgroup: Fix memcg path for apps" am: 1cae1b0f81

Browse source 
am: 8a4f601c11

Change-Id: I1880dffa5b056d56620b1dff37f0a65b27a8379e
This commit is contained in:
Vic Yang 2019-02-20 13:10:17 -08:00 • committed by android-build-merger
commit 58611b569d
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libprocessgroup/processgroup.cpp
View file

@ -200,7 +200,7 @@ void removeAllProcessGroups() {
cgroups.push_back(path);
}
if (CgroupGetControllerPath("memory", &path)) {
cgroups.push_back(path);
cgroups.push_back(path + "/apps");
}
for (std::string cgroup_root_path : cgroups) {
@ -317,6 +317,7 @@ static int KillProcessGroup(uid_t uid, int initialPid, int signal, int retries)
CgroupGetControllerPath("cpuacct", &cpuacct_path);
CgroupGetControllerPath("memory", &memory_path);
memory_path += "/apps";
const char* cgroup =
(!access(ConvertUidPidToPath(cpuacct_path.c_str(), uid, initialPid).c_str(), F_OK))
@ -380,6 +381,7 @@ int createProcessGroup(uid_t uid, int initialPid, bool memControl) {
std::string cgroup;
if (isMemoryCgroupSupported() && (memControl || UsePerAppMemcg())) {
CgroupGetControllerPath("memory", &cgroup);
cgroup += "/apps";
} else {
CgroupGetControllerPath("cpuacct", &cgroup);
}