Changeset 83424 in vbox

Timestamp:

Mar 25, 2020 6:13:24 PM (5 years ago)

Author:

vboxsync

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

136643

Message:

FE/Qt: bugref:9686. Updating RAM column.

File:

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

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

@@ -93 +93 @@
 
     quint64  m_uTotalRAM;
+    quint64  m_uFreeRAM;
     quint64  m_uUsedRAM;
     float    m_fRAMUsagePercentage;
@@ -110 +111 @@
 
     CMachineDebugger m_comDebugger;
+
+private:
+
+    void setupPerformanceCollector();
+
+};
+
+
+/*********************************************************************************************************************************
+*   Class UIVMResouceMonitorProxyModel definition.                                                                           *
+*********************************************************************************************************************************/
+class UIResourceMonitorProxyModel : public QSortFilterProxyModel
+{
+
+    Q_OBJECT;
+
+public:
+
+    UIResourceMonitorProxyModel(QObject *parent = 0);
+    void dataUpdate();
+    void setColumnShown(const QVector<bool>& columnShown);
+
+protected:
+
+    //virtual bool lessThan(const QModelIndex &left, const QModelIndex &right) const /* override */;
+    virtual bool filterAcceptsColumn(int source_column, const QModelIndex &source_parent) const /* override */;
+
+private:
+
+    QVector<bool> m_columnShown;
+
+};
+
+
+/*********************************************************************************************************************************
+*   Class UIResourceMonitorModel definition.                                                                                     *
+*********************************************************************************************************************************/
+class UIResourceMonitorModel : public QAbstractTableModel
+{
+    Q_OBJECT;
+
+signals:
+
+    void sigDataUpdate();
+
+public:
+
+    UIResourceMonitorModel(QObject *parent = 0);
+    int      rowCount(const QModelIndex &parent = QModelIndex()) const /* override */;
+    int      columnCount(const QModelIndex &parent = QModelIndex()) const /* override */;
+    QVariant data(const QModelIndex &index, int role) const /* override */;
+    QVariant headerData(int section, Qt::Orientation orientation, int role) const;
+    void setColumnCaptions(const QVector<QString>& captions);
+
+private slots:
+
+    void sltMachineStateChanged(const QUuid &uId, const KMachineState state);
+    void sltTimeout();
+
+private:
+
+    void initializeItems();
+    void setupPerformanceCollector();
+    void queryRAMLoad();
+    void addItem(const QUuid& uMachineId, const QString& strMachineName);
+    void removeItem(const QUuid& uMachineId);
+
+    QVector<UIResourceMonitorItem> m_itemList;
+    /* Used to find machines by uid. key is the machine uid and int is the index to m_itemList */
+    QMap<QUuid, int>               m_itemMap;
+    QVector<QString>               m_columnCaptions;
+    QTimer *m_pTimer;
     /** @name The following are used during UIPerformanceCollector::QueryMetricsData(..)
       * @{ */
@@ -117 +190 @@
     CPerformanceCollector m_performanceMonitor;
 
-private:
-
-    void initPerformanceCollector();
-
-};
-
-
-/*********************************************************************************************************************************
-*   Class UIVMResouceMonitorProxyModel definition.                                                                           *
-*********************************************************************************************************************************/
-class UIResourceMonitorProxyModel : public QSortFilterProxyModel
-{
-
-    Q_OBJECT;
-
-public:
-
-    UIResourceMonitorProxyModel(QObject *parent = 0);
-    void dataUpdate();
-    void setColumnShown(const QVector<bool>& columnShown);
-
-protected:
-
-    //virtual bool lessThan(const QModelIndex &left, const QModelIndex &right) const /* override */;
-    virtual bool filterAcceptsColumn(int source_column, const QModelIndex &source_parent) const /* override */;
-
-private:
-
-    QVector<bool> m_columnShown;
-
-};
-
-
-/*********************************************************************************************************************************
-*   Class UIResourceMonitorModel definition.                                                                                     *
-*********************************************************************************************************************************/
-class UIResourceMonitorModel : public QAbstractTableModel
-{
-    Q_OBJECT;
-
-signals:
-
-    void sigDataUpdate();
-
-public:
-
-    UIResourceMonitorModel(QObject *parent = 0);
-    int      rowCount(const QModelIndex &parent = QModelIndex()) const /* override */;
-    int      columnCount(const QModelIndex &parent = QModelIndex()) const /* override */;
-    QVariant data(const QModelIndex &index, int role) const /* override */;
-    QVariant headerData(int section, Qt::Orientation orientation, int role) const;
-    void setColumnCaptions(const QVector<QString>& captions);
-
-private slots:
-
-    void sltMachineStateChanged(const QUuid &uId, const KMachineState state);
-    void sltTimeout();
-
-private:
-
-    QVector<UIResourceMonitorItem> m_itemList;
-    void initializeItems();
-    QVector<QString>             m_columnCaptions;
-
-    QTimer *m_pTimer;
-
 };
 
@@ -209 +216 @@
     , m_uCPUVMMLoad(0)
     , m_uTotalRAM(0)
+    , m_uFreeRAM(0)
     , m_uUsedRAM(0)
     , m_fRAMUsagePercentage(0)
@@ -229 +237 @@
             m_comDebugger = comConsole.GetDebugger();
     }
-    initPerformanceCollector();
 }
 
@@ -250 +257 @@
     , m_uVMExitTotal(0)
 {
-    initPerformanceCollector();
 }
 
@@ -271 +277 @@
     , m_uVMExitTotal(0)
 {
-    initPerformanceCollector();
 }
 
@@ -281 +286 @@
 }
 
-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);
-}
 
 
@@ -305 +300 @@
     if (sourceModel())
         emit dataChanged(index(0,0), index(sourceModel()->rowCount(), sourceModel()->columnCount()));
+    invalidate();
 }
 
@@ -317 +313 @@
 void UIResourceMonitorProxyModel::setColumnShown(const QVector<bool>& columnShown)
 {
+    emit layoutAboutToBeChanged();
     m_columnShown = columnShown;
     invalidateFilter();
+    emit layoutChanged();
 }
 
@@ -374 +372 @@
             break;
         case VMResouceMonitorColumn_RAMUsedPercentage:
-            return m_itemList[index.row()].m_fRAMUsagePercentage;
+            return QString("%1\%").arg(QString::number(m_itemList[index.row()].m_fRAMUsagePercentage, 'f', 2));
             break;
         case VMResouceMonitorColumn_NetworkUpRate:
@@ -395 +393 @@
             break;
         case VMResouceMonitorColumn_DiskIOReadTotal:
-            return QString("%1/%2").arg(uiCommon().formatSize(m_itemList[index.row()].m_uDiskReadTotal, iDecimalCount));
+            return QString("%1").arg(uiCommon().formatSize(m_itemList[index.row()].m_uDiskReadTotal, iDecimalCount));
             break;
         case VMResouceMonitorColumn_DiskIOWriteTotal:
-            return QString("%1/%2").arg(uiCommon().formatSize(m_itemList[index.row()].m_uDiskWriteTotal, iDecimalCount));
+            return QString("%1").arg(uiCommon().formatSize(m_itemList[index.row()].m_uDiskWriteTotal, iDecimalCount));
             break;
         case VMResouceMonitorColumn_VMExits:
@@ -429 +427 @@
         {
             if (comMachine.GetState() == KMachineState_Running)
-            {
-                m_itemList << UIResourceMonitorItem(comMachine.GetId(), comMachine.GetName());
-            }
+                addItem(comMachine.GetId(), comMachine.GetName());
         }
     }
+    setupPerformanceCollector();
 }
 
 void UIResourceMonitorModel::sltMachineStateChanged(const QUuid &uId, const KMachineState state)
 {
-    emit layoutAboutToBeChanged();
-    int iIndex = m_itemList.indexOf(UIResourceMonitorItem(uId));
+    int iIndex = m_itemMap.value(uId, -1);
     /* Remove the machine in case machine is no longer working. */
     if (iIndex != -1 && state != KMachineState_Running)
-        m_itemList.remove(iIndex);
-
+    {
+        emit layoutAboutToBeChanged();
+        removeItem(uId);
+        emit layoutChanged();
+        setupPerformanceCollector();
+    }
     /* Insert the machine if it is working. */
     if (iIndex == -1 && state == KMachineState_Running)
     {
+        emit layoutAboutToBeChanged();
         CMachine comMachine = uiCommon().virtualBox().FindMachine(uId.toString());
-        m_itemList << UIResourceMonitorItem(uId, comMachine.GetName());
-    }
-    emit layoutChanged();
+        if (!comMachine.isNull())
+            addItem(uId, comMachine.GetName());
+        emit layoutChanged();
+        setupPerformanceCollector();
+    }
 }
 
@@ -458 +461 @@
     ULONG aPctHalted;
     ULONG aPctVMM;
+    /* RAM usage: */
+    if (!m_performanceMonitor.isNull())
+        queryRAMLoad();
+
     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())
         {
@@ -501 +497 @@
     }
     emit sigDataUpdate();
+}
+
+void UIResourceMonitorModel::setupPerformanceCollector()
+{
+    m_nameList.clear();
+    m_objectList.clear();
+    /* Initialize and configure CPerformanceCollector: */
+    const ULONG iPeriod = 1;
+    const int iMetricSetupCount = 1;
+    if (m_performanceMonitor.isNull())
+        m_performanceMonitor = uiCommon().virtualBox().GetPerformanceCollector();
+    for (int i = 0; i < m_itemList.size(); ++i)
+        m_nameList << "Guest/RAM/Usage*";
+    m_objectList = QVector<CUnknown>(m_nameList.size(), CUnknown());
+    m_performanceMonitor.SetupMetrics(m_nameList, m_objectList, iPeriod, iMetricSetupCount);
+}
+
+void UIResourceMonitorModel::queryRAMLoad()
+{
+    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);
+    /* 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) || aReturnNames[i].contains("Free", Qt::CaseInsensitive))
+            {
+                {
+                    CMachine comMachine = (CMachine)aReturnObjects[i];
+                    if (comMachine.isNull())
+                        continue;
+                    int iIndex = m_itemMap.value(comMachine.GetId(), -1);
+                    if (iIndex == -1 || iIndex >= m_itemList.size())
+                        continue;
+                    if (aReturnNames[i].contains("Total", Qt::CaseInsensitive))
+                        m_itemList[iIndex].m_uTotalRAM = fData;
+                    else
+                        m_itemList[iIndex].m_uFreeRAM = fData;
+                }
+            }
+    }
+    for (int i = 0; i < m_itemList.size(); ++i)
+    {
+        m_itemList[i].m_uUsedRAM = m_itemList[i].m_uTotalRAM - m_itemList[i].m_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);
+    }
+}
+
+void UIResourceMonitorModel::addItem(const QUuid& uMachineId, const QString& strMachineName)
+{
+    int iIndex = m_itemList.size();
+    m_itemList.append(UIResourceMonitorItem(uMachineId, strMachineName));
+    m_itemMap[uMachineId] = iIndex;
+}
+
+void UIResourceMonitorModel::removeItem(const QUuid& uMachineId)
+{
+    int iIndex = m_itemMap.value(uMachineId, -1);
+    if (iIndex == -1)
+        return;
+    m_itemList.remove(iIndex);
+    m_itemMap.remove(uMachineId);
 }
 
@@ -602 +680 @@
         m_pTableView->setShowGrid(false);
         m_pTableView->horizontalHeader()->setHighlightSections(false);
-        m_pTableView->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
-        m_pTableView->horizontalHeader()->setStretchLastSection(true);
+        m_pTableView->horizontalHeader()->setSectionResizeMode(QHeaderView::Interactive);
+        //m_pTableView->horizontalHeader()->setStretchLastSection(true);
 
         m_pTableView->verticalHeader()->setVisible(false);