Changeset 104945 in vbox

Timestamp:

Jun 17, 2024 4:28:41 PM (3 months ago)

Author:

vboxsync

Message:

FE/Qt. bugref:10659. Updating network related metrics of the local vms.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/activity/overview/UIVMActivityOverviewModelView.cpp (modified) (7 diffs)

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

@@ -35 +35 @@
 #include "UIExtraDataDefs.h"
 #include "UIGlobalSession.h"
+#include "UIMonitorCommon.h"
 #include "UITranslator.h"
 #include "UIVirtualBoxEventHandler.h"
@@ -73 +74 @@
 private:
 
+    void updateCellText(VMActivityOverviewColumn enmColumnIndex, const QString &strText);
+
     KMachineState    m_enmMachineState;
     CMachineDebugger m_comDebugger;
@@ -80 +83 @@
     quint64  m_uTotalRAM;
     quint64  m_uFreeRAM;
+
+    quint64  m_uNetworkDownTotal;
+    quint64  m_uNetworkUpTotal;
 };
 
@@ -88 +94 @@
     , m_uTotalRAM(0)
     , m_uFreeRAM(0)
+    , m_uNetworkDownTotal(0)
+    , m_uNetworkUpTotal(0)
 {
     if (m_enmMachineState == KMachineState_Running)
@@ -101 +109 @@
     ULONG uCPUVMMLoad;
     m_comDebugger.GetCPULoad(0x7fffffff, uCPUGuestLoad, aPctHalted, uCPUVMMLoad);
-
-    if (m_cells.value(VMActivityOverviewColumn_CPUVMMLoad, 0))
-        m_cells[VMActivityOverviewColumn_CPUVMMLoad]->setText(QString("%1%").arg(QString::number(uCPUVMMLoad)));
-    if (m_cells.value(VMActivityOverviewColumn_CPUGuestLoad, 0))
-        m_cells[VMActivityOverviewColumn_CPUGuestLoad]->setText(QString("%1%").arg(QString::number(uCPUGuestLoad)));
+    updateCellText(VMActivityOverviewColumn_CPUVMMLoad, QString("%1%").arg(QString::number(uCPUVMMLoad)));
+    updateCellText(VMActivityOverviewColumn_CPUGuestLoad, QString("%1%").arg(QString::number(uCPUGuestLoad)));
 
     /* RAM Utilization: */
@@ -131 +136 @@
     }
 
-    if (m_cells.value(VMActivityOverviewColumn_RAMUsedAndTotal, 0))
-        m_cells[VMActivityOverviewColumn_RAMUsedAndTotal]->setText(strRAMUsage);
-    if (m_cells.value(VMActivityOverviewColumn_RAMUsedPercentage, 0))
-        m_cells[VMActivityOverviewColumn_RAMUsedPercentage]->setText(strRAMPercentage);
+    updateCellText(VMActivityOverviewColumn_RAMUsedAndTotal, strRAMUsage);
+    updateCellText(VMActivityOverviewColumn_RAMUsedPercentage, strRAMPercentage);
+
+    /* Network rate: */
+    quint64 uPrevDownTotal = m_uNetworkDownTotal;
+    quint64 uPrevUpTotal = m_uNetworkUpTotal;
+    UIMonitorCommon::getNetworkLoad(m_comDebugger, m_uNetworkDownTotal, m_uNetworkUpTotal);
+    quint64 uNetworkDownRate = m_uNetworkDownTotal - uPrevDownTotal;
+    quint64 uNetworkUpRate = m_uNetworkUpTotal - uPrevUpTotal;
+
+    updateCellText(VMActivityOverviewColumn_NetworkUpRate, QString("%1").arg(UITranslator::formatSize(uNetworkUpRate, iDecimalCount)));
+    updateCellText(VMActivityOverviewColumn_NetworkDownRate,QString("%1").arg(UITranslator::formatSize(uNetworkDownRate, iDecimalCount)));
+    updateCellText(VMActivityOverviewColumn_NetworkUpTotal, QString("%1").arg(UITranslator::formatSize(m_uNetworkUpTotal, iDecimalCount)));
+    updateCellText(VMActivityOverviewColumn_NetworkDownTotal, QString("%1").arg(UITranslator::formatSize(m_uNetworkDownTotal, iDecimalCount)));
+
 }
 
@@ -194 +210 @@
 {
     m_uFreeRAM = uFreeRAM;
+}
+
+void UIActivityOverviewAccessibleRowLocal::updateCellText(VMActivityOverviewColumn enmColumnIndex, const QString &strText)
+{
+    if (m_cells.value(enmColumnIndex, 0))
+        m_cells[enmColumnIndex]->setText(strText);
 }