commit a09ee8ece68376835e7dc96e439ec4854b90e46c
author T.J. Mercier <tjmercier@google.com> Tue Oct 08 23:41:27 2024 +0000
committer T.J. Mercier <tjmercier@google.com> Tue Oct 08 23:42:49 2024 +0000
tree 13a76e8e591d6ce6afec92846165633b3dcb99dc
parent eb34156abe7fa7bbe3d964cd272d629922d46ff2

Reapply "libprocessgroup: Remove cgroup.rc file"

This reverts commit 972a2d30f8a3f260967b747592f4e8cdc560e01c.

Change-Id: Icdf2824675e515ea3656b1c58ac55160ecc337df

libprocessgroup/cgroup_map.cpp

diff --git a/libprocessgroup/cgroup_map.cpp b/libprocessgroup/cgroup_map.cpp
index fb01cfd..aeccfe8 100644
--- a/libprocessgroup/cgroup_map.cpp
+++ b/libprocessgroup/cgroup_map.cpp
@@ -151,7 +151,7 @@
 void CgroupMap::Print() const {
     if (!loaded_) {
         LOG(ERROR) << "CgroupMap::Print called for [" << getpid()
-                   << "] failed, RC file was not initialized properly";
+                   << "] failed, cgroups were not initialized properly";
         return;
     }
     LOG(INFO) << "File version = " << ACgroupFile_getVersion();
@@ -221,7 +221,7 @@
             if (__builtin_available(android 36, *)) {
                 max_activation_depth = ACgroupController_getMaxActivationDepth(controller);
             }
-            const int depth = util::GetCgroupDepth(ACgroupController_getPath(controller), path);
+            const int depth = GetCgroupDepth(ACgroupController_getPath(controller), path);
 
             if (flags & CGROUPRC_CONTROLLER_FLAG_NEEDS_ACTIVATION && depth < max_activation_depth) {
                 std::string str("+");