Changeset 43453 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Sep 27, 2012 12:37:46 PM (12 years ago)

Author:

vboxsync

Message:

Main/Metrics: Fixed the issue causing unregistration of all metrics instead of ones related to single interface (#6345)

Location:

trunk/src/VBox/Main/src-server

Files:

• HostImpl.cpp (modified) (1 diff)
• HostNetworkInterfaceImpl.cpp (modified) (1 diff)
• Performance.cpp (modified) (1 diff)
• PerformanceImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-server/HostImpl.cpp

@@ -443 +443 @@
     PerformanceCollector *aCollector = m->pParent->performanceCollector();
     unregisterMetrics (aCollector);
-    HostNetworkInterfaceList::iterator it;
-    for (it = m->llNetIfs.begin(); it != m->llNetIfs.end(); ++it)
-        (*it)->unregisterMetrics(aCollector, this);
 #endif /* VBOX_WITH_RESOURCE_USAGE_API */
+    /*
+     * Note that unregisterMetrics() has unregistered all metrics associated
+     * with Host including network interface ones. We can destroy network
+     * interface objects now.
+     */
     m->llNetIfs.clear();
 

trunk/src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp

@@ -124 +124 @@
     LogFlowThisFunc(("mInterfaceName={%ls}, mGuid={%s}\n",
                       mInterfaceName.raw(), mGuid.toString().c_str()));
-    aCollector->unregisterMetricsFor(objptr);
-    aCollector->unregisterBaseMetricsFor(objptr);
+    Utf8StrFmt name("Net/%ls/Load", mInterfaceName.raw());
+    aCollector->unregisterMetricsFor(objptr, name + "/*");
+    aCollector->unregisterBaseMetricsFor(objptr, name);
 }
 

trunk/src/VBox/Main/src-server/Performance.cpp

@@ -1140 +1140 @@
 }
 
+Filter::Filter(const com::Utf8Str name, const ComPtr<IUnknown> &aObject)
+{
+    processMetricList(name, aObject);
+}
+
 void Filter::init(ComSafeArrayIn(IN_BSTR, metricNames),
                   ComSafeArrayIn(IUnknown *, objects))

trunk/src/VBox/Main/src-server/PerformanceImpl.cpp

@@ -599 +599 @@
 }
 
-void PerformanceCollector::unregisterBaseMetricsFor(const ComPtr<IUnknown> &aObject)
+void PerformanceCollector::unregisterBaseMetricsFor(const ComPtr<IUnknown> &aObject, const Utf8Str name)
 {
     //LogFlowThisFuncEnter();
     AutoCaller autoCaller(this);
     if (!SUCCEEDED(autoCaller.rc())) return;
+
+    pm::Filter filter(name, aObject);
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -609 +611 @@
     BaseMetricList::iterator it;
     for (it = m.baseMetrics.begin(); it != m.baseMetrics.end(); ++it)
-        if ((*it)->associatedWith(aObject))
+        if (filter.match((*it)->getObject(), (*it)->getName()))
         {
             (*it)->unregister();
@@ -619 +621 @@
 }
 
-void PerformanceCollector::unregisterMetricsFor(const ComPtr<IUnknown> &aObject)
+void PerformanceCollector::unregisterMetricsFor(const ComPtr<IUnknown> &aObject, const Utf8Str name)
 {
     //LogFlowThisFuncEnter();
     AutoCaller autoCaller(this);
     if (!SUCCEEDED(autoCaller.rc())) return;
+
+    pm::Filter filter(name, aObject);
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -629 +633 @@
     MetricList::iterator it;
     for (it = m.metrics.begin(); it != m.metrics.end();)
-        if ((*it)->associatedWith(aObject))
+        if (filter.match((*it)->getObject(), (*it)->getName()))
         {
             delete *it;