<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Sep 18, 2018 at 5:45 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 | 9 +--------<br>
src/util/vircgroupbackend.h | 5 +++++<br>
src/util/vircgroupv1.c | 16 ++++++++++++++++<br>
3 files changed, 22 insertions(+), 8 deletions(-)<br>
<br>
diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c<br>
index cd6b087a69..38a30b759f 100644<br>
--- a/src/util/vircgroup.c<br>
+++ b/src/util/vircgroup.c<br>
@@ -1699,14 +1699,7 @@ virCgroupGetMemSwapHardLimit(v<wbr>irCgroupPtr group, unsigned long long *kb)<br>
int<br>
virCgroupGetMemSwapUsage(virC<wbr>groupPtr group, unsigned long long *kb)<br>
{<br>
- long long unsigned int usage_in_bytes;<br>
- int ret;<br>
- ret = virCgroupGetValueU64(group,<br>
- VIR_CGROUP_CONTROLLER_MEMORY,<br>
- "memory.memsw.usage_in_bytes"<wbr>, &usage_in_bytes);<br>
- if (ret == 0)<br>
- *kb = usage_in_bytes >> 10;<br>
- return ret;<br>
+ VIR_CGROUP_BACKEND_CALL(group, getMemSwapUsage, -1, kb);<br>
}<br>
<br>
<br>
diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h<br>
index 5e75e495c3..f5454e41f7 100644<br>
--- a/src/util/vircgroupbackend.h<br>
+++ b/src/util/vircgroupbackend.h<br>
@@ -243,6 +243,10 @@ typedef int<br>
(*virCgroupGetMemSwapHardLimi<wbr>tCB)(virCgroupPtr group,<br>
unsigned long long *kb);<br>
<br>
+typedef int<br>
+(*virCgroupGetMemSwapUsageCB)<wbr>(virCgroupPtr group,<br>
+ unsigned long long *kb);<br>
+<br>
struct _virCgroupBackend {<br>
virCgroupBackendType type;<br>
<br>
@@ -291,6 +295,7 @@ struct _virCgroupBackend {<br>
virCgroupGetMemorySoftLimitCB getMemorySoftLimit;<br>
<wbr>virCgroupSetMemSwapHardLimitCB setMemSwapHardLimit;<br>
<wbr>virCgroupGetMemSwapHardLimitCB getMemSwapHardLimit;<br>
+ virCgroupGetMemSwapUsageCB getMemSwapUsage;<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 5fc046afad..936cf1b1f5 100644<br>
--- a/src/util/vircgroupv1.c<br>
+++ b/src/util/vircgroupv1.c<br>
@@ -1650,6 +1650,21 @@ virCgroupV1GetMemSwapHardLimit<wbr>(virCgroupPtr group,<br>
}<br>
<br>
<br>
+static int<br>
+virCgroupV1GetMemSwapUsage(vi<wbr>rCgroupPtr group,<br>
+ unsigned long long *kb)<br>
+{<br>
+ long long unsigned int usage_in_bytes;<br>
+ int ret;<br>
+ ret = virCgroupGetValueU64(group,<br>
+ VIR_CGROUP_CONTROLLER_MEMORY,<br>
+ "memory.memsw.usage_in_bytes"<wbr>, &usage_in_bytes);<br>
+ if (ret == 0)<br>
+ *kb = usage_in_bytes >> 10;<br>
+ return ret;<br>
+}<br>
+<br>
+<br>
virCgroupBackend virCgroupV1Backend = {<br>
.type = VIR_CGROUP_BACKEND_TYPE_V1,<br>
<br>
@@ -1696,6 +1711,7 @@ virCgroupBackend virCgroupV1Backend = {<br>
.getMemorySoftLimit = virCgroupV1GetMemorySoftLimit,<br>
.setMemSwapHardLimit = virCgroupV1SetMemSwapHardLimit<wbr>,<br>
.getMemSwapHardLimit = virCgroupV1GetMemSwapHardLimit<wbr>,<br>
+ .getMemSwapUsage = virCgroupV1GetMemSwapUsage,<br>
};<br>
<span class="m_-3400513582421024055HOEnZb"><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>