Changeset 40470 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Mar 15, 2012 6:18:49 AM (13 years ago)

Author:

vboxsync

Message:

VBoxManage: use common code in bandwidthctl and showvminfo to list groups, fixed machine readable list (#5582)

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManage.h (modified) (1 diff)
• VBoxManageBandwidthControl.cpp (modified) (3 diffs)
• VBoxManageInfo.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h

@@ -201 +201 @@
                    ComPtr <IConsole> console = ComPtr<IConsole>());
 const char *machineStateToName(MachineState_T machineState, bool fShort);
+HRESULT showBandwidthGroups(ComPtr<IBandwidthControl> &bwCtrl,
+                            VMINFO_DETAILS details);
 
 /* VBoxManageList.cpp */

trunk/src/VBox/Frontends/VBoxManage/VBoxManageBandwidthControl.cpp

@@ -187 +187 @@
 
 /**
- * Converts bandwidth group type to a string.
- * @returns String representation.
- * @param   enmType         Bandwidth control group type.
- */
-inline const char * typeToString(BandwidthGroupType_T enmType)
-{
-    switch (enmType)
-    {
-        case BandwidthGroupType_Disk:    return "Disk";
-        case BandwidthGroupType_Network: return "Network";
-    }
-    return "unknown";
-}
-
-/**
  * Handles the 'bandwidthctl myvm list' sub-command.
  * @returns Exit code.
@@ -230 +215 @@
 
     /* See showVMInfo. */
+    if (FAILED(showBandwidthGroups(rptrBWControl, enmDetails)))
+        return RTEXITCODE_FAILURE;
+#if 0
     com::SafeIfaceArray<IBandwidthGroup> bwGroups;
     CHECK_ERROR2_RET(rptrBWControl, GetAllBandwidthGroups(ComSafeArrayAsOutParam(bwGroups)), RTEXITCODE_FAILURE);
@@ -249 +237 @@
                  cMaxMbPerSec);
     }
+#endif
 
     return RTEXITCODE_SUCCESS;

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -230 +230 @@
         RTPrintf("\"\n");
     }
+}
+
+/**
+ * Converts bandwidth group type to a string.
+ * @returns String representation.
+ * @param   enmType         Bandwidth control group type.
+ */
+inline const char * bwGroupTypeToString(BandwidthGroupType_T enmType)
+{
+    switch (enmType)
+    {
+        case BandwidthGroupType_Disk:    return "Disk";
+        case BandwidthGroupType_Network: return "Network";
+    }
+    return "unknown";
+}
+
+HRESULT showBandwidthGroups(ComPtr<IBandwidthControl> &bwCtrl,
+                            VMINFO_DETAILS details)
+{
+    int rc = S_OK;
+    SafeIfaceArray<IBandwidthGroup> bwGroups;
+
+    CHECK_ERROR_RET(bwCtrl, GetAllBandwidthGroups(ComSafeArrayAsOutParam(bwGroups)), rc);
+
+    for (size_t i = 0; i < bwGroups.size(); i++)
+    {
+        Bstr strName;
+        ULONG cMaxMbPerSec;
+        BandwidthGroupType_T enmType;
+
+        CHECK_ERROR_RET(bwGroups[i], COMGETTER(Name)(strName.asOutParam()), rc);
+        CHECK_ERROR_RET(bwGroups[i], COMGETTER(Type)(&enmType), rc);
+        CHECK_ERROR_RET(bwGroups[i], COMGETTER(MaxMbPerSec)(&cMaxMbPerSec), rc);
+
+        const char *pszType = bwGroupTypeToString(enmType);
+        if (details == VMINFO_MACHINEREADABLE)
+            RTPrintf("BandwidthGroup%zu=%ls,%s,%d\n", i, strName.raw(), pszType, cMaxMbPerSec);
+        else
+            RTPrintf("Name: '%ls', Type: %s, Limit: %d Mbytes/sec\n", strName.raw(), pszType, cMaxMbPerSec);
+    }
+    if (details != VMINFO_MACHINEREADABLE && bwGroups.size() != 0)
+        RTPrintf("\n");
+
+    return rc;
 }
 
@@ -1837 +1882 @@
     {
         ComPtr<IBandwidthControl> bwCtrl;
-        SafeIfaceArray<IBandwidthGroup> bwGroups;
-
         CHECK_ERROR_RET(machine, COMGETTER(BandwidthControl)(bwCtrl.asOutParam()), rc);
 
-        CHECK_ERROR_RET(bwCtrl, GetAllBandwidthGroups(ComSafeArrayAsOutParam(bwGroups)), rc);
-
-        for (size_t i = 0; i < bwGroups.size(); i++)
-        {
-            Bstr strName;
-            ULONG cMaxMbPerSec;
-            BandwidthGroupType_T enmType;
-
-            CHECK_ERROR_RET(bwGroups[i], COMGETTER(Name)(strName.asOutParam()), rc);
-            CHECK_ERROR_RET(bwGroups[i], COMGETTER(Type)(&enmType), rc);
-            CHECK_ERROR_RET(bwGroups[i], COMGETTER(MaxMbPerSec)(&cMaxMbPerSec), rc);
-
-            const char *pszType = "unknown";
-            switch (enmType)
-            {
-                case BandwidthGroupType_Disk:    pszType = "disk";    break;
-                case BandwidthGroupType_Network: pszType = "network"; break;
-            }
-            if (details == VMINFO_MACHINEREADABLE)
-                RTPrintf("BandwidthGroup%zu=%ls,%s,%d\n", strName.raw(), pszType, cMaxMbPerSec);
-            else
-                RTPrintf("Name: '%ls', Type: %s, Limit: %d Mbytes/sec\n", strName.raw(), pszType, cMaxMbPerSec);
-        }
-        if (details != VMINFO_MACHINEREADABLE && bwGroups.size() != 0)
-            RTPrintf("\n");
+        rc = showBandwidthGroups(bwCtrl, details);
     }