Changeset 83380 in vbox

Timestamp:

Mar 24, 2020 2:10:43 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9686. Moving RAM usage query function to a common code area for possible reuse.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/monitor

Files:

• UIMonitorCommon.cpp (modified) (2 diffs)
• UIMonitorCommon.h (modified) (1 diff)
• performance/UIPerformanceMonitor.cpp (modified) (1 diff)
• resource/UIResourceMonitor.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/monitor/UIMonitorCommon.cpp

@@ -26 +26 @@
 /* COM includes: */
 #include "CMachineDebugger.h"
+#include "CPerformanceCollector.h"
 
 /* static */
@@ -106 +107 @@
     return xmlData;
 }
+
+/* static */
+void UIMonitorCommon::getRAMLoad(CPerformanceCollector &comPerformanceCollector, QVector<QString> &nameList,
+                                 QVector<CUnknown>& objectList, quint64 &iOutTotalRAM, quint64 &iOutFreeRAM)
+{
+    iOutTotalRAM = 0;
+    iOutFreeRAM = 0;
+    QVector<QString>  aReturnNames;
+    QVector<CUnknown>  aReturnObjects;
+    QVector<QString>  aReturnUnits;
+    QVector<ULONG>  aReturnScales;
+    QVector<ULONG>  aReturnSequenceNumbers;
+    QVector<ULONG>  aReturnDataIndices;
+    QVector<ULONG>  aReturnDataLengths;
+    /* Make a query to CPerformanceCollector to fetch some metrics (e.g RAM usage): */
+    QVector<LONG> returnData = comPerformanceCollector.QueryMetricsData(nameList,
+                                                                        objectList,
+                                                                        aReturnNames,
+                                                                        aReturnObjects,
+                                                                        aReturnUnits,
+                                                                        aReturnScales,
+                                                                        aReturnSequenceNumbers,
+                                                                        aReturnDataIndices,
+                                                                        aReturnDataLengths);
+    /* Parse the result we get from CPerformanceCollector to get respective values: */
+    for (int i = 0; i < aReturnNames.size(); ++i)
+    {
+        if (aReturnDataLengths[i] == 0)
+            continue;
+        /* Read the last of the return data disregarding the rest since we are caching the data in GUI side: */
+        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))
+                iOutTotalRAM = (quint64)fData;
+            if (aReturnNames[i].contains("Free", Qt::CaseInsensitive))
+                iOutFreeRAM = (quint64)fData;
+        }
+    }
+}

trunk/src/VBox/Frontends/VirtualBox/src/monitor/UIMonitorCommon.h

@@ -46 +46 @@
         static void getVMMExitCount(CMachineDebugger &debugger, quint64 &uOutVMMExitCount);
     /** @} */
+        static void getRAMLoad(CPerformanceCollector &comPerformanceCollector, QVector<QString> &nameList,
+                               QVector<CUnknown>& objectList, quint64 &iOutTotalRAM, quint64 &iOutFreeRAM);
 
 private:

trunk/src/VBox/Frontends/VirtualBox/src/monitor/performance/UIPerformanceMonitor.cpp

@@ -948 +948 @@
         return;
     ++m_iTimeStep;
-    QVector<QString> allNames;// = new ArrayList<IUnknown>();
-    QVector<CUnknown> allObjects;// = new ArrayList<IUnknown>();
-    QVector<QString>  aReturnNames;
-    QVector<CUnknown>  aReturnObjects;
-    QVector<QString>  aReturnUnits;
-    QVector<ULONG>  aReturnScales;
-    QVector<ULONG>  aReturnSequenceNumbers;
-    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,
-                                                                     aReturnNames,
-                                                                     aReturnObjects,
-                                                                     aReturnUnits,
-                                                                     aReturnScales,
-                                                                     aReturnSequenceNumbers,
-                                                                     aReturnDataIndices,
-                                                                     aReturnDataLengths);
-    quint64 iTotalRAM = 0;
-    quint64 iFreeRAM = 0;
-    /* Parse the result we get from CPerformanceCollector to get respective values: */
-    for (int i = 0; i < aReturnNames.size(); ++i)
-    {
-        if (aReturnDataLengths[i] == 0)
-            continue;
-        /* Read the last of the return data disregarding the rest since we are caching the data in GUI side: */
-        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))
-                iTotalRAM = (quint64)fData;
-            if (aReturnNames[i].contains("Free", Qt::CaseInsensitive))
-                iFreeRAM = (quint64)fData;
-        }
-    }
-    if (m_metrics.contains(m_strRAMMetricName))
-        updateRAMGraphsAndMetric(iTotalRAM, iFreeRAM);
+
+   if (m_metrics.contains(m_strRAMMetricName))
+   {
+       quint64 iTotalRAM = 0;
+       quint64 iFreeRAM = 0;
+       UIMonitorCommon::getRAMLoad(m_performanceMonitor, m_nameList, m_objectList, iTotalRAM, iFreeRAM);
+       updateRAMGraphsAndMetric(iTotalRAM, iFreeRAM);
+   }
 
     /* Update the CPU load chart with values we get from IMachineDebugger::getCPULoad(..): */

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

@@ -302 +302 @@
 {
     Q_UNUSED(parent);
-    // int iCount = 0;
-    // for (int i = 0; i < m_columnShown.size(); ++i)
-    //     if (m_columnShown[i])
-    //         ++iCount;
-    // printf("column count %d\n", iCount);
-    // return iCount;
     return VMResouceMonitorColumn_Max;
 }
@@ -485 +479 @@
     if (m_pModel)
         m_pModel->setColumnCaptions(m_columnCaptions);
-
 }
 
@@ -593 +586 @@
         return;
     QMenu menu;
-
     for (int i = 0; i < VMResouceMonitorColumn_Max; ++i)
     {
@@ -603 +595 @@
         if (i < m_columnShown.size())
             pAction->setChecked(m_columnShown[i]);
+        if (i == (int)VMResouceMonitorColumn_Name)
+            pAction->setEnabled(false);
         connect(pAction, &QAction::triggered, this, &UIResourceMonitorWidget::sltHandleColumnAction);
     }
@@ -693 +687 @@
 void UIResourceMonitor::finalize()
 {
-    /* Apply language settings: */
     retranslateUi();
 }