From: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>

Add calc_mode for dirtyrate statistics retured by
virsh domstats --dirtyrate api, also add vcpu dirtyrate
if dirty-ring mode was used in last measurement.

Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
---
 src/libvirt-domain.c         |  5 +++++
 src/qemu/qemu_driver.c       | 14 ++++++++++++
 src/qemu/qemu_monitor.h      | 10 +++++++++
 src/qemu/qemu_monitor_json.c | 52 ++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 81 insertions(+)

diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
index 4caa740..b1b6707 100644
--- a/src/libvirt-domain.c
+++ b/src/libvirt-domain.c
@@ -11941,6 +11941,11 @@ virConnectGetDomainCapabilities(virConnectPtr conn,
  *     "dirtyrate.megabytes_per_second" - the calculated memory dirty rate in
  *                                        MiB/s as long long. It is produced
  *                                        only if the calc_status is measured.
+ *     "dirtyrate.calc_mode" - the calculation mode used last measurement as int,
+ *                             which is one of qemuMonitorDirtyRateCalcMode enum.
+ *     "dirtyrate.vcpu.<num>.megabytes_per_second" - the calculated memory dirty
+ *                                                   rate for a virtual cpu as
+ *                                                   long long.
  *
  * Note that entire stats groups or individual stat fields may be missing from
  * the output in case they are not supported by the given hypervisor, are not
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index feebfc4..09eda6b 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -18537,6 +18537,20 @@ qemuDomainGetStatsDirtyRate(virQEMUDriver *driver,
                                   "dirtyrate.megabytes_per_second") < 0)
         return -1;
 
+    if (virTypedParamListAddInt(params, info.mode,
+                                "dirtyrate.calc_mode") < 0)
+        return -1;
+
+    if (info.mode == VIR_DOMAIN_DIRTYRATE_CALC_MODE_DIRTY_RING) {
+        int i;
+        for (i = 0; i < info.nvcpus; i++) {
+            if (virTypedParamListAddLLong(params, info.rates[i].value,
+                                "dirtyrate.vcpu.%d.megabytes_per_second",
+                                info.rates[i].index) < 0)
+            return -1;
+        }
+    }
+
     return 0;
 }
 
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 08e14c0..465feef 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -1563,6 +1563,12 @@ qemuMonitorStartDirtyRateCalc(qemuMonitor *mon,
                               int seconds,
                               qemuMonitorDirtyRateCalcMode mode);
 
+typedef struct _qemuMonitorDirtyRateVcpu qemuMonitorDirtyRateVcpu;
+struct _qemuMonitorDirtyRateVcpu {
+    int index;          /* virtual cpu index */
+    long long value;    /* virtual cpu dirty page rate in MB/s */
+};
+
 typedef struct _qemuMonitorDirtyRateInfo qemuMonitorDirtyRateInfo;
 struct _qemuMonitorDirtyRateInfo {
     int status;             /* the status of last dirtyrate calculation,
@@ -1570,6 +1576,10 @@ struct _qemuMonitorDirtyRateInfo {
     int calcTime;           /* the period of dirtyrate calculation */
     long long startTime;    /* the start time of dirtyrate calculation */
     long long dirtyRate;    /* the dirtyrate in MiB/s */
+    qemuMonitorDirtyRateCalcMode mode;  /* calculation mode used in
+                                           last measurement */
+    size_t nvcpus;  /* number of virtual cpu */
+    qemuMonitorDirtyRateVcpu *rates; /* array of dirty page rate */
 };
 
 int
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index afbd721..391f685 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -8741,11 +8741,45 @@ VIR_ENUM_IMPL(qemuMonitorDirtyRateStatus,
               "measured");
 
 static int
+qemuMonitorJSONExtractVcpuDirtyRate(virJSONValue *data,
+                                    qemuMonitorDirtyRateInfo *info)
+{
+    size_t nvcpus;
+    int i;
+
+    nvcpus = virJSONValueArraySize(data);
+    info->nvcpus = nvcpus;
+    info->rates = g_new0(qemuMonitorDirtyRateVcpu, nvcpus);
+
+    for (i = 0; i < nvcpus; i++) {
+        virJSONValue *entry = virJSONValueArrayGet(data, i);
+        if (virJSONValueObjectGetNumberInt(entry, "id",
+                                           &info->rates[i].index) < 0) {
+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                           _("query-dirty-rate reply was missing 'id' data"));
+            return -1;
+        }
+
+        if (virJSONValueObjectGetNumberLong(entry, "dirty-rate",
+                                            &info->rates[i].value) < 0) {
+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                           _("query-dirty-rate reply was missing 'dirty-rate' data"));
+            return -1;
+        }
+    }
+
+    return 0;
+}
+
+static int
 qemuMonitorJSONExtractDirtyRateInfo(virJSONValue *data,
                                     qemuMonitorDirtyRateInfo *info)
 {
     const char *statusstr;
+    const char *modestr;
     int status;
+    int mode;
+    virJSONValue *rates = NULL;
 
     if (!(statusstr = virJSONValueObjectGetString(data, "status"))) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@@ -8782,6 +8816,24 @@ qemuMonitorJSONExtractDirtyRateInfo(virJSONValue *data,
         return -1;
     }
 
+    info->mode = VIR_DOMAIN_DIRTYRATE_CALC_MODE_PAGE_SAMPLING;
+    if ((modestr = virJSONValueObjectGetString(data, "mode"))) {
+        if ((mode = qemuMonitorDirtyRateCalcModeTypeFromString(modestr)) < 0) {
+            virReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("Unknown dirtyrate calculation mode: %s"), modestr);
+            return -1;
+        }
+        info->mode = mode;
+    }
+
+    if ((rates = virJSONValueObjectGetArray(data, "vcpu-dirty-rate"))) {
+        if (qemuMonitorJSONExtractVcpuDirtyRate(rates, info) < 0) {
+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("query-dirty-rate parsing 'vcpu-dirty-rate' in failure"));
+            return -1;
+        }
+    }
+
     return 0;
 }
 
-- 
1.8.3.1

On Thu, Jan 27, 2022 at 15:25:22 +0800, huangy81@chinatelecom.cn wrote:
> From: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
> 
> Add calc_mode for dirtyrate statistics retured by
> virsh domstats --dirtyrate api, also add vcpu dirtyrate
> if dirty-ring mode was used in last measurement.
> 
> Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
> ---
>  src/libvirt-domain.c         |  5 +++++
>  src/qemu/qemu_driver.c       | 14 ++++++++++++
>  src/qemu/qemu_monitor.h      | 10 +++++++++
>  src/qemu/qemu_monitor_json.c | 52 ++++++++++++++++++++++++++++++++++++++++++++
>  4 files changed, 81 insertions(+)
> 
> diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
> index 4caa740..b1b6707 100644
> --- a/src/libvirt-domain.c
> +++ b/src/libvirt-domain.c
> @@ -11941,6 +11941,11 @@ virConnectGetDomainCapabilities(virConnectPtr conn,
>   *     "dirtyrate.megabytes_per_second" - the calculated memory dirty rate in
>   *                                        MiB/s as long long. It is produced
>   *                                        only if the calc_status is measured.
> + *     "dirtyrate.calc_mode" - the calculation mode used last measurement as int,
> + *                             which is one of qemuMonitorDirtyRateCalcMode enum.

'qemuMonitorDirtyRateCalcMode' is an internal qemu-private enum. You
can't use it in the public API as the appropriate constants are not
exported and also we are free to change meanings of internal constants.

> + *     "dirtyrate.vcpu.<num>.megabytes_per_second" - the calculated memory dirty
> + *                                                   rate for a virtual cpu as
> + *                                                   long long.

A signed value doesn't really seem make too much sense to a value which
can't be negative.

>   *
>   * Note that entire stats groups or individual stat fields may be missing from
>   * the output in case they are not supported by the given hypervisor, are not
> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
> index feebfc4..09eda6b 100644
> --- a/src/qemu/qemu_driver.c
> +++ b/src/qemu/qemu_driver.c
> @@ -18537,6 +18537,20 @@ qemuDomainGetStatsDirtyRate(virQEMUDriver *driver,
>                                    "dirtyrate.megabytes_per_second") < 0)
>          return -1;
>  
> +    if (virTypedParamListAddInt(params, info.mode,
> +                                "dirtyrate.calc_mode") < 0)
> +        return -1;
> +
> +    if (info.mode == VIR_DOMAIN_DIRTYRATE_CALC_MODE_DIRTY_RING) {
> +        int i;
> +        for (i = 0; i < info.nvcpus; i++) {
> +            if (virTypedParamListAddLLong(params, info.rates[i].value,
> +                                "dirtyrate.vcpu.%d.megabytes_per_second",
> +                                info.rates[i].index) < 0)

Please align it properly even if it exceeds 80 colums.

> +            return -1;
> +        }
> +    }
> +
>      return 0;
>  }

[...]