From e0764ef7577519de460fc2c2d52127eafb077200 Mon Sep 17 00:00:00 2001
Message-Id: <e0764ef7577519de460fc2c2d52127eafb077200@dist-git>
From: Pavel Hrdina <phrdina@redhat.com>
Date: Mon, 1 Jul 2019 17:07:50 +0200
Subject: [PATCH] vircgroup: introduce virCgroupV2GetCpuacctUsage
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 567fcbdca56ac409e856a0be8425b2218d02fe81)
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Message-Id: <26dc66d290ee4d5a4ba67470552df9d2fa4ae86b.1561993100.git.phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
src/util/vircgroupv2.c | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
index 55f79af204..afa243b3c7 100644
--- a/src/util/vircgroupv2.c
+++ b/src/util/vircgroupv2.c
@@ -1456,6 +1456,37 @@ virCgroupV2SupportsCpuBW(virCgroupPtr cgroup)
}
+static int
+virCgroupV2GetCpuacctUsage(virCgroupPtr group,
+ unsigned long long *usage)
+{
+ VIR_AUTOFREE(char *) str = NULL;
+ char *tmp;
+
+ if (virCgroupGetValueStr(group, VIR_CGROUP_CONTROLLER_CPUACCT,
+ "cpu.stat", &str) < 0) {
+ return -1;
+ }
+
+ if (!(tmp = strstr(str, "usage_usec "))) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("cannot parse cpu usage stat '%s'"), str);
+ return -1;
+ }
+ tmp += strlen("usage_usec ");
+
+ if (virStrToLong_ull(tmp, &tmp, 10, usage) < 0) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("Failed to parse value '%s' as number."), tmp);
+ return -1;
+ }
+
+ *usage *= 1000;
+
+ return 0;
+}
+
+
virCgroupBackend virCgroupV2Backend = {
.type = VIR_CGROUP_BACKEND_TYPE_V2,
@@ -1511,6 +1542,8 @@ virCgroupBackend virCgroupV2Backend = {
.setCpuCfsQuota = virCgroupV2SetCpuCfsQuota,
.getCpuCfsQuota = virCgroupV2GetCpuCfsQuota,
.supportsCpuBW = virCgroupV2SupportsCpuBW,
+
+ .getCpuacctUsage = virCgroupV2GetCpuacctUsage,
};
--
2.22.0