Changeset 83493 in vbox for trunk/src

Timestamp:

Mar 31, 2020 9:04:49 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9686. Collecting some host stats.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/monitor/resource/UIResourceMonitor.cpp (modified) (11 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/monitor/resource/UIResourceMonitor.cpp

@@ -134 +134 @@
 
 /*********************************************************************************************************************************
+*   Class UIVMResouceMonitorHostStats definition.                                                                           *
+*********************************************************************************************************************************/
+
+class UIVMResouceMonitorHostStats
+{
+
+public:
+
+    UIVMResouceMonitorHostStats();
+    quint64 m_fCPUUserLoad;
+    quint64 m_fCPUKernelLoad;
+    quint64 m_iTotalRAM;
+    quint64 m_iFreeRAM;
+};
+
+/*********************************************************************************************************************************
 *   Class UIVMResouceMonitorCheckBox definition.                                                                           *
 *********************************************************************************************************************************/
+
 class UIVMResouceMonitorCheckBox : public QCheckBox
 {
@@ -209 +226 @@
     void initializeItems();
     void setupPerformanceCollector();
-    void queryRAMLoad();
+    void queryPerformanceCollector();
     void addItem(const QUuid& uMachineId, const QString& strMachineName);
     void removeItem(const QUuid& uMachineId);
+    void getHostRAMStats();
 
     QVector<UIResourceMonitorItem> m_itemList;
@@ -228 +246 @@
       *  when the widget is visible in the main UI. */
     bool m_fShouldUpdate;
+    UIVMResouceMonitorHostStats m_hostStats;
 };
 
@@ -396 +415 @@
 
 /*********************************************************************************************************************************
+*   Class UIVMResouceMonitorHostStats implementation.                                                                            *
+*********************************************************************************************************************************/
+
+UIVMResouceMonitorHostStats::UIVMResouceMonitorHostStats()
+    : m_fCPUUserLoad(0)
+    , m_fCPUKernelLoad(0)
+    , m_iTotalRAM(0)
+    , m_iFreeRAM(0)
+{
+}
+
+
+/*********************************************************************************************************************************
 *   Class UIVMResouceMonitorCheckBox implementation.                                                                             *
 *********************************************************************************************************************************/
@@ -595 +627 @@
 }
 
+void UIResourceMonitorModel::getHostRAMStats()
+{
+    CHost comHost = uiCommon().host();
+    m_hostStats.m_iTotalRAM = _1M * (quint64)comHost.GetMemorySize();
+    m_hostStats.m_iFreeRAM = _1M * (quint64)comHost.GetMemoryAvailable();
+}
+
 void UIResourceMonitorModel::sltTimeout()
 {
@@ -603 +642 @@
     ULONG aPctVMM;
 
-    bool fRAMColumns = columnVisible(VMResouceMonitorColumn_RAMUsedAndTotal)
-        || columnVisible(VMResouceMonitorColumn_RAMUsedPercentage);
+    // bool fRAMColumns = columnVisible(VMResouceMonitorColumn_RAMUsedAndTotal)
+    //     || columnVisible(VMResouceMonitorColumn_RAMUsedPercentage);
     bool fCPUColumns = columnVisible(VMResouceMonitorColumn_CPUVMMLoad) || columnVisible(VMResouceMonitorColumn_CPUGuestLoad);
     bool fNetworkColumns = columnVisible(VMResouceMonitorColumn_NetworkUpRate)
@@ -616 +655 @@
     bool fVMExitColumn = columnVisible(VMResouceMonitorColumn_VMExits);
 
-    /* RAM usage: */
-    if (!m_performanceMonitor.isNull() && fRAMColumns)
-        queryRAMLoad();
+    getHostRAMStats();
+
+    /* RAM usage and Host CPU: */
+    //if (!m_performanceMonitor.isNull() && fRAMColumns)
+    queryPerformanceCollector();
 
     for (int i = 0; i < m_itemList.size(); ++i)
@@ -677 +718 @@
     for (int i = 0; i < m_itemList.size(); ++i)
         m_nameList << "Guest/RAM/Usage*";
+    /* This is for the host: */
+    m_nameList << "CPU/Load/User:avg";
+    m_nameList << "CPU/Load/Kernel:avg";
     m_objectList = QVector<CUnknown>(m_nameList.size(), CUnknown());
     m_performanceMonitor.SetupMetrics(m_nameList, m_objectList, iPeriod, iMetricSetupCount);
 }
 
-void UIResourceMonitorModel::queryRAMLoad()
+void UIResourceMonitorModel::queryPerformanceCollector()
 {
     QVector<QString>  aReturnNames;
@@ -690 +734 @@
     QVector<ULONG>  aReturnDataIndices;
     QVector<ULONG>  aReturnDataLengths;
-    /* Make a query to CPerformanceCollector to fetch some metrics (e.g RAM usage): */
+
     QVector<LONG> returnData = m_performanceMonitor.QueryMetricsData(m_nameList,
                                                                         m_objectList,
@@ -708 +752 @@
         float fData = returnData[aReturnDataIndices[i] + aReturnDataLengths[i] - 1] / (float)aReturnScales[i];
         if (aReturnNames[i].contains("RAM", Qt::CaseInsensitive) && !aReturnNames[i].contains(":"))
+        {
             if (aReturnNames[i].contains("Total", Qt::CaseInsensitive) || aReturnNames[i].contains("Free", Qt::CaseInsensitive))
             {
@@ -723 +768 @@
                 }
             }
+        }
+        else if (aReturnNames[i].contains("CPU/Load/User", Qt::CaseInsensitive))
+        {
+            CHost comHost = (CHost)aReturnObjects[i];
+            if (!comHost.isNull())
+                m_hostStats.m_fCPUUserLoad = fData;
+        }
+        else if (aReturnNames[i].contains("CPU/Load/Kernel", Qt::CaseInsensitive))
+        {
+            CHost comHost = (CHost)aReturnObjects[i];
+            if (!comHost.isNull())
+                m_hostStats.m_fCPUKernelLoad = fData;
+        }
     }
     for (int i = 0; i < m_itemList.size(); ++i)