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

Merge "libprocessgroup: Fix file mode parsing that requires octal values"

Browse source
This commit is contained in:
Suren Baghdasaryan 2019-02-07 04:54:28 +00:00 • committed by Gerrit Code Review
commit 3a22225ac6
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libprocessgroup/cgroup_map.cpp
View file

@ -131,7 +131,8 @@ static bool ReadDescriptors(std::map<std::string, CgroupDescriptor>* descriptors
std::string name = cgroups[i]["Controller"].asString(); std::string name = cgroups[i]["Controller"].asString();
descriptors->emplace(std::make_pair( descriptors->emplace(std::make_pair(
name, name,
CgroupDescriptor(1, name, cgroups[i]["Path"].asString(), cgroups[i]["Mode"].asInt(), CgroupDescriptor(1, name, cgroups[i]["Path"].asString(),
std::strtoul(cgroups[i]["Mode"].asString().c_str(), 0, 8),
cgroups[i]["UID"].asString(), cgroups[i]["GID"].asString()))); cgroups[i]["UID"].asString(), cgroups[i]["GID"].asString())));
} }
@ -139,8 +140,8 @@ static bool ReadDescriptors(std::map<std::string, CgroupDescriptor>* descriptors
descriptors->emplace(std::make_pair( descriptors->emplace(std::make_pair(
CGROUPV2_CONTROLLER_NAME, CGROUPV2_CONTROLLER_NAME,
CgroupDescriptor(2, CGROUPV2_CONTROLLER_NAME, cgroups2["Path"].asString(), CgroupDescriptor(2, CGROUPV2_CONTROLLER_NAME, cgroups2["Path"].asString(),
cgroups2["Mode"].asInt(), cgroups2["UID"].asString(), std::strtoul(cgroups2["Mode"].asString().c_str(), 0, 8),
cgroups2["GID"].asString()))); cgroups2["UID"].asString(), cgroups2["GID"].asString())));
return true; return true;
} }

12
rootdir/cgroups.json
View file

@ -3,40 +3,40 @@
{ {
"Controller": "cpu", "Controller": "cpu",
"Path": "/dev/cpuctl", "Path": "/dev/cpuctl",
"Mode": 0755, "Mode": "0755",
"UID": "system", "UID": "system",
"GID": "system" "GID": "system"
}, },
{ {
"Controller": "cpuacct", "Controller": "cpuacct",
"Path": "/acct", "Path": "/acct",
"Mode": 0555 "Mode": "0555"
}, },
{ {
"Controller": "cpuset", "Controller": "cpuset",
"Path": "/dev/cpuset", "Path": "/dev/cpuset",
"Mode": 0755, "Mode": "0755",
"UID": "system", "UID": "system",
"GID": "system" "GID": "system"
}, },
{ {
"Controller": "memory", "Controller": "memory",
"Path": "/dev/memcg", "Path": "/dev/memcg",
"Mode": 0700, "Mode": "0700",
"UID": "root", "UID": "root",
"GID": "system" "GID": "system"
}, },
{ {
"Controller": "schedtune", "Controller": "schedtune",
"Path": "/dev/stune", "Path": "/dev/stune",
"Mode": 0755, "Mode": "0755",
"UID": "system", "UID": "system",
"GID": "system" "GID": "system"
} }
], ],
"Cgroups2": { "Cgroups2": {
"Path": "/dev/cg2_bpf", "Path": "/dev/cg2_bpf",
"Mode": 0600, "Mode": "0600",
"UID": "root", "UID": "root",
"GID": "root" "GID": "root"
} }