pa-fazil
/
android_system_core
mirror of https://github.com/fazilsheik96/android_system_core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge changes I8a2764a6,I6e8b9d63,I6e041dfc 

* changes:
  Canonicalize cgroup paths
  Micro-optimize MergeCgroupToDescriptors()
  Fix support for optional cgroup attributes
This commit is contained in:
Treehugger Robot 2022-03-26 01:25:30 +00:00 committed by Gerrit Code Review
parent daf60339ff d31602063e
commit 6079d30145
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libprocessgroup/setup/cgroup_map_write.cpp
View File

@ -147,12 +147,17 @@ static bool Mkdir(const std::string& path, mode_t mode, const std::string& uid,
static void MergeCgroupToDescriptors(std::map<std::string, CgroupDescriptor>* descriptors,
const Json::Value& cgroup, const std::string& name,
const std::string& root_path, int cgroups_version) {
const std::string cgroup_path = cgroup["Path"].asString();
std::string path;
if (!root_path.empty()) {
path = root_path + "/" + cgroup["Path"].asString();
path = root_path;
if (cgroup_path != ".") {
path += "/";
path += cgroup_path;
}
} else {
path = cgroup["Path"].asString();
path = cgroup_path;
}
uint32_t controller_flags = 0;

2
libprocessgroup/task_profiles.cpp
View File

@ -207,7 +207,7 @@ bool SetAttributeAction::ExecuteForTask(int tid) const {
}
if (!WriteStringToFile(value_, path)) {
if (errno == ENOENT) {
if (access(path.c_str(), F_OK) < 0) {
if (optional_) {
return true;
} else {