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

Commit 3a22225a authored by Suren Baghdasaryan's avatar Suren Baghdasaryan Committed by Gerrit Code Review
Browse files

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

parents 40673c92 c7602318

libprocessgroup/cgroup_map.cpp

+4 −3
Original line number Diff line number Diff line
@@ -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;

}

rootdir/cgroups.json

+6 −6
Original line number Diff line number Diff line
@@ -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"

  }