Changeset 83469 in vbox

Timestamp:

Mar 27, 2020 2:44:54 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9686. Checking column visibility before making queries thus possibly saving some cycles.

Location:

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

Files:

• UIResourceMonitor.cpp (modified) (13 diffs)
• UIResourceMonitor.h (modified) (1 diff)

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

@@ -132 +132 @@
     UIResourceMonitorProxyModel(QObject *parent = 0);
     void dataUpdate();
-    void setColumnVisible(const QMap<int, bool>& columnVisible);
+    void reFilter();
 
 protected:
@@ -140 +140 @@
 
 private:
-
-    QMap<int, bool> m_columnVisible;
 
 };
@@ -165 +163 @@
     QVariant headerData(int section, Qt::Orientation orientation, int role) const;
     void setColumnCaptions(const QVector<QString>& captions);
+    void setColumnVisible(const QMap<int, bool>& columnVisible);
+    bool columnVisible(int iColumnId) const;
 
 private slots:
@@ -190 +190 @@
     /** @} */
     CPerformanceCollector m_performanceMonitor;
+    QMap<int, bool> m_columnVisible;
 
 };
@@ -332 +333 @@
 }
 
-bool UIResourceMonitorProxyModel::filterAcceptsColumn(int iSourceColumn, const QModelIndex &sourceParent) const
-{
-    Q_UNUSED(sourceParent);
-    return m_columnVisible.value(iSourceColumn, true);
-}
-
-void UIResourceMonitorProxyModel::setColumnVisible(const QMap<int, bool>& columnVisible)
+void UIResourceMonitorProxyModel::reFilter()
 {
     emit layoutAboutToBeChanged();
-    m_columnVisible = columnVisible;
     invalidateFilter();
     emit layoutChanged();
+}
+
+
+bool UIResourceMonitorProxyModel::filterAcceptsColumn(int iSourceColumn, const QModelIndex &sourceParent) const
+{
+    Q_UNUSED(sourceParent);
+    UIResourceMonitorModel* pModel = qobject_cast<UIResourceMonitorModel*>(sourceModel());
+    if (!pModel)
+        return true;
+    return pModel->columnVisible(iSourceColumn);
 }
 
@@ -495 +499 @@
     ULONG aPctHalted;
     ULONG aPctVMM;
+
+    bool fRAMColumns = columnVisible(VMResouceMonitorColumn_RAMUsedAndTotal)
+        || columnVisible(VMResouceMonitorColumn_RAMUsedPercentage);
+    bool fCPUColumns = columnVisible(VMResouceMonitorColumn_CPUVMMLoad) || columnVisible(VMResouceMonitorColumn_CPUGuestLoad);
+    bool fNetworkColumns = columnVisible(VMResouceMonitorColumn_NetworkUpRate)
+        || columnVisible(VMResouceMonitorColumn_NetworkDownRate)
+        || columnVisible(VMResouceMonitorColumn_NetworkUpTotal)
+        || columnVisible(VMResouceMonitorColumn_NetworkDownTotal);
+    bool fIOColumns = columnVisible(VMResouceMonitorColumn_DiskIOReadRate)
+        || columnVisible(VMResouceMonitorColumn_DiskIOWriteRate)
+        || columnVisible(VMResouceMonitorColumn_DiskIOReadTotal)
+        || columnVisible(VMResouceMonitorColumn_DiskIOWriteTotal);
+    bool fVMExitColumn = columnVisible(VMResouceMonitorColumn_VMExits);
+
     /* RAM usage: */
-    if (!m_performanceMonitor.isNull())
+    if (!m_performanceMonitor.isNull() && fRAMColumns)
         queryRAMLoad();
 
@@ -504 +522 @@
         {
             /* CPU Load: */
-            m_itemList[i].m_comDebugger.GetCPULoad(0x7fffffff, aPctExecuting, aPctHalted, aPctVMM);
-            m_itemList[i].m_uCPUGuestLoad = aPctExecuting;
-            m_itemList[i].m_uCPUVMMLoad = aPctVMM;
+            if (fCPUColumns)
+            {
+                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;
-            quint64 uPrevUpTotal = m_itemList[i].m_uNetworkUpTotal;
-            UIMonitorCommon::getNetworkLoad(m_itemList[i].m_comDebugger,
-                                            m_itemList[i].m_uNetworkDownTotal, m_itemList[i].m_uNetworkUpTotal);
-            m_itemList[i].m_uNetworkDownRate = m_itemList[i].m_uNetworkDownTotal - uPrevDownTotal;
-            m_itemList[i].m_uNetworkUpRate = m_itemList[i].m_uNetworkUpTotal - uPrevUpTotal;
+            if (fNetworkColumns)
+            {
+                quint64 uPrevDownTotal = m_itemList[i].m_uNetworkDownTotal;
+                quint64 uPrevUpTotal = m_itemList[i].m_uNetworkUpTotal;
+                UIMonitorCommon::getNetworkLoad(m_itemList[i].m_comDebugger,
+                                                m_itemList[i].m_uNetworkDownTotal, m_itemList[i].m_uNetworkUpTotal);
+                m_itemList[i].m_uNetworkDownRate = m_itemList[i].m_uNetworkDownTotal - uPrevDownTotal;
+                m_itemList[i].m_uNetworkUpRate = m_itemList[i].m_uNetworkUpTotal - uPrevUpTotal;
+            }
 
             /* IO rate: */
-            quint64 uPrevWriteTotal = m_itemList[i].m_uDiskWriteTotal;
-            quint64 uPrevReadTotal = m_itemList[i].m_uDiskReadTotal;
-            UIMonitorCommon::getDiskLoad(m_itemList[i].m_comDebugger,
-                                         m_itemList[i].m_uDiskWriteTotal, m_itemList[i].m_uDiskReadTotal);
-            m_itemList[i].m_uDiskWriteRate = m_itemList[i].m_uDiskWriteTotal - uPrevWriteTotal;
-            m_itemList[i].m_uDiskReadRate = m_itemList[i].m_uDiskReadTotal - uPrevReadTotal;
+            if (fIOColumns)
+            {
+                quint64 uPrevWriteTotal = m_itemList[i].m_uDiskWriteTotal;
+                quint64 uPrevReadTotal = m_itemList[i].m_uDiskReadTotal;
+                UIMonitorCommon::getDiskLoad(m_itemList[i].m_comDebugger,
+                                             m_itemList[i].m_uDiskWriteTotal, m_itemList[i].m_uDiskReadTotal);
+                m_itemList[i].m_uDiskWriteRate = m_itemList[i].m_uDiskWriteTotal - uPrevWriteTotal;
+                m_itemList[i].m_uDiskReadRate = m_itemList[i].m_uDiskReadTotal - uPrevReadTotal;
+            }
 
            /* VM Exits: */
-            quint64 uPrevVMExitsTotal = m_itemList[i].m_uVMExitTotal;
-            UIMonitorCommon::getVMMExitCount(m_itemList[i].m_comDebugger, m_itemList[i].m_uVMExitTotal);
-            m_itemList[i].m_uVMExitRate = m_itemList[i].m_uVMExitTotal - uPrevVMExitsTotal;
+           if (fVMExitColumn)
+           {
+               quint64 uPrevVMExitsTotal = m_itemList[i].m_uVMExitTotal;
+               UIMonitorCommon::getVMMExitCount(m_itemList[i].m_comDebugger, m_itemList[i].m_uVMExitTotal);
+               m_itemList[i].m_uVMExitRate = m_itemList[i].m_uVMExitTotal - uPrevVMExitsTotal;
+           }
         }
     }
@@ -615 +645 @@
 }
 
+void UIResourceMonitorModel::setColumnVisible(const QMap<int, bool>& columnVisible)
+{
+    m_columnVisible = columnVisible;
+}
+
+bool UIResourceMonitorModel::columnVisible(int iColumnId) const
+{
+    return m_columnVisible.value(iColumnId, true);
+}
+
 
 /*********************************************************************************************************************************
@@ -628 +668 @@
     , m_pToolBar(0)
     , m_pTableView(0)
+    , m_pProxyModel(0)
+    , m_pModel(0)
     , m_pColumnSelectionMenu(0)
 {
@@ -688 +730 @@
     retranslateUi();
     prepareActions();
+    updateModelColumVisibilityCache();
 }
 
@@ -737 +780 @@
         connect(m_pModel, &UIResourceMonitorModel::sigDataUpdate, this, &UIResourceMonitorWidget::sltHandleDataUpdate);
 
-        m_pProxyModel->setColumnVisible(m_columnVisible);
+        m_pModel->setColumnVisible(m_columnVisible);
     }
 }
@@ -838 +881 @@
     else
         m_pColumnSelectionMenu->hide();
-
     update();
-
-    // QPoint point(0, 0);
-    // if (!m_pTableView)
-    //     return;
-    // if (fChecked)
-    //     m_pMenu->exec(m_pTableView->mapToGlobal(point));
-    // else
-    //     m_pMenu->hide();
 }
 
@@ -869 +903 @@
         return;
     m_columnVisible[iColumnId] = fVisible;
+    updateModelColumVisibilityCache();
+}
+
+void UIResourceMonitorWidget::updateModelColumVisibilityCache()
+{
+    if (m_pModel)
+        m_pModel->setColumnVisible(m_columnVisible);
     if (m_pProxyModel)
-        m_pProxyModel->setColumnVisible(m_columnVisible);
+        m_pProxyModel->reFilter();
 }
 

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

@@ -80 +80 @@
     void setColumnVisible(int iColumnId, bool fVisible);
     bool columnVisible(int iColumnId) const;
+    void updateModelColumVisibilityCache();
 
     /** @name Prepare/cleanup cascade.