From d91df2c6090f79ef0135f2240181b8dbf87597b0 Mon Sep 17 00:00:00 2001

Message-Id: <d91df2c6090f79ef0135f2240181b8dbf87597b0@dist-git>

From: Pavel Hrdina <phrdina@redhat.com>

Date: Mon, 1 Jul 2019 17:06:01 +0200

Subject: [PATCH] vircgroup: Introduce virCgroupGetMemoryStat

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>

(cherry picked from commit 901d2b9c8716f2717439d5843cab412ab8d7b247)

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>

Message-Id: <b70cd9890f218f943b094bc6b040867c6d69bc6b.1561993099.git.phrdina@redhat.com>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

---

 src/libvirt_private.syms |  1 +

 src/util/vircgroup.c     | 88 ++++++++++++++++++++++++++++++++++++++++

 src/util/vircgroup.h     |  7 ++++

 3 files changed, 96 insertions(+)

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms

index 47695eb507..2ec9d8f4bf 100644

--- a/src/libvirt_private.syms

+++ b/src/libvirt_private.syms

@@ -1551,6 +1551,7 @@ virCgroupGetDomainTotalCpuStats;

 virCgroupGetFreezerState;

 virCgroupGetMemoryHardLimit;

 virCgroupGetMemorySoftLimit;

+virCgroupGetMemoryStat;

 virCgroupGetMemoryUsage;

 virCgroupGetMemSwapHardLimit;

 virCgroupGetMemSwapUsage;

diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c

index a94f958d75..0ed83932ac 100644

--- a/src/util/vircgroup.c

+++ b/src/util/vircgroup.c

@@ -2427,6 +2427,94 @@ virCgroupSetMemory(virCgroupPtr group, unsigned long long kb)

 }

+/**

+ * virCgroupGetMemoryStat:

+ *

+ * @group: The cgroup to change memory for

+ * @cache: page cache memory in KiB

+ * @activeAnon: anonymous and swap cache memory in KiB

+ * @inactiveAnon: anonymous and swap cache memory in KiB

+ * @activeFile: file-backed memory in KiB

+ * @inactiveFile: file-backed memory in KiB

+ * @unevictable: memory that cannot be reclaimed KiB

+ *

+ * Returns: 0 on success, -1 on error

+ */

+int

+virCgroupGetMemoryStat(virCgroupPtr group,

+                       unsigned long long *cache,

+                       unsigned long long *activeAnon,

+                       unsigned long long *inactiveAnon,

+                       unsigned long long *activeFile,

+                       unsigned long long *inactiveFile,

+                       unsigned long long *unevictable)

+{

+    int ret = -1;

+    char *stat = NULL;

+    char *line = NULL;

+    unsigned long long cacheVal = 0;

+    unsigned long long activeAnonVal = 0;

+    unsigned long long inactiveAnonVal = 0;

+    unsigned long long activeFileVal = 0;

+    unsigned long long inactiveFileVal = 0;

+    unsigned long long unevictableVal = 0;

+

+    if (virCgroupGetValueStr(group,

+                             VIR_CGROUP_CONTROLLER_MEMORY,

+                             "memory.stat",

+                             &stat) < 0) {

+        return -1;

+    }

+

+    line = stat;

+

+    while (line) {

+        char *newLine = strchr(line, '\n');

+        char *valueStr = strchr(line, ' ');

+        unsigned long long value;

+

+        if (newLine)

+            *newLine = '\0';

+

+        if (!valueStr) {

+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",

+                           _("Cannot parse 'memory.stat' cgroup file."));

+            goto cleanup;

+        }

+        *valueStr = '\0';

+

+        if (virStrToLong_ull(valueStr + 1, NULL, 10, &value) < 0)

+            goto cleanup;

+

+        if (STREQ(line, "cache"))

+            cacheVal = value >> 10;

+        else if (STREQ(line, "active_anon"))

+            activeAnonVal = value >> 10;

+        else if (STREQ(line, "inactive_anon"))

+            inactiveAnonVal = value >> 10;

+        else if (STREQ(line, "active_file"))

+            activeFileVal = value >> 10;

+        else if (STREQ(line, "inactive_file"))

+            inactiveFileVal = value >> 10;

+        else if (STREQ(line, "unevictable"))

+            unevictableVal = value >> 10;

+    }

+

+    *cache = cacheVal;

+    *activeAnon = activeAnonVal;

+    *inactiveAnon = inactiveAnonVal;

+    *activeFile = activeFileVal;

+    *inactiveFile = inactiveFileVal;

+    *unevictable = unevictableVal;

+

+    ret = 0;

+

+ cleanup:

+    VIR_FREE(stat);

+    return ret;

+}

+

+

 /**

  * virCgroupGetMemoryUsage:

  *

diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h

index 48be077aba..c7fdaaede4 100644

--- a/src/util/vircgroup.h

+++ b/src/util/vircgroup.h

@@ -177,6 +177,13 @@ int virCgroupGetBlkioDeviceWriteBps(virCgroupPtr group,

                                     unsigned long long *wbps);

 int virCgroupSetMemory(virCgroupPtr group, unsigned long long kb);

+int virCgroupGetMemoryStat(virCgroupPtr group,

+                           unsigned long long *cache,

+                           unsigned long long *activeAnon,

+                           unsigned long long *inactiveAnon,

+                           unsigned long long *activeFile,

+                           unsigned long long *inactiveFile,

+                           unsigned long long *unevictable);

 int virCgroupGetMemoryUsage(virCgroupPtr group, unsigned long *kb);

 int virCgroupSetMemoryHardLimit(virCgroupPtr group, unsigned long long kb);

-- 

2.22.0