Changeset 83392 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Mar 24, 2020 4:59:50 PM (5 years ago)

Author:

vboxsync

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

136609

Message:

FE/Qt: bugref:9686. Getting RAM usage.

File:

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

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

@@ -47 +47 @@
 #include "CMachine.h"
 #include "CMachineDebugger.h"
+#include "CPerformanceMetric.h"
 
 /* Other VBox includes: */
@@ -88 +89 @@
     QUuid    m_VMuid;
     QString  m_strVMName;
-    quint64 m_uCPUGuestLoad;
-    quint64 m_uCPUVMMLoad;
+    quint64  m_uCPUGuestLoad;
+    quint64  m_uCPUVMMLoad;
+
+    quint64  m_uTotalRAM;
+    quint64  m_uUsedRAM;
+    float    m_fRAMUsagePercentage;
+
     quint64 m_uNetworkDownRate;
     quint64 m_uNetworkUpRate;
@@ -104 +110 @@
 
     CMachineDebugger m_comDebugger;
+    /** @name The following are used during UIPerformanceCollector::QueryMetricsData(..)
+      * @{ */
+        QVector<QString> m_nameList;
+        QVector<CUnknown> m_objectList;
+    /** @} */
+    CPerformanceCollector m_performanceMonitor;
+
+private:
+
+    void initPerformanceCollector();
 
 };
+
 
 /*********************************************************************************************************************************
@@ -165 +182 @@
 
     QTimer *m_pTimer;
+
 };
 
@@ -188 +206 @@
     : m_VMuid(uid)
     , m_strVMName(strVMName)
+    , m_uCPUGuestLoad(0)
+    , m_uCPUVMMLoad(0)
+    , m_uTotalRAM(0)
+    , m_uUsedRAM(0)
+    , m_fRAMUsagePercentage(0)
     , m_uNetworkDownRate(0)
     , m_uNetworkUpRate(0)
@@ -206 +229 @@
             m_comDebugger = comConsole.GetDebugger();
     }
+    initPerformanceCollector();
 }
 
 UIResourceMonitorItem::UIResourceMonitorItem()
     : m_VMuid(QUuid())
+    , m_uCPUGuestLoad(0)
+    , m_uCPUVMMLoad(0)
+    , m_uTotalRAM(0)
+    , m_uUsedRAM(0)
+    , m_fRAMUsagePercentage(0)
     , m_uNetworkDownRate(0)
     , m_uNetworkUpRate(0)
@@ -221 +250 @@
     , m_uVMExitTotal(0)
 {
+    initPerformanceCollector();
 }
 
 UIResourceMonitorItem::UIResourceMonitorItem(const QUuid &uid)
     : m_VMuid(uid)
+    , m_uCPUGuestLoad(0)
+    , m_uCPUVMMLoad(0)
+    , m_uTotalRAM(0)
+    , m_uUsedRAM(0)
+    , m_fRAMUsagePercentage(0)
     , m_uNetworkDownRate(0)
     , m_uNetworkUpRate(0)
@@ -236 +271 @@
     , m_uVMExitTotal(0)
 {
+    initPerformanceCollector();
 }
 
@@ -245 +281 @@
 }
 
+void UIResourceMonitorItem::initPerformanceCollector()
+{
+    /* Initialize and configure CPerformanceCollector: */
+    const ULONG iPeriod = 1;
+    const int iMetricSetupCount = 1;
+    m_performanceMonitor = uiCommon().virtualBox().GetPerformanceCollector();
+    m_nameList << "Guest/RAM/Usage*";
+    m_objectList = QVector<CUnknown>(m_nameList.size(), CUnknown());
+    m_performanceMonitor.SetupMetrics(m_nameList, m_objectList, iPeriod, iMetricSetupCount);
+}
 
 /*********************************************************************************************************************************
@@ -310 +356 @@
     if (!index.isValid() || role != Qt::DisplayRole || index.row() >= rowCount())
         return QVariant();
-    // if (index.column() >= m_columnShown.size() || !m_columnShown[index.column()])
-    //     return QVariant();
+
     switch (index.column())
     {
@@ -322 +367 @@
         case VMResouceMonitorColumn_CPUVMMLoad:
             return m_itemList[index.row()].m_uCPUVMMLoad;
+            break;
+        case VMResouceMonitorColumn_RAMUsedAndTotal:
+            return QString("%1/%2").arg(uiCommon().formatSize(_1K * m_itemList[index.row()].m_uUsedRAM, iDecimalCount)).
+                arg(uiCommon().formatSize(_1K * m_itemList[index.row()].m_uTotalRAM, iDecimalCount));
+            break;
+        case VMResouceMonitorColumn_RAMUsedPercentage:
+            return m_itemList[index.row()].m_fRAMUsagePercentage;
             break;
         case VMResouceMonitorColumn_NetworkUpRate:
@@ -407 +459 @@
     for (int i = 0; i < m_itemList.size(); ++i)
     {
+        if (!m_itemList[i].m_performanceMonitor.isNull())
+        {
+            /* RAM usage: */
+            quint64 uFreeRAM = 0;
+            UIMonitorCommon::getRAMLoad(m_itemList[i].m_performanceMonitor, m_itemList[i].m_nameList, m_itemList[i].m_objectList,
+                                        m_itemList[i].m_uTotalRAM, uFreeRAM);
+            m_itemList[i].m_uUsedRAM = m_itemList[i].m_uTotalRAM - uFreeRAM;
+            if (m_itemList[i].m_uTotalRAM != 0)
+                m_itemList[i].m_fRAMUsagePercentage = 100.f * (m_itemList[i].m_uUsedRAM / (float)m_itemList[i].m_uTotalRAM);
+        }
+
         if (!m_itemList[i].m_comDebugger.isNull())
         {
+            /* CPU Load: */
             m_itemList[i].m_comDebugger.GetCPULoad(0x7fffffff, aPctExecuting, aPctHalted, aPctVMM);
             m_itemList[i].m_uCPUGuestLoad = aPctExecuting;
             m_itemList[i].m_uCPUVMMLoad = aPctVMM;
+
             /* Network rate: */
             quint64 uPrevDownTotal = m_itemList[i].m_uNetworkDownTotal;