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

Timestamp:

Jan 29, 2024 9:08:47 AM (12 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10501. Some cleaning.

File:

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

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

@@ -232 +232 @@
 public:
 
-    UIActivityOverviewItem(const QUuid &uid, const QString &strVMName, bool fIsCloudVM = false);
+    UIActivityOverviewItem(const QUuid &uid, const QString &strVMName);
 
     UIActivityOverviewItem();
     ~UIActivityOverviewItem();
     bool operator==(const UIActivityOverviewItem& other) const;
-    bool isWithGuestAdditions();
-    void resetDebugger();
 
     QUuid         m_VMuid;
     QString       m_strVMName;
-    bool          m_fIsCloudVM;
-
-    KMachineState m_enmMachineState;
 
     quint64  m_uCPUGuestLoad;
-    quint64  m_uCPUVMMLoad;
-
     quint64  m_uTotalRAM;
     quint64  m_uFreeRAM;
     quint64  m_uUsedRAM;
     float    m_fRAMUsagePercentage;
-
-    quint64 m_uNetworkDownRate;
-    quint64 m_uNetworkUpRate;
-    quint64 m_uNetworkDownTotal;
-    quint64 m_uNetworkUpTotal;
+    quint64  m_uNetworkDownRate;
+    quint64  m_uNetworkUpRate;
+    quint64  m_uNetworkDownTotal;
+    quint64  m_uNetworkUpTotal;
 
     quint64 m_uDiskWriteRate;
@@ -264 +256 @@
     quint64 m_uDiskReadTotal;
 
+
+    /** The strings of each column for the item. We update this during performance query
+      * instead of model's data function to know the string length earlier. */
+    QMap<int, QString> m_columnData;
+
+private:
+
+    void setupPerformanceCollector();
+};
+
+Q_DECLARE_METATYPE(UIActivityOverviewItem);
+
+/** Each instance of UIVMActivityOverviewItem corresponds to a running vm whose stats are displayed.
+  * they are owned my the model. */
+/*********************************************************************************************************************************
+ *   Class UIVMActivityOverviewItem definition.                                                                           *
+ *********************************************************************************************************************************/
+class UIActivityOverviewItemLocal : public UIActivityOverviewItem
+{
+
+public:
+
+    UIActivityOverviewItemLocal(const QUuid &uid, const QString &strVMName);
+
+    UIActivityOverviewItemLocal();
+    ~UIActivityOverviewItemLocal();
+
+    bool isWithGuestAdditions();
+    void resetDebugger();
+
+    KMachineState m_enmMachineState;
+    quint64  m_uCPUVMMLoad;
+
     quint64 m_uVMExitRate;
     quint64 m_uVMExitTotal;
@@ -270 +295 @@
     CMachineDebugger m_comDebugger;
     CGuest   m_comGuest;
-    /** The strings of each column for the item. We update this during performance query
-      * instead of model's data function to know the string length earlier. */
-    QMap<int, QString> m_columnData;
-
-private:
-
-    void setupPerformanceCollector();
 };
 
-Q_DECLARE_METATYPE(UIActivityOverviewItem);
+
+/*********************************************************************************************************************************
+*   Class UIVMActivityOverviewItem implementation.                                                                               *
+*********************************************************************************************************************************/
+UIActivityOverviewItemLocal::UIActivityOverviewItemLocal(const QUuid &uid, const QString &strVMName)
+    : UIActivityOverviewItem(uid, strVMName)
+    , m_uCPUVMMLoad(0)
+    , m_uVMExitRate(0)
+    , m_uVMExitTotal(0)
+{
+    if (m_enmMachineState == KMachineState_Running)
+        resetDebugger();
+}
+
+UIActivityOverviewItemLocal::UIActivityOverviewItemLocal()
+    : m_uCPUVMMLoad(0)
+    , m_uVMExitRate(0)
+    , m_uVMExitTotal(0)
+{
+}
+
+UIActivityOverviewItemLocal::~UIActivityOverviewItemLocal()
+{
+    if (!m_comSession.isNull())
+        m_comSession.UnlockMachine();
+}
+
+bool UIActivityOverviewItemLocal::isWithGuestAdditions()
+{
+    if (m_comGuest.isNull())
+        return false;
+    return m_comGuest.GetAdditionsStatus(m_comGuest.GetAdditionsRunLevel());
+}
+
+void UIActivityOverviewItemLocal::resetDebugger()
+{
+    m_comSession = uiCommon().openSession(m_VMuid, KLockType_Shared);
+    if (!m_comSession.isNull())
+    {
+        CConsole comConsole = m_comSession.GetConsole();
+        if (!comConsole.isNull())
+        {
+            m_comGuest = comConsole.GetGuest();
+            m_comDebugger = comConsole.GetDebugger();
+        }
+    }
+}
 
 
@@ -346 +410 @@
     void sltMachineRegistered(const QUuid &uId, bool fRegistered);
     void sltTimeout();
-    void sltCloudUpdateTimeout();
 
 private:
@@ -357 +420 @@
     void removeItem(const QUuid& uMachineId);
     void getHostRAMStats();
-    QVector<CCloudClient> obtainCloudClientList();
-    QVector<CCloudMachine> obtainCloudMachineList();
-
-    QVector<UIActivityOverviewItem> m_itemList;
+
+    QVector<UIActivityOverviewItemLocal> m_itemList;
     QMap<int, QString> m_columnTitles;
     QTimer *m_pTimer;
-    QTimer *m_pCloudUpdateTimer;
     /** @name The following are used during UIPerformanceCollector::QueryMetricsData(..)
      * @{ */
@@ -793 +853 @@
 *   Class UIVMActivityOverviewItem implementation.                                                                               *
 *********************************************************************************************************************************/
-UIActivityOverviewItem::UIActivityOverviewItem(const QUuid &uid, const QString &strVMName, bool fIsCloudVM /* = false */)
+UIActivityOverviewItem::UIActivityOverviewItem(const QUuid &uid, const QString &strVMName)
     : m_VMuid(uid)
     , m_strVMName(strVMName)
-    , m_fIsCloudVM(fIsCloudVM)
     , m_uCPUGuestLoad(0)
-    , m_uCPUVMMLoad(0)
     , m_uTotalRAM(0)
     , m_uFreeRAM(0)
@@ -811 +869 @@
     , m_uDiskWriteTotal(0)
     , m_uDiskReadTotal(0)
-    , m_uVMExitRate(0)
-    , m_uVMExitTotal(0)
-{
-    if (m_enmMachineState == KMachineState_Running)
-        resetDebugger();
+{
 }
 
 UIActivityOverviewItem::UIActivityOverviewItem()
     : m_VMuid(QUuid())
-    , m_fIsCloudVM(false)
     , m_uCPUGuestLoad(0)
-    , m_uCPUVMMLoad(0)
     , m_uTotalRAM(0)
     , m_uUsedRAM(0)
@@ -834 +886 @@
     , m_uDiskWriteTotal(0)
     , m_uDiskReadTotal(0)
-    , m_uVMExitRate(0)
-    , m_uVMExitTotal(0)
-{
-}
-
-void UIActivityOverviewItem::resetDebugger()
-{
-    m_comSession = uiCommon().openSession(m_VMuid, KLockType_Shared);
-    if (!m_comSession.isNull())
-    {
-        CConsole comConsole = m_comSession.GetConsole();
-        if (!comConsole.isNull())
-        {
-            m_comGuest = comConsole.GetGuest();
-            m_comDebugger = comConsole.GetDebugger();
-        }
-    }
-}
+{
+}
+
 
 UIActivityOverviewItem::~UIActivityOverviewItem()
 {
-    if (!m_comSession.isNull())
-        m_comSession.UnlockMachine();
 }
 
@@ -864 +899 @@
         return true;
     return false;
-}
-
-bool UIActivityOverviewItem::isWithGuestAdditions()
-{
-    if (m_comGuest.isNull())
-        return false;
-    return m_comGuest.GetAdditionsStatus(m_comGuest.GetAdditionsRunLevel());
 }
 
@@ -967 +995 @@
     :QAbstractTableModel(parent)
     , m_pTimer(new QTimer(this))
-    , m_pCloudUpdateTimer(new QTimer(this))
 {
     initialize();
@@ -987 +1014 @@
         m_pTimer->start(1000);
     }
-
-    if (m_pCloudUpdateTimer)
-    {
-        connect(m_pCloudUpdateTimer, &QTimer::timeout, this, &UIActivityOverviewModel::sltCloudUpdateTimeout);
-        m_pCloudUpdateTimer->start(10 * 1000);
-    }
 }
 
@@ -1015 +1036 @@
         else
             m_pTimer->stop();
-    }
-    if (m_pCloudUpdateTimer)
-    {
-        if (fShouldUpdate)
-            m_pCloudUpdateTimer->start();
-        else
-            m_pCloudUpdateTimer->stop();
     }
 }
@@ -1272 +1286 @@
     emit sigDataUpdate();
     emit sigHostStatsUpdate(m_hostStats);
-}
-
-QVector<CCloudMachine> UIActivityOverviewModel::obtainCloudMachineList()
-{
-    QVector<CCloudMachine> cloudMachineList;
-    QVector<CCloudClient> cloudClientList = obtainCloudClientList();
-    foreach (const CCloudClient &comClient, cloudClientList)
-    {
-        cloudMachineList << comClient.GetCloudMachineList();
-    }
-    return cloudMachineList;
-}
-
-QVector<CCloudClient> UIActivityOverviewModel::obtainCloudClientList()
-{
-    QVector<CCloudClient> comCloudClients;
-    /* Acquire Cloud Profile Manager restrictions: */
-    const QStringList restrictions = gEDataManager->cloudProfileManagerRestrictions();
-
-    foreach (CCloudProvider comCloudProvider, listCloudProviders())
-    {
-        /* Skip if we have nothing to populate: */
-        if (comCloudProvider.isNull())
-            continue;
-
-        /* Acquire provider id: */
-        QUuid uProviderId;
-        if (!cloudProviderId(comCloudProvider, uProviderId))
-            continue;
-
-        /* Acquire provider short name: */
-        QString strProviderShortName;
-        if (!cloudProviderShortName(comCloudProvider, strProviderShortName))
-            continue;
-
-        /* Make sure this provider isn't restricted: */
-        const QString strProviderPath = QString("/%1").arg(strProviderShortName);
-        if (restrictions.contains(strProviderPath))
-            continue;
-
-        /* Acquire list of profiles: */
-        const QVector<CCloudProfile> profiles = listCloudProfiles(comCloudProvider);
-        if (profiles.isEmpty())
-            continue;
-
-        foreach (CCloudProfile comCloudProfile, profiles)
-        {
-            /* Skip if we have nothing to populate: */
-            if (comCloudProfile.isNull())
-                continue;
-
-            /* Acquire profile name: */
-            QString strProfileName;
-            if (!cloudProfileName(comCloudProfile, strProfileName))
-                continue;
-
-            /* Make sure this profile isn't restricted: */
-            const QString strProfilePath = QString("/%1/%2").arg(strProviderShortName, strProfileName);
-            if (restrictions.contains(strProfilePath))
-                continue;
-
-
-            QString strErrorMessage;
-            /* Create read cloud machine list task: */
-            const UICloudEntityKey cloudProfileKey = UICloudEntityKey(strProviderShortName, strProfileName);
-            CCloudClient comCloudClient = cloudClientByName(cloudProfileKey.m_strProviderShortName,
-                                                            cloudProfileKey.m_strProfileName,
-                                                            strErrorMessage);
-            if (strErrorMessage.isEmpty() && comCloudClient.isOk())
-                comCloudClients << comCloudClient;
-        }
-    }
-    return comCloudClients;
-}
-
-void UIActivityOverviewModel::sltCloudUpdateTimeout()
-{
-    /* Update the m_items list: This is necessary as we dont have add/remove/change events for cloud machines: */
-    QVector<CCloudMachine> cloudMachines = obtainCloudMachineList();
-    foreach (const CCloudMachine &comMachine, cloudMachines)
-    {
-        if (!comMachine.isOk())
-            continue;
-        UIActivityOverviewItem cloudVMItem(comMachine.GetId(), comMachine.GetName(), true /* cloud vm*/);
-        if (m_itemList.contains(cloudVMItem))
-            continue;
-        m_itemList << cloudVMItem;
-    }
 }
 
@@ -1469 +1395 @@
 void UIActivityOverviewModel::addItem(const QUuid& uMachineId, const QString& strMachineName, KMachineState enmState)
 {
-    UIActivityOverviewItem newItem(uMachineId, strMachineName);
+    UIActivityOverviewItemLocal newItem(uMachineId, strMachineName);
     newItem.m_enmMachineState = enmState;
     m_itemList.append(newItem);