From: Mike Yuan <me@yhndnzj.com>
Date: Sat, 9 Dec 2023 12:10:31 +0000 (+0800)
Subject: core/cgroup: cache the last memory usage values before destroying cgroup
X-Git-Tag: v256-rc1~1539^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad009380e1cbee8cf6e965f1a9b5671bd74ac146;p=thirdparty%2Fsystemd.git

core/cgroup: cache the last memory usage values before destroying cgroup

Currently, memory accounting values are only cached if it was queued
at least once before destroying cgroup. Let's always cache it like
what we already do for CPU usage.

Preparation for later changes.
---

diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index 61ac4df1a65..5e66ef76b55 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -3131,7 +3131,11 @@ void unit_prune_cgroup(Unit *u) {
         if (!u->cgroup_path)
                 return;
 
-        (void) unit_get_cpu_usage(u, NULL); /* Cache the last CPU usage value before we destroy the cgroup */
+        /* Cache the last CPU and memory usage values before we destroy the cgroup */
+        (void) unit_get_cpu_usage(u, /* ret = */ NULL);
+
+        for (CGroupMemoryAccountingMetric metric = 0; metric <= _CGROUP_MEMORY_ACCOUNTING_METRIC_CACHED_LAST; metric++)
+                (void) unit_get_memory_accounting(u, metric, /* ret = */ NULL);
 
 #if BPF_FRAMEWORK
         (void) lsm_bpf_cleanup(u); /* Remove cgroup from the global LSM BPF map */