<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Sep 18, 2018 at 5:46 PM, Pavel Hrdina <span dir="ltr"><<a href="mailto:phrdina@redhat.com" target="_blank">phrdina@redhat.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Signed-off-by: Pavel Hrdina <<a href="mailto:phrdina@redhat.com" target="_blank">phrdina@redhat.com</a>><br></blockquote><div><br></div><div>Reviewed-by: Fabiano Fidêncio <<a href="mailto:fidencio@redhat.com" target="_blank">fidencio@redhat.com</a>><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
---<br>
src/util/vircgroup.c | 7 ++-----<br>
src/util/vircgroupbackend.h | 11 +++++++++++<br>
src/util/vircgroupv1.c | 22 ++++++++++++++++++++++<br>
3 files changed, 35 insertions(+), 5 deletions(-)<br>
<br>
diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c<br>
index bdbed65be2..598147acf7 100644<br>
--- a/src/util/vircgroup.c<br>
+++ b/src/util/vircgroup.c<br>
@@ -2267,8 +2267,7 @@ virCgroupSetCpuCfsQuota(virCgr<wbr>oupPtr group, long long cfs_quota)<br>
int<br>
<wbr>virCgroupGetCpuacctPercpuUsage<wbr>(virCgroupPtr group, char **usage)<br>
{<br>
- return virCgroupGetValueStr(group, VIR_CGROUP_CONTROLLER_CPUACCT,<br>
- "cpuacct.usage_percpu", usage);<br>
+ VIR_CGROUP_BACKEND_CALL(group, getCpuacctPercpuUsage, -1, usage);<br>
}<br>
<br>
<br>
@@ -2591,9 +2590,7 @@ virCgroupGetCpuCfsQuota(virCgr<wbr>oupPtr group, long long *cfs_quota)<br>
int<br>
virCgroupGetCpuacctUsage(virC<wbr>groupPtr group, unsigned long long *usage)<br>
{<br>
- return virCgroupGetValueU64(group,<br>
- VIR_CGROUP_CONTROLLER_CPUACCT,<br>
- "cpuacct.usage", usage);<br>
+ VIR_CGROUP_BACKEND_CALL(group, getCpuacctUsage, -1, usage);<br>
}<br>
<br>
<br>
diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h<br>
index 049f9040bd..380ab9850d 100644<br>
--- a/src/util/vircgroupbackend.h<br>
+++ b/src/util/vircgroupbackend.h<br>
@@ -295,6 +295,14 @@ typedef int<br>
typedef bool<br>
(*virCgroupSupportsCpuBWCB)(v<wbr>irCgroupPtr cgroup);<br>
<br>
+typedef int<br>
+(*virCgroupGetCpuacctUsageCB)<wbr>(virCgroupPtr group,<br>
+ unsigned long long *usage);<br>
+<br>
+typedef int<br>
+(*virCgroupGetCpuacctPercpuUs<wbr>ageCB)(virCgroupPtr group,<br>
+ char **usage);<br>
+<br>
struct _virCgroupBackend {<br>
virCgroupBackendType type;<br>
<br>
@@ -357,6 +365,9 @@ struct _virCgroupBackend {<br>
virCgroupSetCpuCfsQuotaCB setCpuCfsQuota;<br>
virCgroupGetCpuCfsQuotaCB getCpuCfsQuota;<br>
virCgroupSupportsCpuBWCB supportsCpuBW;<br>
+<br>
+ virCgroupGetCpuacctUsageCB getCpuacctUsage;<br>
+ virCgroupGetCpuacctPercpuUsage<wbr>CB getCpuacctPercpuUsage;<br>
};<br>
typedef struct _virCgroupBackend virCgroupBackend;<br>
typedef virCgroupBackend *virCgroupBackendPtr;<br>
diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c<br>
index 88912778b5..a827917db1 100644<br>
--- a/src/util/vircgroupv1.c<br>
+++ b/src/util/vircgroupv1.c<br>
@@ -1858,6 +1858,25 @@ virCgroupV1SupportsCpuBW(virCg<wbr>roupPtr cgroup)<br>
}<br>
<br>
<br>
+static int<br>
+virCgroupV1GetCpuacctUsage(vi<wbr>rCgroupPtr group,<br>
+ unsigned long long *usage)<br>
+{<br>
+ return virCgroupGetValueU64(group,<br>
+ VIR_CGROUP_CONTROLLER_CPUACCT,<br>
+ "cpuacct.usage", usage);<br>
+}<br>
+<br>
+<br>
+static int<br>
+virCgroupV1GetCpuacctPercpuUs<wbr>age(virCgroupPtr group,<br>
+ char **usage)<br>
+{<br>
+ return virCgroupGetValueStr(group, VIR_CGROUP_CONTROLLER_CPUACCT,<br>
+ "cpuacct.usage_percpu", usage);<br>
+}<br>
+<br>
+<br>
virCgroupBackend virCgroupV1Backend = {<br>
.type = VIR_CGROUP_BACKEND_TYPE_V1,<br>
<br>
@@ -1918,6 +1937,9 @@ virCgroupBackend virCgroupV1Backend = {<br>
.setCpuCfsQuota = virCgroupV1SetCpuCfsQuota,<br>
.getCpuCfsQuota = virCgroupV1GetCpuCfsQuota,<br>
.supportsCpuBW = virCgroupV1SupportsCpuBW,<br>
+<br>
+ .getCpuacctUsage = virCgroupV1GetCpuacctUsage,<br>
+ .getCpuacctPercpuUsage = virCgroupV1GetCpuacctPercpuUsa<wbr>ge,<br>
};<br>
<span class="m_-874455364163471562HOEnZb"><font color="#888888"> <br>
<br>
-- <br>
2.17.1<br>
<br>
--<br>
libvir-list mailing list<br>
<a href="mailto:libvir-list@redhat.com" target="_blank">libvir-list@redhat.com</a><br>
<a href="https://www.redhat.com/mailman/listinfo/libvir-list" rel="noreferrer" target="_blank">https://www.redhat.com/mailman<wbr>/listinfo/libvir-list</a><br>
</font></span></blockquote></div><br></div></div>