|
 |
c480ed |
From 7b4215f8a38221fd90bf15a3ced42cce55adf105 Mon Sep 17 00:00:00 2001
|
|
|
c480ed |
Message-Id: <7b4215f8a38221fd90bf15a3ced42cce55adf105@dist-git>
|
|
|
c480ed |
From: Pavel Hrdina <phrdina@redhat.com>
|
|
|
c480ed |
Date: Mon, 1 Jul 2019 17:07:40 +0200
|
|
|
c480ed |
Subject: [PATCH] vircgroup: introduce virCgroupV2GetMemoryStat
|
|
|
c480ed |
MIME-Version: 1.0
|
|
|
c480ed |
Content-Type: text/plain; charset=UTF-8
|
|
|
c480ed |
Content-Transfer-Encoding: 8bit
|
|
|
c480ed |
|
|
|
c480ed |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
c480ed |
(cherry picked from commit d080c001660ed0f173066b3db63ecac4edb773fc)
|
|
|
c480ed |
|
|
|
c480ed |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
|
|
|
c480ed |
|
|
|
c480ed |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
c480ed |
Message-Id: <9ebb30d0c01bdb6e356928701cd56501fe43af5e.1561993100.git.phrdina@redhat.com>
|
|
|
c480ed |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
c480ed |
---
|
|
|
c480ed |
src/util/vircgroupv2.c | 75 ++++++++++++++++++++++++++++++++++++++++++
|
|
|
c480ed |
1 file changed, 75 insertions(+)
|
|
|
c480ed |
|
|
|
c480ed |
diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
|
|
|
c480ed |
index 1b7215d98b..1c7854909f 100644
|
|
|
c480ed |
--- a/src/util/vircgroupv2.c
|
|
|
c480ed |
+++ b/src/util/vircgroupv2.c
|
|
|
c480ed |
@@ -1042,6 +1042,80 @@ virCgroupV2SetMemory(virCgroupPtr group,
|
|
|
c480ed |
}
|
|
|
c480ed |
|
|
|
c480ed |
|
|
|
c480ed |
+static int
|
|
|
c480ed |
+virCgroupV2GetMemoryStat(virCgroupPtr group,
|
|
|
c480ed |
+ unsigned long long *cache,
|
|
|
c480ed |
+ unsigned long long *activeAnon,
|
|
|
c480ed |
+ unsigned long long *inactiveAnon,
|
|
|
c480ed |
+ unsigned long long *activeFile,
|
|
|
c480ed |
+ unsigned long long *inactiveFile,
|
|
|
c480ed |
+ unsigned long long *unevictable)
|
|
|
c480ed |
+{
|
|
|
c480ed |
+ VIR_AUTOFREE(char *) stat = NULL;
|
|
|
c480ed |
+ char *line = NULL;
|
|
|
c480ed |
+ unsigned long long cacheVal = 0;
|
|
|
c480ed |
+ unsigned long long activeAnonVal = 0;
|
|
|
c480ed |
+ unsigned long long inactiveAnonVal = 0;
|
|
|
c480ed |
+ unsigned long long activeFileVal = 0;
|
|
|
c480ed |
+ unsigned long long inactiveFileVal = 0;
|
|
|
c480ed |
+ unsigned long long unevictableVal = 0;
|
|
|
c480ed |
+
|
|
|
c480ed |
+ if (virCgroupGetValueStr(group,
|
|
|
c480ed |
+ VIR_CGROUP_CONTROLLER_MEMORY,
|
|
|
c480ed |
+ "memory.stat",
|
|
|
c480ed |
+ &stat) < 0) {
|
|
|
c480ed |
+ return -1;
|
|
|
c480ed |
+ }
|
|
|
c480ed |
+
|
|
|
c480ed |
+ line = stat;
|
|
|
c480ed |
+
|
|
|
c480ed |
+ while (line) {
|
|
|
c480ed |
+ char *newLine = strchr(line, '\n');
|
|
|
c480ed |
+ char *valueStr = strchr(line, ' ');
|
|
|
c480ed |
+ unsigned long long value;
|
|
|
c480ed |
+
|
|
|
c480ed |
+ if (newLine)
|
|
|
c480ed |
+ *newLine = '\0';
|
|
|
c480ed |
+
|
|
|
c480ed |
+ if (!valueStr) {
|
|
|
c480ed |
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
|
c480ed |
+ _("Cannot parse 'memory.stat' cgroup file."));
|
|
|
c480ed |
+ return -1;
|
|
|
c480ed |
+ }
|
|
|
c480ed |
+ *valueStr = '\0';
|
|
|
c480ed |
+
|
|
|
c480ed |
+ if (virStrToLong_ull(valueStr + 1, NULL, 10, &value) < 0) {
|
|
|
c480ed |
+ virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
c480ed |
+ _("Unable to parse '%s' as an integer"),
|
|
|
c480ed |
+ valueStr + 1);
|
|
|
c480ed |
+ return -1;
|
|
|
c480ed |
+ }
|
|
|
c480ed |
+
|
|
|
c480ed |
+ if (STREQ(line, "file"))
|
|
|
c480ed |
+ cacheVal = value >> 10;
|
|
|
c480ed |
+ else if (STREQ(line, "active_anon"))
|
|
|
c480ed |
+ activeAnonVal = value >> 10;
|
|
|
c480ed |
+ else if (STREQ(line, "inactive_anon"))
|
|
|
c480ed |
+ inactiveAnonVal = value >> 10;
|
|
|
c480ed |
+ else if (STREQ(line, "active_file"))
|
|
|
c480ed |
+ activeFileVal = value >> 10;
|
|
|
c480ed |
+ else if (STREQ(line, "inactive_file"))
|
|
|
c480ed |
+ inactiveFileVal = value >> 10;
|
|
|
c480ed |
+ else if (STREQ(line, "unevictable"))
|
|
|
c480ed |
+ unevictableVal = value >> 10;
|
|
|
c480ed |
+ }
|
|
|
c480ed |
+
|
|
|
c480ed |
+ *cache = cacheVal;
|
|
|
c480ed |
+ *activeAnon = activeAnonVal;
|
|
|
c480ed |
+ *inactiveAnon = inactiveAnonVal;
|
|
|
c480ed |
+ *activeFile = activeFileVal;
|
|
|
c480ed |
+ *inactiveFile = inactiveFileVal;
|
|
|
c480ed |
+ *unevictable = unevictableVal;
|
|
|
c480ed |
+
|
|
|
c480ed |
+ return 0;
|
|
|
c480ed |
+}
|
|
|
c480ed |
+
|
|
|
c480ed |
+
|
|
|
c480ed |
virCgroupBackend virCgroupV2Backend = {
|
|
|
c480ed |
.type = VIR_CGROUP_BACKEND_TYPE_V2,
|
|
|
c480ed |
|
|
|
c480ed |
@@ -1080,6 +1154,7 @@ virCgroupBackend virCgroupV2Backend = {
|
|
|
c480ed |
.getBlkioDeviceWriteBps = virCgroupV2GetBlkioDeviceWriteBps,
|
|
|
c480ed |
|
|
|
c480ed |
.setMemory = virCgroupV2SetMemory,
|
|
|
c480ed |
+ .getMemoryStat = virCgroupV2GetMemoryStat,
|
|
|
c480ed |
};
|
|
|
c480ed |
|
|
|
c480ed |
|
|
|
c480ed |
--
|
|
|
c480ed |
2.22.0
|
|
|
c480ed |
|