Changeset 12457 in vbox for trunk

Timestamp:

Sep 15, 2008 11:14:35 AM (16 years ago)

Author:

vboxsync

Message:

Fixed small memory leak in the Windows implementation.
Fixed lack of destructor call for the host specific Collector classes. (virtual destructor; caused
crash at exit in VBoxSVC.exe)

Location:

trunk/src/VBox/Main

Files:

• include/Performance.h (modified) (1 diff)
• solaris/PerformanceSolaris.cpp (modified) (1 diff)
• win/PerformanceWin.cpp (modified) (4 diffs)

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

@@ -137 +137 @@
     {
     public:
+        virtual ~CollectorHAL() { };
         virtual int preCollect(const CollectorHints& hints) { return VINF_SUCCESS; }
         virtual int getHostCpuLoad(ULONG *user, ULONG *kernel, ULONG *idle);

trunk/src/VBox/Main/solaris/PerformanceSolaris.cpp

@@ -44 +44 @@
 public:
     CollectorSolaris();
-    ~CollectorSolaris();
+    virtual ~CollectorSolaris();
     virtual int getHostMemoryUsage(ULONG *total, ULONG *used, ULONG *available);
     virtual int getProcessMemoryUsage(RTPROCESS process, ULONG *used);

trunk/src/VBox/Main/win/PerformanceWin.cpp

@@ -40 +40 @@
 public:
     CollectorWin();
-    ~CollectorWin();
+    virtual ~CollectorWin();
 
     virtual int preCollect(const CollectorHints& hints);
@@ -185 +185 @@
     mHostCpuLoadIdleHandle   = getPropertyHandle(apEnumAccess[0], L"PercentProcessorTime");
 
+    for (unsigned i=0;i<dwNumReturned;i++)
+        apEnumAccess[i]->Release();
+
     delete [] apEnumAccess;
 
@@ -196 +199 @@
     mProcessMemoryUsedHandle       = getPropertyHandle(apEnumAccess[0], L"WorkingSet");
 
+    for (unsigned i=0;i<dwNumReturned;i++)
+        apEnumAccess[i]->Release();
+
     delete [] apEnumAccess;
 }
@@ -201 +207 @@
 CollectorWin::~CollectorWin()
 {
+    IWbemConfigureRefresher *pConfig = NULL;
+    HRESULT                 hr = S_OK;
+
     if (NULL != mNameSpace)
     {
         mNameSpace->Release();
+    }
+    if (NULL != mRefresher)
+    {
+        if (SUCCEEDED (hr = mRefresher->QueryInterface(
+            IID_IWbemConfigureRefresher,
+            (void **)&pConfig)))
+        {
+            // Remove the enumerators from the refresher.
+            hr = pConfig->Remove(mEnumProcessorID, 0);
+            Assert(SUCCEEDED(hr));
+            hr = pConfig->Remove(mEnumProcessID, 0);
+            Assert(SUCCEEDED(hr));
+
+            pConfig->Release();
+        }
     }
     if (NULL != mEnumProcessor)