From d54383e93c3d3a71008d4b3a48b4dafba2368609 Mon Sep 17 00:00:00 2001
Message-Id: <d54383e93c3d3a71008d4b3a48b4dafba2368609@dist-git>
From: Pavel Hrdina <phrdina@redhat.com>
Date: Mon, 1 Jul 2019 17:07:51 +0200
Subject: [PATCH] vircgroup: introduce virCgroupV2GetCpuacctStat
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 4d1d5c92bdefc38bc68bde5f9bd2dbd3c11bff2a)

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

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Message-Id: <62365d349154035cfab2115d66430dcf3c7bdd03.1561993100.git.phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 src/util/vircgroupv2.c | 49 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
index afa243b3c7..d6362e2b05 100644
--- a/src/util/vircgroupv2.c
+++ b/src/util/vircgroupv2.c
@@ -1487,6 +1487,54 @@ virCgroupV2GetCpuacctUsage(virCgroupPtr group,
 }
 
 
+static int
+virCgroupV2GetCpuacctStat(virCgroupPtr group,
+                          unsigned long long *user,
+                          unsigned long long *sys)
+{
+    VIR_AUTOFREE(char *) str = NULL;
+    char *tmp;
+    unsigned long long userVal = 0;
+    unsigned long long sysVal = 0;
+
+    if (virCgroupGetValueStr(group, VIR_CGROUP_CONTROLLER_CPUACCT,
+                             "cpu.stat", &str) < 0) {
+        return -1;
+    }
+
+    if (!(tmp = strstr(str, "user_usec "))) {
+        virReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("cannot parse cpu user stat '%s'"), str);
+        return -1;
+    }
+    tmp += strlen("user_usec ");
+
+    if (virStrToLong_ull(tmp, &tmp, 10, &userVal) < 0) {
+        virReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("Failed to parse value '%s' as number."), tmp);
+        return -1;
+    }
+
+    if (!(tmp = strstr(str, "system_usec "))) {
+        virReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("cannot parse cpu sys stat '%s'"), str);
+        return -1;
+    }
+    tmp += strlen("system_usec ");
+
+    if (virStrToLong_ull(tmp, &tmp, 10, &sysVal) < 0) {
+        virReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("Failed to parse value '%s' as number."), tmp);
+        return -1;
+    }
+
+    *user = userVal * 1000;
+    *sys = sysVal * 1000;
+
+    return 0;
+}
+
+
 virCgroupBackend virCgroupV2Backend = {
     .type = VIR_CGROUP_BACKEND_TYPE_V2,
 
@@ -1544,6 +1592,7 @@ virCgroupBackend virCgroupV2Backend = {
     .supportsCpuBW = virCgroupV2SupportsCpuBW,
 
     .getCpuacctUsage = virCgroupV2GetCpuacctUsage,
+    .getCpuacctStat = virCgroupV2GetCpuacctStat,
 };
 
 
-- 
2.22.0