Changeset 85592 in vbox for trunk/src/VBox

Timestamp:

Aug 3, 2020 10:22:00 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9686, bugref:9510. Implementing copy ctor for UIResourceMonitorItem

File:

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

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

@@ -220 +220 @@
     UIResourceMonitorItem(const QUuid &uid);
     UIResourceMonitorItem();
+    UIResourceMonitorItem(const UIResourceMonitorItem &item);
+    ~UIResourceMonitorItem();
     bool operator==(const UIResourceMonitorItem& other) const;
-    bool isWithGuestAdditions() const;
+    bool isWithGuestAdditions();
 
     QUuid    m_VMuid;
@@ -246 +248 @@
     quint64 m_uVMExitTotal;
 
+    CSession m_comSession;
     CMachineDebugger m_comDebugger;
-    mutable CGuest   m_comGuest;
+    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. */
@@ -766 +769 @@
     , m_uVMExitTotal(0)
 {
-    CSession comSession = uiCommon().openSession(uid, KLockType_Shared);
-    if (!comSession.isNull())
-    {
-        CConsole comConsole = comSession.GetConsole();
+    m_comSession = uiCommon().openSession(uid, KLockType_Shared);
+    if (!m_comSession.isNull())
+    {
+        CConsole comConsole = m_comSession.GetConsole();
         if (!comConsole.isNull())
         {
@@ -818 +821 @@
 }
 
+UIResourceMonitorItem::~UIResourceMonitorItem()
+{
+    if (!m_comSession.isNull())
+        m_comSession.UnlockMachine();
+}
+
+UIResourceMonitorItem::UIResourceMonitorItem(const UIResourceMonitorItem &other)
+    : m_VMuid(other.m_VMuid)
+    , m_strVMName(other.m_strVMName)
+    , m_uCPUGuestLoad(other.m_uCPUGuestLoad)
+    , m_uCPUVMMLoad(other.m_uCPUVMMLoad)
+    , m_uTotalRAM(other.m_uTotalRAM)
+    , m_uFreeRAM(other.m_uFreeRAM)
+    , m_uUsedRAM(other.m_uUsedRAM)
+    , m_fRAMUsagePercentage(other.m_fRAMUsagePercentage)
+    , m_uNetworkDownRate(other.m_uNetworkDownRate)
+    , m_uNetworkUpRate(other.m_uNetworkUpRate)
+    , m_uNetworkDownTotal(other.m_uNetworkDownTotal)
+    , m_uNetworkUpTotal(other.m_uNetworkUpTotal)
+    , m_uDiskWriteRate(other.m_uDiskWriteRate)
+    , m_uDiskReadRate(other.m_uDiskReadRate)
+    , m_uDiskWriteTotal(other.m_uDiskWriteTotal)
+    , m_uDiskReadTotal(other.m_uDiskReadTotal)
+    , m_uVMExitRate(other.m_uVMExitRate)
+    , m_uVMExitTotal(other.m_uVMExitTotal)
+    , m_comSession(other.m_comSession)
+    , m_comDebugger(other.m_comDebugger)
+    , m_comGuest(other.m_comGuest)
+    , m_columnData(other.m_columnData)
+{
+}
+
 bool UIResourceMonitorItem::operator==(const UIResourceMonitorItem& other) const
 {
@@ -825 +860 @@
 }
 
-bool UIResourceMonitorItem::isWithGuestAdditions() const
+bool UIResourceMonitorItem::isWithGuestAdditions()
 {
     if (m_comGuest.isNull())
@@ -963 +998 @@
         emit layoutChanged();
         setupPerformanceCollector();
+        return;
     }
     /* Insert the machine if it is working. */
@@ -973 +1009 @@
         emit layoutChanged();
         setupPerformanceCollector();
+        return;
     }
 }