<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 | 39 +-----------------------------<br>
src/util/vircgroupbackend.h | 6 +++++<br>
src/util/vircgroupv1.c | 47 ++++++++++++++++++++++++++++++<wbr>+++++++<br>
3 files changed, 54 insertions(+), 38 deletions(-)<br>
<br>
diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c<br>
index 598147acf7..9ba2318c0b 100644<br>
--- a/src/util/vircgroup.c<br>
+++ b/src/util/vircgroup.c<br>
@@ -2598,44 +2598,7 @@ int<br>
virCgroupGetCpuacctStat(virCg<wbr>roupPtr group, unsigned long long *user,<br>
unsigned long long *sys)<br>
{<br>
- VIR_AUTOFREE(char *) str = NULL;<br>
- char *p;<br>
- static double scale = -1.0;<br>
-<br>
- if (virCgroupGetValueStr(group, VIR_CGROUP_CONTROLLER_CPUACCT,<br>
- "cpuacct.stat", &str) < 0)<br>
- return -1;<br>
-<br>
- if (!(p = STRSKIP(str, "user ")) ||<br>
- virStrToLong_ull(p, &p, 10, user) < 0) {<br>
- virReportError(VIR_ERR_INTERNA<wbr>L_ERROR,<br>
- _("Cannot parse user stat '%s'"),<br>
- p);<br>
- return -1;<br>
- }<br>
- if (!(p = STRSKIP(p, "\nsystem ")) ||<br>
- virStrToLong_ull(p, NULL, 10, sys) < 0) {<br>
- virReportError(VIR_ERR_INTERNA<wbr>L_ERROR,<br>
- _("Cannot parse sys stat '%s'"),<br>
- p);<br>
- return -1;<br>
- }<br>
- /* times reported are in system ticks (generally 100 Hz), but that<br>
- * rate can theoretically vary between machines. Scale things<br>
- * into approximate nanoseconds. */<br>
- if (scale < 0) {<br>
- long ticks_per_sec = sysconf(_SC_CLK_TCK);<br>
- if (ticks_per_sec == -1) {<br>
- virReportSystemError(errno, "%s",<br>
- _("Cannot determine system clock HZ"));<br>
- return -1;<br>
- }<br>
- scale = 1000000000.0 / ticks_per_sec;<br>
- }<br>
- *user *= scale;<br>
- *sys *= scale;<br>
-<br>
- return 0;<br>
+ VIR_CGROUP_BACKEND_CALL(group, getCpuacctStat, -1, user, sys);<br>
}<br>
<br>
<br>
diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h<br>
index 380ab9850d..a80ad0b5d3 100644<br>
--- a/src/util/vircgroupbackend.h<br>
+++ b/src/util/vircgroupbackend.h<br>
@@ -303,6 +303,11 @@ typedef int<br>
(*virCgroupGetCpuacctPercpuUs<wbr>ageCB)(virCgroupPtr group,<br>
char **usage);<br>
<br>
+typedef int<br>
+(*virCgroupGetCpuacctStatCB)(<wbr>virCgroupPtr group,<br>
+ unsigned long long *user,<br>
+ unsigned long long *sys);<br>
+<br>
struct _virCgroupBackend {<br>
virCgroupBackendType type;<br>
<br>
@@ -368,6 +373,7 @@ struct _virCgroupBackend {<br>
<br>
virCgroupGetCpuacctUsageCB getCpuacctUsage;<br>
<wbr>virCgroupGetCpuacctPercpuUsage<wbr>CB getCpuacctPercpuUsage;<br>
+ virCgroupGetCpuacctStatCB getCpuacctStat;<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 a827917db1..f99cf5c6d6 100644<br>
--- a/src/util/vircgroupv1.c<br>
+++ b/src/util/vircgroupv1.c<br>
@@ -1877,6 +1877,52 @@ virCgroupV1GetCpuacctPercpuUsa<wbr>ge(virCgroupPtr group,<br>
}<br>
<br>
<br>
+static int<br>
+virCgroupV1GetCpuacctStat(vir<wbr>CgroupPtr group,<br>
+ unsigned long long *user,<br>
+ unsigned long long *sys)<br>
+{<br>
+ VIR_AUTOFREE(char *) str = NULL;<br>
+ char *p;<br>
+ static double scale = -1.0;<br>
+<br>
+ if (virCgroupGetValueStr(group, VIR_CGROUP_CONTROLLER_CPUACCT,<br>
+ "cpuacct.stat", &str) < 0)<br>
+ return -1;<br>
+<br>
+ if (!(p = STRSKIP(str, "user ")) ||<br>
+ virStrToLong_ull(p, &p, 10, user) < 0) {<br>
+ virReportError(VIR_ERR_INTERNA<wbr>L_ERROR,<br>
+ _("Cannot parse user stat '%s'"),<br>
+ p);<br>
+ return -1;<br>
+ }<br>
+ if (!(p = STRSKIP(p, "\nsystem ")) ||<br>
+ virStrToLong_ull(p, NULL, 10, sys) < 0) {<br>
+ virReportError(VIR_ERR_INTERNA<wbr>L_ERROR,<br>
+ _("Cannot parse sys stat '%s'"),<br>
+ p);<br>
+ return -1;<br>
+ }<br>
+ /* times reported are in system ticks (generally 100 Hz), but that<br>
+ * rate can theoretically vary between machines. Scale things<br>
+ * into approximate nanoseconds. */<br>
+ if (scale < 0) {<br>
+ long ticks_per_sec = sysconf(_SC_CLK_TCK);<br>
+ if (ticks_per_sec == -1) {<br>
+ virReportSystemError(errno, "%s",<br>
+ _("Cannot determine system clock HZ"));<br>
+ return -1;<br>
+ }<br>
+ scale = 1000000000.0 / ticks_per_sec;<br>
+ }<br>
+ *user *= scale;<br>
+ *sys *= scale;<br>
+<br>
+ return 0;<br>
+}<br>
+<br>
+<br>
virCgroupBackend virCgroupV1Backend = {<br>
.type = VIR_CGROUP_BACKEND_TYPE_V1,<br>
<br>
@@ -1940,6 +1986,7 @@ virCgroupBackend virCgroupV1Backend = {<br>
<br>
.getCpuacctUsage = virCgroupV1GetCpuacctUsage,<br>
.getCpuacctPercpuUsage = virCgroupV1GetCpuacctPercpuUsa<wbr>ge,<br>
+ .getCpuacctStat = virCgroupV1GetCpuacctStat,<br>
};<br>
<span class="m_-5885876845902048631HOEnZb"><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>