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

Merge "Fix cgroup support for recovery mode" am: da20bc763e

Browse source 
am: e95fd681f7

Change-Id: I779c4da2aedddd09f86df570a1636b0854d35bbd
This commit is contained in:
Suren Baghdasaryan 2019-02-14 10:23:14 -08:00 • committed by android-build-merger
commit 0a613c94df
3 changed files with 37 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
libprocessgroup/cgroup_map.cpp
View file

@ -126,22 +126,26 @@ static bool ReadDescriptors(std::map<std::string, CgroupDescriptor>* descriptors
return false; return false;
} }
Json::Value cgroups = root["Cgroups"]; if (root.isMember("Cgroups")) {
for (Json::Value::ArrayIndex i = 0; i < cgroups.size(); ++i) { const Json::Value& cgroups = root["Cgroups"];
std::string name = cgroups[i]["Controller"].asString(); for (Json::Value::ArrayIndex i = 0; i < cgroups.size(); ++i) {
descriptors->emplace(std::make_pair( std::string name = cgroups[i]["Controller"].asString();
name, descriptors->emplace(std::make_pair(
CgroupDescriptor(1, name, cgroups[i]["Path"].asString(), name,
std::strtoul(cgroups[i]["Mode"].asString().c_str(), 0, 8), CgroupDescriptor(1, name, cgroups[i]["Path"].asString(),
cgroups[i]["UID"].asString(), cgroups[i]["GID"].asString()))); std::strtoul(cgroups[i]["Mode"].asString().c_str(), 0, 8),
cgroups[i]["UID"].asString(), cgroups[i]["GID"].asString())));
}
} }
Json::Value cgroups2 = root["Cgroups2"]; if (root.isMember("Cgroups2")) {
descriptors->emplace(std::make_pair( const Json::Value& cgroups2 = root["Cgroups2"];
CGROUPV2_CONTROLLER_NAME, descriptors->emplace(std::make_pair(
CgroupDescriptor(2, CGROUPV2_CONTROLLER_NAME, cgroups2["Path"].asString(), CGROUPV2_CONTROLLER_NAME,
std::strtoul(cgroups2["Mode"].asString().c_str(), 0, 8), CgroupDescriptor(2, CGROUPV2_CONTROLLER_NAME, cgroups2["Path"].asString(),
cgroups2["UID"].asString(), cgroups2["GID"].asString()))); std::strtoul(cgroups2["Mode"].asString().c_str(), 0, 8),
cgroups2["UID"].asString(), cgroups2["GID"].asString())));
}
return true; return true;
} }

10
rootdir/Android.mk
View file

@ -74,6 +74,16 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)
include $(BUILD_PREBUILT) include $(BUILD_PREBUILT)
#######################################
# cgroups.json for recovery
include $(CLEAR_VARS)
LOCAL_MODULE := cgroups.recovery.json
LOCAL_SRC_FILES := $(LOCAL_MODULE)
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/system/etc
LOCAL_MODULE_STEM := cgroups.json
include $(BUILD_PREBUILT)
####################################### #######################################
# task_profiles.json # task_profiles.json
include $(CLEAR_VARS) include $(CLEAR_VARS)

9
rootdir/cgroups.recovery.json Normal file
View file

@ -0,0 +1,9 @@
{
"Cgroups": [
{
"Controller": "cpuacct",
"Path": "/acct",
"Mode": "0555"
}
]
}