[libvirt] [PATCHv2 08/11] util: Refactor 'virResctrlMonitorStats'
Refactor 'virResctrlMonitorStats' to track multiple statistical
records.
Signed-off-by: Wang Huaqiang <huaqiang.wang(a)intel.com>
---
src/qemu/qemu_driver.c | 2 +-
src/util/virresctrl.c | 11 ++++++++++-
src/util/virresctrl.h | 12 ++++++++++--
3 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 85fbe21..6b7d3ea 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -20123,7 +20123,7 @@ qemuDomainGetStatsCpuCache(virDomainObjPtr dom,
"cpu.cache.monitor.%zu.bank.%zu.bytes", i, j);
if (virTypedParamsAddUInt(&record->params, &record->nparams,
maxparams, param_name,
- resdata[i]->stats[j]->val) < 0)
+ resdata[i]->stats[j]->vals[0]) < 0)
goto cleanup;
}
}
diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c
index af0e5c0..0117b8f 100644
--- a/src/util/virresctrl.c
+++ b/src/util/virresctrl.c
@@ -2687,6 +2687,7 @@ virResctrlMonitorGetStats(virResctrlMonitorPtr monitor,
{
int rv = -1;
int ret = -1;
+ unsigned int val = 0;
DIR *dirp = NULL;
char *datapath = NULL;
char *filepath = NULL;
@@ -2743,7 +2744,7 @@ virResctrlMonitorGetStats(virResctrlMonitorPtr monitor,
if (virStrToLong_uip(node_id, NULL, 0, &stat->id) < 0)
goto cleanup;
- rv = virFileReadValueUint(&stat->val, "%s/%s/%s", datapath,
+ rv = virFileReadValueUint(&val, "%s/%s/%s", datapath,
ent->d_name, resource);
if (rv == -2) {
virReportError(VIR_ERR_INTERNAL_ERROR,
@@ -2753,6 +2754,12 @@ virResctrlMonitorGetStats(virResctrlMonitorPtr monitor,
if (rv < 0)
goto cleanup;
+ if (VIR_APPEND_ELEMENT(stat->vals, stat->nvals, val) < 0)
+ goto cleanup;
+
+ if (virStringListAdd(&stat->features, resource) < 0)
+ goto cleanup;
+
if (VIR_APPEND_ELEMENT(*stats, *nstats, stat) < 0)
goto cleanup;
}
@@ -2777,6 +2784,8 @@ virResctrlMonitorStatsFree(virResctrlMonitorStatsPtr stat)
if (!stat)
return;
+ virStringListFree(stat->features);
+ VIR_FREE(stat->vals);
VIR_FREE(stat);
}
diff --git a/src/util/virresctrl.h b/src/util/virresctrl.h
index d46e533..4dabb9c 100644
--- a/src/util/virresctrl.h
+++ b/src/util/virresctrl.h
@@ -194,8 +194,16 @@ typedef virResctrlMonitor *virResctrlMonitorPtr;
typedef struct _virResctrlMonitorStats virResctrlMonitorStats;
typedef virResctrlMonitorStats *virResctrlMonitorStatsPtr;
struct _virResctrlMonitorStats {
- unsigned int id;
- unsigned int val;
+ /* The system assigned cache ID associated with statistical record */
+ unsigned int id;
+ /* @features is a NULL terminal string list tracking the statistical record
+ * name.*/
+ char **features;
+ /* @vals store the statistical record values and @val[0] is the value for
+ * @features[0], @val[1] for@features[1] ... respectively */
+ unsigned int *vals;
+ /* The length of @vals array */
+ size_t nvals;
};
virResctrlMonitorPtr
--
2.7.4