Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c1f2491 authored by Suren Baghdasaryan's avatar Suren Baghdasaryan
Browse files

init: Replace cgroup hardcoded path with detected one 



Remove hardcoded cpuset path usage and replace it with a request to
get the path using new API.

Bug: 111307099
Test: builds, boots

Change-Id: I211d093c24a682e2d1992c08e4c1d980379711a4
Signed-off-by: default avatarSuren Baghdasaryan <surenb@google.com>
parent 192aee78

init/service.cpp

+25 −19
Original line number Diff line number Diff line
@@ -991,11 +991,14 @@ Result<Success> Service::Start() { 
        std::for_each(descriptors_.begin(), descriptors_.end(),

                      std::bind(&DescriptorInfo::CreateAndPublish, std::placeholders::_1, scon));



        // See if there were "writepid" instructions to write to files under /dev/cpuset/.

        auto cpuset_predicate = [](const std::string& path) {

            return StartsWith(path, "/dev/cpuset/");

        // See if there were "writepid" instructions to write to files under cpuset path.

        std::string cpuset_path;

        if (CgroupGetControllerPath("cpuset", &cpuset_path)) {

            auto cpuset_predicate = [&cpuset_path](const std::string& path) {

                return StartsWith(path, cpuset_path + "/");

            };

        auto iter = std::find_if(writepid_files_.begin(), writepid_files_.end(), cpuset_predicate);

            auto iter =

                    std::find_if(writepid_files_.begin(), writepid_files_.end(), cpuset_predicate);

            if (iter == writepid_files_.end()) {

                // There were no "writepid" instructions for cpusets, check if the system default

                // cpuset is specified to be used for the process.
@@ -1010,9 +1013,12 @@ Result<Success> Service::Start() { 
                        default_cpuset.push_back('/');

                    }

                    writepid_files_.push_back(

                    StringPrintf("/dev/cpuset%stasks", default_cpuset.c_str()));

                            StringPrintf("%s%stasks", cpuset_path.c_str(), default_cpuset.c_str()));

                }

            }

        } else {

            LOG(ERROR) << "cpuset cgroup controller is not mounted!";

        }

        std::string pid_str = std::to_string(getpid());

        for (const auto& file : writepid_files_) {

            if (!WriteStringToFile(pid_str, file)) {