6:37 a.m.
virNodeGetCPUTime: Implement linux support
Signed-off-by: Minoru Usui <usui(a)mxm.nes.nec.co.jp>
---
src/libvirt_private.syms | 1 +
src/nodeinfo.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++
src/nodeinfo.h | 5 ++-
3 files changed, 83 insertions(+), 1 deletions(-)
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 65a86d3..b879454 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -651,6 +651,7 @@ virNodeDeviceObjUnlock;
# nodeinfo.h
nodeCapsInitNUMA;
+nodeGetCpuTime;
nodeGetCellsFreeMemory;
nodeGetFreeMemory;
nodeGetInfo;
diff --git a/src/nodeinfo.c b/src/nodeinfo.c
index 5d40aca..4dd1d00 100644
--- a/src/nodeinfo.c
+++ b/src/nodeinfo.c
@@ -57,12 +57,17 @@
#ifdef __linux__
# define CPUINFO_PATH "/proc/cpuinfo"
# define CPU_SYS_PATH "/sys/devices/system/cpu"
+# define PROCSTAT_PATH "/proc/stat"
/* NB, this is not static as we need to call it from the testsuite */
int linuxNodeInfoCPUPopulate(FILE *cpuinfo,
virNodeInfoPtr nodeinfo,
bool need_hyperthreads);
+int linuxNodeCpuTime(FILE *procstat,
+ virNodeCpuTimePtr cpu_time,
+ unsigned int nr_stats);
+
/* Return the positive decimal contents of the given
* CPU_SYS_PATH/cpu%u/FILE, or -1 on error. If MISSING_OK and the
* file could not be found, return 1 instead of an error; this is
@@ -322,6 +327,52 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo,
return 0;
}
+#define TICK_TO_NSEC (1000ull * 1000ull * 1000ull / sysconf(_SC_CLK_TCK))
+
+int linuxNodeCpuTime(FILE *procstat, virNodeCpuTimePtr stats,
+ unsigned int nr_stats)
+{
+ char line[1024];
+ unsigned long long usr, ni, sys, idle, iowait;
+ unsigned long long irq, softirq, steal, guest, guest_nice;
+
+ if (nr_stats < 4) {
+ nodeReportError(VIR_ERR_INVALID_ARG, "%s",
+ _("Invalid parameter count"));
+ return -1;
+ }
+
+ while (fgets(line, sizeof(line), procstat) != NULL) {
+ char *buf = line;
+
+ if (STRPREFIX(buf, "cpu ")) { /* aka total logical CPU time */
+ if (sscanf(buf,
+ "%*s %llu %llu %llu %llu %llu" // user ~ iowait
+ "%llu %llu %llu %llu %llu", // irq ~ guest_nice
+ &usr, &ni, &sys, &idle, &iowait,
+ &irq, &softirq, &steal, &guest, &guest_nice)
< 4) {
+ continue;
+ }
+
+ stats[0].tag = VIR_NODE_CPU_TIME_KERNEL;
+ stats[0].val = (sys + irq + softirq) * TICK_TO_NSEC;
+
+ stats[1].tag = VIR_NODE_CPU_TIME_USER;
+ stats[1].val = (usr + ni) * TICK_TO_NSEC;
+
+ stats[2].tag = VIR_NODE_CPU_TIME_IDLE;
+ stats[2].val = idle * TICK_TO_NSEC;
+
+ stats[3].tag = VIR_NODE_CPU_TIME_IOWAIT;
+ stats[3].val = iowait * TICK_TO_NSEC;
+
+ return 4;
+ }
+ }
+
+ nodeReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("no \'cpu \'
line found"));
+ return -1;
+}
#endif
int nodeGetInfo(virConnectPtr conn ATTRIBUTE_UNUSED, virNodeInfoPtr nodeinfo) {
@@ -360,6 +411,33 @@ int nodeGetInfo(virConnectPtr conn ATTRIBUTE_UNUSED, virNodeInfoPtr
nodeinfo) {
#endif
}
+int nodeGetCpuTime(virConnectPtr conn ATTRIBUTE_UNUSED,
+ virNodeCpuTimePtr stats,
+ unsigned int nr_stats,
+ unsigned int flags ATTRIBUTE_UNUSED)
+{
+
+#ifdef __linux__
+ {
+ int ret;
+ FILE *procstat = fopen(PROCSTAT_PATH, "r");
+ if (!procstat) {
+ virReportSystemError(errno,
+ _("cannot open %s"), PROCSTAT_PATH);
+ return -1;
+ }
+ ret = linuxNodeCpuTime(procstat, stats, nr_stats);
+ VIR_FORCE_FCLOSE(procstat);
+
+ return ret;
+ }
+#else
+ nodeReportError(VIR_ERR_NO_SUPPORT, "%s",
+ _("node CPU time not implemented on this platform"));
+ return -1;
+#endif
+}
+
#if HAVE_NUMACTL
# if LIBNUMA_API_VERSION <= 1
# define NUMA_MAX_N_CPUS 4096
diff --git a/src/nodeinfo.h b/src/nodeinfo.h
index 88bac6c..b024758 100644
--- a/src/nodeinfo.h
+++ b/src/nodeinfo.h
@@ -30,7 +30,10 @@
int nodeGetInfo(virConnectPtr conn, virNodeInfoPtr nodeinfo);
int nodeCapsInitNUMA(virCapsPtr caps);
-
+int nodeGetCpuTime(virConnectPtr conn ATTRIBUTE_UNUSED,
+ virNodeCpuTimePtr stats,
+ unsigned int nr_stats,
+ unsigned int flags ATTRIBUTE_UNUSED);
int nodeGetCellsFreeMemory(virConnectPtr conn,
unsigned long long *freeMems,
int startCell,
--
1.7.1
--
Minoru Usui <usui(a)mxm.nes.nec.co.jp>