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 "Revert "libprocessgroup: make sure SetupCgroups is called once and only by init""

This commit is contained in:
Nick Kralevich 2019-03-26 15:28:31 +00:00 committed by Gerrit Code Review
parent d2c4eb0dae c8ac3b9152
commit eac1220fba
1 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libprocessgroup/cgroup_map.cpp
View File

@ -229,11 +229,9 @@ static bool SetupCgroup(const CgroupDescriptor&) {
static bool WriteRcFile(const std::map<std::string, CgroupDescriptor>& descriptors) {
std::string cgroup_rc_path = StringPrintf("%s/%s", CGROUPS_RC_DIR, CgroupMap::CGROUPS_RC_FILE);
// Let init keep the FD open to prevent file mappings from becoming invalid
// in case the file gets deleted somehow
static unique_fd fd(TEMP_FAILURE_RETRY(open(cgroup_rc_path.c_str(),
O_CREAT | O_WRONLY | O_TRUNC | O_CLOEXEC,
S_IRUSR | S_IRGRP | S_IROTH)));
unique_fd fd(TEMP_FAILURE_RETRY(open(cgroup_rc_path.c_str(),
O_CREAT | O_WRONLY | O_TRUNC | O_CLOEXEC,
S_IRUSR | S_IRGRP | S_IROTH)));
if (fd < 0) {
PLOG(ERROR) << "open() failed for " << cgroup_rc_path;
return false;
@ -414,19 +412,6 @@ void CgroupMap::Print() const {
bool CgroupMap::SetupCgroups() {
std::map<std::string, CgroupDescriptor> descriptors;
if (getpid() != 1) {
LOG(ERROR) << "Cgroup setup can be done only by init process";
return false;
}
// Make sure we do this only one time. No need for std::call_once because
// init is a single-threaded process
static bool setup_done = false;
if (setup_done) {
LOG(WARNING) << "Attempt to call SetupCgroups more than once";
return true;
}
// load cgroups.json file
if (!ReadDescriptors(&descriptors)) {
LOG(ERROR) << "Failed to load cgroup description file";
@ -464,7 +449,6 @@ bool CgroupMap::SetupCgroups() {
return false;
}
setup_done = true;
return true;
}