openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Suren Baghdasaryan 2019-02-07 04:54:28 +00:00 committed by Gerrit Code Review
parent 40673c9250 c760231891
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();
descriptors->emplace(std::make_pair(
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())));
}
@ -139,8 +140,8 @@ static bool ReadDescriptors(std::map<std::string, CgroupDescriptor>* descriptors
descriptors->emplace(std::make_pair(
CGROUPV2_CONTROLLER_NAME,
CgroupDescriptor(2, CGROUPV2_CONTROLLER_NAME, cgroups2["Path"].asString(),
cgroups2["Mode"].asInt(), cgroups2["UID"].asString(),
cgroups2["GID"].asString())));
std::strtoul(cgroups2["Mode"].asString().c_str(), 0, 8),
cgroups2["UID"].asString(), cgroups2["GID"].asString())));
return true;
}

12
rootdir/cgroups.json
View File

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