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

Timestamp:

Jul 31, 2020 12:45:54 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

139647

Message:

VBoxManage: Added 'cpu-profiles' subcommand to 'list'.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageHelp.cpp (modified) (1 diff)
• VBoxManageList.cpp (modified) (11 diffs)

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

@@ -480 +480 @@
                      "                            groups|webcams|screenshotformats|cloudproviders|\n"
 #if defined(VBOX_WITH_CLOUD_NET)
-                     "                            cloudprofiles|cloudnets\n"
+                     "                            cloudprofiles|cloudnets|cpu-profiles\n"
 #else
-                     "                            cloudprofiles\n"
+                     "                            cloudprofiles|cpu-profiles\n"
 #endif
                      "\n", SEP);

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

@@ -1155 +1155 @@
  * @param   pVirtualBox         Reference to the IVirtualBox pointer.
  */
-static HRESULT listVideoInputDevices(const ComPtr<IVirtualBox> pVirtualBox)
+static HRESULT listVideoInputDevices(const ComPtr<IVirtualBox> &pVirtualBox)
 {
     HRESULT rc;
@@ -1183 +1183 @@
  * @param   pVirtualBox         Reference to the IVirtualBox pointer.
  */
-static HRESULT listScreenShotFormats(const ComPtr<IVirtualBox> pVirtualBox)
+static HRESULT listScreenShotFormats(const ComPtr<IVirtualBox> &pVirtualBox)
 {
     HRESULT rc = S_OK;
@@ -1212 +1212 @@
  * @param   pVirtualBox         Reference to the IVirtualBox pointer.
  */
-static HRESULT listCloudProviders(const ComPtr<IVirtualBox> pVirtualBox)
+static HRESULT listCloudProviders(const ComPtr<IVirtualBox> &pVirtualBox)
 {
     HRESULT rc = S_OK;
@@ -1246 +1246 @@
  * @param   fOptLong            If true, list all profile properties.
  */
-static HRESULT listCloudProfiles(const ComPtr<IVirtualBox> pVirtualBox, bool fOptLong)
+static HRESULT listCloudProfiles(const ComPtr<IVirtualBox> &pVirtualBox, bool fOptLong)
 {
     HRESULT rc = S_OK;
@@ -1295 +1295 @@
 }
 
+static HRESULT displayCPUProfile(ICPUProfile *pProfile, size_t idx, int cchIdx, bool fOptLong, HRESULT hrc)
+{
+    /* Retrieve the attributes needed for both long and short display. */
+    Bstr bstrName;
+    CHECK_ERROR2I_RET(pProfile, COMGETTER(Name)(bstrName.asOutParam()), hrcCheck);
+
+    CPUArchitecture_T enmArchitecture = CPUArchitecture_Any;
+    CHECK_ERROR2I_RET(pProfile, COMGETTER(Architecture)(&enmArchitecture), hrcCheck);
+    const char *pszArchitecture = "???";
+    switch (enmArchitecture)
+    {
+        case CPUArchitecture_x86:       pszArchitecture = "x86"; break;
+        case CPUArchitecture_AMD64:     pszArchitecture = "AMD64"; break;
+
+        case CPUArchitecture_32BitHack:
+        case CPUArchitecture_Any:
+            break;
+    }
+
+    /* Print what we've got. */
+    if (!fOptLong)
+        RTPrintf("#%0*zu: %ls [%s]\n", cchIdx, idx, bstrName.raw(), pszArchitecture);
+    else
+    {
+        RTPrintf("CPU Profile #%02zu:\n", idx);
+        RTPrintf("  Architecture: %s\n", pszArchitecture);
+        RTPrintf("  Name:         %ls\n", bstrName.raw());
+        CHECK_ERROR2I_RET(pProfile, COMGETTER(FullName)(bstrName.asOutParam()), hrcCheck);
+        RTPrintf("  Full Name:    %ls\n", bstrName.raw());
+    }
+    return hrc;
+}
+
+
+/**
+ * List all CPU profiles.
+ *
+ * @returns See produceList.
+ * @param   ptrVirtualBox       Reference to the smart IVirtualBox pointer.
+ * @param   fOptLong            If true, list all profile properties.
+ * @param   fOptSorted          Sort the output if true, otherwise display in
+ *                              system order.
+ */
+static HRESULT listCPUProfiles(const ComPtr<IVirtualBox> &ptrVirtualBox, bool fOptLong, bool fOptSorted)
+{
+    ComPtr<ISystemProperties> ptrSysProps;
+    CHECK_ERROR2I_RET(ptrVirtualBox, COMGETTER(SystemProperties)(ptrSysProps.asOutParam()), hrcCheck);
+    com::SafeIfaceArray<ICPUProfile> aCPUProfiles;
+    CHECK_ERROR2I_RET(ptrSysProps, GetCPUProfiles(CPUArchitecture_Any, Bstr().raw(),
+                                                  ComSafeArrayAsOutParam(aCPUProfiles)), hrcCheck);
+
+    int const cchIdx = 1 + (aCPUProfiles.size() >= 10) + (aCPUProfiles.size() >= 100);
+
+    HRESULT hrc = S_OK;
+    if (!fOptSorted)
+        for (size_t i = 0; i < aCPUProfiles.size(); i++)
+            hrc = displayCPUProfile(aCPUProfiles[i], i, cchIdx, fOptLong, hrc);
+    else
+    {
+        std::vector<std::pair<com::Bstr, ICPUProfile *> > vecSortedProfiles;
+        for (size_t i = 0; i < aCPUProfiles.size(); ++i)
+        {
+            Bstr bstrName;
+            CHECK_ERROR2I_RET(aCPUProfiles[i], COMGETTER(Name)(bstrName.asOutParam()), hrcCheck);
+            try
+            {
+                vecSortedProfiles.push_back(std::pair<com::Bstr, ICPUProfile *>(bstrName, aCPUProfiles[i]));
+            }
+            catch (std::bad_alloc &)
+            {
+                return E_OUTOFMEMORY;
+            }
+        }
+
+        std::sort(vecSortedProfiles.begin(), vecSortedProfiles.end());
+
+        for (size_t i = 0; i < vecSortedProfiles.size(); i++)
+            hrc = displayCPUProfile(vecSortedProfiles[i].second, i, cchIdx, fOptLong, hrc);
+    }
+
+    return hrc;
+}
+
 
 /**
  * The type of lists we can produce.
  */
-enum enmListType
+enum ListType_T
 {
     kListNotSpecified = 1000,
@@ -1332 +1415 @@
     kListCloudProviders,
     kListCloudProfiles,
+    kListCPUProfiles
 };
 
@@ -1343 +1427 @@
  * @param   pVirtualBox         Reference to the IVirtualBox smart pointer.
  */
-static HRESULT produceList(enum enmListType enmCommand, bool fOptLong, bool fOptSorted, const ComPtr<IVirtualBox> &pVirtualBox)
+static HRESULT produceList(enum ListType_T enmCommand, bool fOptLong, bool fOptSorted, const ComPtr<IVirtualBox> &pVirtualBox)
 {
     HRESULT rc = S_OK;
@@ -1684 +1768 @@
             break;
 
+        case kListCPUProfiles:
+            rc = listCPUProfiles(pVirtualBox, fOptLong, fOptSorted);
+            break;
+
         /* No default here, want gcc warnings. */
 
@@ -1702 +1790 @@
     bool                fOptMultiple  = false;
     bool                fOptSorted    = false;
-    enum enmListType    enmOptCommand = kListNotSpecified;
+    enum ListType_T     enmOptCommand = kListNotSpecified;
 
     static const RTGETOPTDEF s_aListOptions[] =
@@ -1741 +1829 @@
         { "cloudproviders",     kListCloudProviders,     RTGETOPT_REQ_NOTHING },
         { "cloudprofiles",      kListCloudProfiles,      RTGETOPT_REQ_NOTHING },
+        { "cpu-profiles",       kListCPUProfiles,        RTGETOPT_REQ_NOTHING },
     };
 
@@ -1797 +1886 @@
             case kListCloudProviders:
             case kListCloudProfiles:
-                enmOptCommand = (enum enmListType)ch;
+            case kListCPUProfiles:
+                enmOptCommand = (enum ListType_T)ch;
                 if (fOptMultiple)
                 {
-                    HRESULT hrc = produceList((enum enmListType)ch, fOptLong, fOptSorted, a->virtualBox);
+                    HRESULT hrc = produceList(enmOptCommand, fOptLong, fOptSorted, a->virtualBox);
                     if (FAILED(hrc))
                         return RTEXITCODE_FAILURE;