Changeset 19017 in vbox for trunk/src/VBox

Timestamp:

Apr 20, 2009 8:12:58 AM (16 years ago)

Author:

vboxsync

Message:

Main: Fixed deletion of metrics. Not doing this leads to memory leaks & an lock
on the xml file of the VM (which produce other bugs). I reverted r45374 &
r45467 which where quick fixes for this only.

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (2 diffs)
• PerformanceImpl.cpp (modified) (2 diffs)
• VirtualBoxImpl.cpp (modified) (1 diff)
• include/MachineImpl.h (modified) (2 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -2742 +2742 @@
 
     /* delete the settings only when the file actually exists */
-    lockConfig();
     if (isConfigLocked())
     {
@@ -8108 +8107 @@
         "Size of resident portion of VM process in memory.");
     /* Create and register base metrics */
-    IUnknown *objptr;
-
-    ComObjPtr<Machine> tmp = aMachine;
-    tmp.queryInterfaceTo (&objptr);
-    pm::BaseMetric *cpuLoad = new pm::MachineCpuLoadRaw (hal, objptr, pid,
-                                             cpuLoadUser, cpuLoadKernel);
+    pm::BaseMetric *cpuLoad = new pm::MachineCpuLoadRaw (hal, aMachine, pid,
+                                                         cpuLoadUser, cpuLoadKernel);
     aCollector->registerBaseMetric (cpuLoad);
-    pm::BaseMetric *ramUsage = new pm::MachineRamUsage (hal, objptr, pid,
-                                                           ramUsageUsed);
+    pm::BaseMetric *ramUsage = new pm::MachineRamUsage (hal, aMachine, pid,
+                                                        ramUsageUsed);
     aCollector->registerBaseMetric (ramUsage);
 

trunk/src/VBox/Main/PerformanceImpl.cpp

@@ -492 +492 @@
         m.baseMetrics.begin(), m.baseMetrics.end(), std::bind2nd (
             std::mem_fun (&pm::BaseMetric::associatedWith), aObject));
+    /* Delete the content of the list as well */
+    BaseMetricList::iterator it1 = it;
+    for (;it1 != m.baseMetrics.end(); ++it1)
+        delete *it1;
     m.baseMetrics.erase(it, m.baseMetrics.end());
     LogAleksey(("{%p} " LOG_FN_FMT ": after remove_if: m.baseMetrics.size()=%d\n", this, __PRETTY_FUNCTION__, m.baseMetrics.size()));
@@ -508 +512 @@
         m.metrics.begin(), m.metrics.end(), std::bind2nd (
             std::mem_fun (&pm::Metric::associatedWith), aObject));
+    /* Delete the content of the list as well */
+    MetricList::iterator it1 = it;
+    for (;it1 != m.metrics.end(); ++it1)
+        delete *it1;
     m.metrics.erase(it, m.metrics.end());
     //LogFlowThisFuncLeave();

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -1093 +1093 @@
     /* save the global registry */
     rc = saveSettings();
-    CheckComRCReturnRC (rc);
-
-    /* Close settings file for this machine. */
-    rc = machine->unlockConfig();
 
     /* return the unregistered machine to the caller */

trunk/src/VBox/Main/include/MachineImpl.h

@@ -799 +799 @@
 
     HRESULT lockConfig();
-public: /* To have it available in VirtualBox::UnregisterMachine. */
     HRESULT unlockConfig();
 
-protected:
     /** @note This method is not thread safe */
     BOOL isConfigLocked()
@@ -1117 +1115 @@
 }
 
+
 #endif // ____H_MACHINEIMPL
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */