comments

Author: syphar

src/cmd/sandbox.rs

@@ -395,10 +395,8 @@ impl Container<'_> {
     /// Tries cgroups v2 first, then falls back to cgroups v1.
     fn read_memory_peak(&self) -> Option<u64> {
         let paths = [
-            // cgroups v2
-            "/sys/fs/cgroup/memory.peak",
-            // cgroups v1
-            "/sys/fs/cgroup/memory/memory.max_usage_in_bytes",
+            "/sys/fs/cgroup/memory.peak",                      // v2
+            "/sys/fs/cgroup/memory/memory.max_usage_in_bytes", // v1
         ];
         for path in paths {
             if let Some(val) = self
@@ -420,10 +418,8 @@ impl Container<'_> {
     fn check_cgroup_oom(&self) -> bool {
         // Both v1 and v2 expose `oom_kill <count>` — just in different files.
         let paths = [
-            // cgroups v2
-            "/sys/fs/cgroup/memory.events",
-            // cgroups v1
-            "/sys/fs/cgroup/memory/memory.oom_control",
+            "/sys/fs/cgroup/memory.events",             // v2
+            "/sys/fs/cgroup/memory/memory.oom_control", // v1
         ];
         for path in paths {
             if let Some(lines) = self.exec_cat_file(path) {