virsh: Use virDomainGetJobStats in domjobinfo if available

tools/virsh-domain.c

@@ -4914,64 +4914,189 @@ cmdDomjobinfo(vshControl *ctl, const vshCmd *cmd)
 {
     virDomainJobInfo info;
     virDomainPtr dom;
-    bool ret = true;
+    bool ret = false;
+    const char *unit;
+    double val;
+    virTypedParameterPtr params = NULL;
+    int nparams = 0;
+    unsigned long long value;
+    int rc;
 
     if (!(dom = vshCommandOptDomain(ctl, cmd, NULL)))
         return false;
 
-    if (virDomainGetJobInfo(dom, &info) == 0) {
+    memset(&info, 0, sizeof(info));
-        const char *unit;
-        double val;
 
-        vshPrint(ctl, "%-17s ", _("Job type:"));
+    rc = virDomainGetJobStats(dom, &info.type, &params, &nparams, 0);
-        switch (info.type) {
+    if (rc == 0) {
-        case VIR_DOMAIN_JOB_BOUNDED:
+        if (virTypedParamsGetULLong(params, nparams,
-            vshPrint(ctl, "%-12s\n", _("Bounded"));
+                                    VIR_DOMAIN_JOB_TIME_ELAPSED,
-            break;
+                                    &info.timeElapsed) < 0 ||
-
+            virTypedParamsGetULLong(params, nparams,
-        case VIR_DOMAIN_JOB_UNBOUNDED:
+                                    VIR_DOMAIN_JOB_TIME_REMAINING,
-            vshPrint(ctl, "%-12s\n", _("Unbounded"));
+                                    &info.timeRemaining) < 0 ||
-            break;
+            virTypedParamsGetULLong(params, nparams,
-
+                                    VIR_DOMAIN_JOB_DATA_TOTAL,
-        case VIR_DOMAIN_JOB_NONE:
+                                    &info.dataTotal) < 0 ||
-        default:
+            virTypedParamsGetULLong(params, nparams,
-            vshPrint(ctl, "%-12s\n", _("None"));
+                                    VIR_DOMAIN_JOB_DATA_PROCESSED,
-            goto cleanup;
+                                    &info.dataProcessed) < 0 ||
-        }
+            virTypedParamsGetULLong(params, nparams,
-
+                                    VIR_DOMAIN_JOB_DATA_REMAINING,
-        vshPrint(ctl, "%-17s %-12llu ms\n", _("Time elapsed:"), info.timeElapsed);
+                                    &info.dataRemaining) < 0 ||
-        if (info.type == VIR_DOMAIN_JOB_BOUNDED)
+            virTypedParamsGetULLong(params, nparams,
-            vshPrint(ctl, "%-17s %-12llu ms\n", _("Time remaining:"), info.timeRemaining);
+                                    VIR_DOMAIN_JOB_MEMORY_TOTAL,
-        if (info.dataTotal || info.dataRemaining || info.dataProcessed) {
+                                    &info.memTotal) < 0 ||
-            val = vshPrettyCapacity(info.dataProcessed, &unit);
+            virTypedParamsGetULLong(params, nparams,
-            vshPrint(ctl, "%-17s %-.3lf %s\n", _("Data processed:"), val, unit);
+                                    VIR_DOMAIN_JOB_MEMORY_PROCESSED,
-            val = vshPrettyCapacity(info.dataRemaining, &unit);
+                                    &info.memProcessed) < 0 ||
-            vshPrint(ctl, "%-17s %-.3lf %s\n", _("Data remaining:"), val, unit);
+            virTypedParamsGetULLong(params, nparams,
-            val = vshPrettyCapacity(info.dataTotal, &unit);
+                                    VIR_DOMAIN_JOB_MEMORY_REMAINING,
-            vshPrint(ctl, "%-17s %-.3lf %s\n", _("Data total:"), val, unit);
+                                    &info.memRemaining) < 0 ||
-        }
+            virTypedParamsGetULLong(params, nparams,
-        if (info.memTotal || info.memRemaining || info.memProcessed) {
+                                    VIR_DOMAIN_JOB_DISK_TOTAL,
-            val = vshPrettyCapacity(info.memProcessed, &unit);
+                                    &info.fileTotal) < 0 ||
-            vshPrint(ctl, "%-17s %-.3lf %s\n", _("Memory processed:"), val, unit);
+            virTypedParamsGetULLong(params, nparams,
-            val = vshPrettyCapacity(info.memRemaining, &unit);
+                                    VIR_DOMAIN_JOB_DISK_PROCESSED,
-            vshPrint(ctl, "%-17s %-.3lf %s\n", _("Memory remaining:"), val, unit);
+                                    &info.fileProcessed) < 0 ||
-            val = vshPrettyCapacity(info.memTotal, &unit);
+            virTypedParamsGetULLong(params, nparams,
-            vshPrint(ctl, "%-17s %-.3lf %s\n", _("Memory total:"), val, unit);
+                                    VIR_DOMAIN_JOB_DISK_REMAINING,
-        }
+                                    &info.fileRemaining) < 0)
-        if (info.fileTotal || info.fileRemaining || info.fileProcessed) {
+            goto save_error;
-            val = vshPrettyCapacity(info.fileProcessed, &unit);
+    } else if (last_error->code == VIR_ERR_NO_SUPPORT) {
-            vshPrint(ctl, "%-17s %-.3lf %s\n", _("File processed:"), val, unit);
+        vshDebug(ctl, VSH_ERR_DEBUG, "detailed statistics not supported\n");
-            val = vshPrettyCapacity(info.fileRemaining, &unit);
+        vshResetLibvirtError();
-            vshPrint(ctl, "%-17s %-.3lf %s\n", _("File remaining:"), val, unit);
+        rc = virDomainGetJobInfo(dom, &info);
-            val = vshPrettyCapacity(info.fileTotal, &unit);
-            vshPrint(ctl, "%-17s %-.3lf %s\n", _("File total:"), val, unit);
-        }
-    } else {
-        ret = false;
     }
+    if (rc < 0)
+        goto cleanup;
+
+    vshPrint(ctl, "%-17s ", _("Job type:"));
+    switch (info.type) {
+    case VIR_DOMAIN_JOB_BOUNDED:
+        vshPrint(ctl, "%-12s\n", _("Bounded"));
+        break;
+
+    case VIR_DOMAIN_JOB_UNBOUNDED:
+        vshPrint(ctl, "%-12s\n", _("Unbounded"));
+        break;
+
+    case VIR_DOMAIN_JOB_NONE:
+    default:
+        vshPrint(ctl, "%-12s\n", _("None"));
+        goto cleanup;
+    }
+
+    vshPrint(ctl, "%-17s %-12llu ms\n", _("Time elapsed:"), info.timeElapsed);
+    if (info.type == VIR_DOMAIN_JOB_BOUNDED)
+        vshPrint(ctl, "%-17s %-12llu ms\n", _("Time remaining:"), info.timeRemaining);
+
+    if (info.dataTotal || info.dataRemaining || info.dataProcessed) {
+        val = vshPrettyCapacity(info.dataProcessed, &unit);
+        vshPrint(ctl, "%-17s %-.3lf %s\n", _("Data processed:"), val, unit);
+        val = vshPrettyCapacity(info.dataRemaining, &unit);
+        vshPrint(ctl, "%-17s %-.3lf %s\n", _("Data remaining:"), val, unit);
+        val = vshPrettyCapacity(info.dataTotal, &unit);
+        vshPrint(ctl, "%-17s %-.3lf %s\n", _("Data total:"), val, unit);
+    }
+
+    if (info.memTotal || info.memRemaining || info.memProcessed) {
+        val = vshPrettyCapacity(info.memProcessed, &unit);
+        vshPrint(ctl, "%-17s %-.3lf %s\n", _("Memory processed:"), val, unit);
+        val = vshPrettyCapacity(info.memRemaining, &unit);
+        vshPrint(ctl, "%-17s %-.3lf %s\n", _("Memory remaining:"), val, unit);
+        val = vshPrettyCapacity(info.memTotal, &unit);
+        vshPrint(ctl, "%-17s %-.3lf %s\n", _("Memory total:"), val, unit);
+    }
+
+    if (info.fileTotal || info.fileRemaining || info.fileProcessed) {
+        val = vshPrettyCapacity(info.fileProcessed, &unit);
+        vshPrint(ctl, "%-17s %-.3lf %s\n", _("File processed:"), val, unit);
+        val = vshPrettyCapacity(info.fileRemaining, &unit);
+        vshPrint(ctl, "%-17s %-.3lf %s\n", _("File remaining:"), val, unit);
+        val = vshPrettyCapacity(info.fileTotal, &unit);
+        vshPrint(ctl, "%-17s %-.3lf %s\n", _("File total:"), val, unit);
+    }
+
+    if ((rc = virTypedParamsGetULLong(params, nparams,
+                                      VIR_DOMAIN_JOB_MEMORY_CONSTANT,
+                                      &value)) < 0) {
+        goto save_error;
+    } else if (rc) {
+        vshPrint(ctl, "%-17s %-12llu\n", _("Constant pages:"), value);
+    }
+    if ((rc = virTypedParamsGetULLong(params, nparams,
+                                      VIR_DOMAIN_JOB_MEMORY_NORMAL,
+                                      &value)) < 0) {
+        goto save_error;
+    } else if (rc) {
+        vshPrint(ctl, "%-17s %-12llu\n", _("Normal pages:"), value);
+    }
+    if ((rc = virTypedParamsGetULLong(params, nparams,
+                                      VIR_DOMAIN_JOB_MEMORY_NORMAL_BYTES,
+                                      &value)) < 0) {
+        goto save_error;
+    } else if (rc) {
+        val = vshPrettyCapacity(value, &unit);
+        vshPrint(ctl, "%-17s %-.3lf %s\n", _("Normal data:"), val, unit);
+    }
+
+    if ((rc = virTypedParamsGetULLong(params, nparams,
+                                      VIR_DOMAIN_JOB_DOWNTIME,
+                                      &value)) < 0) {
+        goto save_error;
+    } else if (rc) {
+        vshPrint(ctl, "%-17s %-12llu ms\n", _("Expected downtime:"), value);
+    }
+
+    if ((rc = virTypedParamsGetULLong(params, nparams,
+                                      VIR_DOMAIN_JOB_COMPRESSION_CACHE,
+                                      &value)) < 0) {
+        goto save_error;
+    } else if (rc) {
+        val = vshPrettyCapacity(value, &unit);
+        vshPrint(ctl, "%-17s %-.3lf %s\n", _("Compression cache:"), val, unit);
+    }
+    if ((rc = virTypedParamsGetULLong(params, nparams,
+                                      VIR_DOMAIN_JOB_COMPRESSION_BYTES,
+                                      &value)) < 0) {
+        goto save_error;
+    } else if (rc) {
+        val = vshPrettyCapacity(value, &unit);
+        vshPrint(ctl, "%-17s %-.3lf %s\n", _("Compressed data:"), val, unit);
+    }
+    if ((rc = virTypedParamsGetULLong(params, nparams,
+                                      VIR_DOMAIN_JOB_COMPRESSION_PAGES,
+                                      &value)) < 0) {
+        goto save_error;
+    } else if (rc) {
+        vshPrint(ctl, "%-17s %-13llu\n", _("Compressed pages:"), value);
+    }
+    if ((rc = virTypedParamsGetULLong(params, nparams,
+                                      VIR_DOMAIN_JOB_COMPRESSION_CACHE_MISSES,
+                                      &value)) < 0) {
+        goto save_error;
+    } else if (rc) {
+        vshPrint(ctl, "%-17s %-13llu\n", _("Compression cache misses:"), value);
+    }
+    if ((rc = virTypedParamsGetULLong(params, nparams,
+                                      VIR_DOMAIN_JOB_COMPRESSION_OVERFLOW,
+                                      &value)) < 0) {
+        goto save_error;
+    } else if (rc) {
+        vshPrint(ctl, "%-17s %-13llu\n", _("Compression overflows:"), value);
+    }
+
+    ret = true;
+
 cleanup:
     virDomainFree(dom);
+    virTypedParamsFree(params, nparams);
     return ret;
+
+save_error:
+    vshSaveLibvirtError();
+    goto cleanup;
 }
 
 /*