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

Timestamp:

Jan 30, 2024 11:12:16 AM (13 months ago)

Author:

vboxsync

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

161367

Message:

FE/Qt: bugref:10501. Refactoring item classes. part 5.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/activity/overview/UIVMActivityOverviewWidget.cpp (modified) (11 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/activity/overview/UIVMActivityOverviewWidget.cpp

@@ -237 +237 @@
     virtual ~UIActivityOverviewItem();
     bool operator==(const UIActivityOverviewItem& other) const;
+    int columnLength(int iColumnIndex) const;
     virtual QString machineStateString() const = 0;
     virtual bool isRunning() const = 0;
@@ -247 +248 @@
     QString       m_strVMName;
 
-    quint64  m_uCPUGuestLoad;
+    ULONG  m_uCPUGuestLoad;
     quint64  m_uTotalRAM;
     quint64  m_uFreeRAM;
@@ -307 +308 @@
     KMachineState m_enmMachineState;
 
-    quint64  m_uCPUVMMLoad;
+    ULONG   m_uCPUVMMLoad;
     quint64 m_uVMExitRate;
     quint64 m_uVMExitTotal;
@@ -884 +885 @@
 }
 
-
 UIActivityOverviewItem::~UIActivityOverviewItem()
 {
@@ -899 +899 @@
 {
     return m_columnData.value(iColumnIndex, QString());
+}
+
+int UIActivityOverviewItem::columnLength(int iColumnIndex) const
+{
+    return m_columnData.value(iColumnIndex, QString()).length();
 }
 
@@ -1034 +1039 @@
         return;
 
-    ULONG aPctExecuting;
+    /* CPU Load: */
     ULONG aPctHalted;
-    ULONG aPctVMM;
-
-    /* CPU Load: */
-    m_comDebugger.GetCPULoad(0x7fffffff, aPctExecuting, aPctHalted, aPctVMM);
-    m_uCPUGuestLoad = aPctExecuting;
-    m_uCPUVMMLoad = aPctVMM;
+    m_comDebugger.GetCPULoad(0x7fffffff, m_uCPUGuestLoad, aPctHalted, m_uCPUVMMLoad);
 
     /* Network rate: */
     quint64 uPrevDownTotal = m_uNetworkDownTotal;
     quint64 uPrevUpTotal = m_uNetworkUpTotal;
-    UIMonitorCommon::getNetworkLoad(m_comDebugger,
-                                    m_uNetworkDownTotal, m_uNetworkUpTotal);
+    UIMonitorCommon::getNetworkLoad(m_comDebugger, m_uNetworkDownTotal, m_uNetworkUpTotal);
     m_uNetworkDownRate = m_uNetworkDownTotal - uPrevDownTotal;
     m_uNetworkUpRate = m_uNetworkUpTotal - uPrevUpTotal;
@@ -1054 +1053 @@
     quint64 uPrevWriteTotal = m_uDiskWriteTotal;
     quint64 uPrevReadTotal = m_uDiskReadTotal;
-    UIMonitorCommon::getDiskLoad(m_comDebugger,
-                                 m_uDiskWriteTotal, m_uDiskReadTotal);
+    UIMonitorCommon::getDiskLoad(m_comDebugger, m_uDiskWriteTotal, m_uDiskReadTotal);
     m_uDiskWriteRate = m_uDiskWriteTotal - uPrevWriteTotal;
     m_uDiskReadRate = m_uDiskReadTotal - uPrevReadTotal;
@@ -1408 +1406 @@
     }
 
-#if 0
-
     for (int i = 0; i < (int)VMActivityOverviewColumn_Max; ++i)
     {
         for (int j = 0; j < m_itemList.size(); ++j)
-            if (m_columnDataMaxLength.value(i, 0) < m_itemList[j].m_columnData[i].length())
-                m_columnDataMaxLength[i] = m_itemList[j].m_columnData[i].length();
-    }
-#endif
+            if (m_columnDataMaxLength.value(i, 0) < m_itemList[j]->columnLength(i))
+                m_columnDataMaxLength[i] = m_itemList[j]->columnLength(i);
+    }
+
     emit sigDataUpdate();
     emit sigHostStatsUpdate(m_hostStats);
@@ -1441 +1437 @@
 void UIActivityOverviewModel::queryPerformanceCollector()
 {
-#if 0
     QVector<QString>  aReturnNames;
     QVector<CUnknown>  aReturnObjects;
@@ -1475 +1470 @@
                         continue;
                     int iIndex = itemIndex(comMachine.GetId());
-                    if (iIndex == -1 || iIndex >= m_itemList.size())
+                    if (iIndex == -1 || iIndex >= m_itemList.size() || !m_itemList[iIndex])
                         continue;
+
                     if (aReturnNames[i].contains("Total", Qt::CaseInsensitive))
-                        m_itemList[iIndex].m_uTotalRAM = fData;
+                        m_itemList[iIndex]->m_uTotalRAM = fData;
                     else
-                        m_itemList[iIndex].m_uFreeRAM = fData;
+                        m_itemList[iIndex]->m_uFreeRAM = fData;
                 }
             }
@@ -1521 +1517 @@
     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);
-    }
-#endif
+        if (!m_itemList[i] || m_itemList[i]->isCloudVM())
+            continue;
+        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);
+    }
 }