Changeset 10779 in vbox for trunk/src/VBox

Timestamp:

Jul 21, 2008 2:29:29 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

33550

Message:

Locking. Enabled tests in tstAPI.

Location:

trunk/src/VBox/Main

Files:

• PerformanceImpl.cpp (modified) (16 diffs)
• include/PerformanceImpl.h (modified) (2 diffs)
• testcase/tstAPI.cpp (modified) (3 diffs)

trunk/src/VBox/Main/PerformanceImpl.cpp

@@ -231 +231 @@
         LogFlow (("PerformanceCollector::GetMetrics() store a metric at "
                   "retMetrics[%d]...\n", i));
-        metric.queryInterfaceTo (&retMetrics [++ i]);
+        metric.queryInterfaceTo (&retMetrics [i++]);
     }
     retMetrics.detachTo (ComSafeArrayOutArg(outMetrics));
@@ -274 +274 @@
 
     AutoReadLock alock (this); /* Need a read lock to access mBaseMetrics */
+                               /* Write lock is not needed since we are */
+                               /* fiddling with enable bit only. No harm */
+                               /* the readers may see it differently. */
 
     BaseMetricList::iterator it;
@@ -295 +298 @@
     /// @todo (r=dmik) why read lock below? individual elements get modified!
 
-    AutoReadLock alock (this);
+    AutoReadLock alock (this); /* Need a read lock to access mBaseMetrics */
+                               /* Write lock is not needed since we are */
+                               /* fiddling with enable bit only. No harm */
+                               /* the readers may see it differently. */
 
     BaseMetricList::iterator it;
@@ -365 +371 @@
 void PerformanceCollector::registerBaseMetric (pm::BaseMetric *baseMetric)
 {
-    /// @todo (r=dmik) better always use AutoCaller unless you are 100% sure
-    /// the object is not uninitialized while you are doing something here
+    AutoCaller autoCaller (this);
+    if (!SUCCEEDED (autoCaller.rc())) return;
 
     AutoWriteLock alock (this);
@@ -374 +380 @@
 void PerformanceCollector::registerMetric (pm::Metric *metric)
 {
-    /// @todo (r=dmik) better always use AutoCaller unless you are 100% sure
-    /// the object is not uninitialized while you are doing something here
+    AutoCaller autoCaller (this);
+    if (!SUCCEEDED (autoCaller.rc())) return;
 
     AutoWriteLock alock (this);
@@ -383 +389 @@
 void PerformanceCollector::unregisterBaseMetricsFor (const ComPtr <IUnknown> &aObject)
 {
-    /// @todo (r=dmik) better always use AutoCaller unless you are 100% sure
-    /// the object is not uninitialized while you are doing something here
+    AutoCaller autoCaller (this);
+    if (!SUCCEEDED (autoCaller.rc())) return;
 
     AutoWriteLock alock (this);
@@ -394 +400 @@
 void PerformanceCollector::unregisterMetricsFor (const ComPtr <IUnknown> &aObject)
 {
-    /// @todo (r=dmik) better always use AutoCaller unless you are 100% sure
-    /// the object is not uninitialized while you are doing something here
+    AutoCaller autoCaller (this);
+    if (!SUCCEEDED (autoCaller.rc())) return;
 
     AutoWriteLock alock (this);
@@ -436 +442 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-PerformanceMetric::PerformanceMetric() : mMetric(0)
+PerformanceMetric::PerformanceMetric()
 {
 }
@@ -463 +469 @@
 HRESULT PerformanceMetric::init (pm::Metric *aMetric)
 {
-    mMetric = aMetric;
+    m.name   = aMetric->getName();
+    m.object = aMetric->getObject();
+    m.period = aMetric->getPeriod();
+    m.count  = aMetric->getLength();
+    m.unit   = aMetric->getUnit();
+    m.min    = aMetric->getMinValue();
+    m.max    = aMetric->getMaxValue();
     return S_OK;
 }
@@ -476 +488 @@
     /// AutoReadLock? Is the underlying metric a constant object?
 
-    Bstr tmp (mMetric->getName());
-    tmp.detachTo (aMetricName);
+    m.name.cloneTo (aMetricName);
     return S_OK;
 }
@@ -483 +494 @@
 STDMETHODIMP PerformanceMetric::COMGETTER(Object) (IUnknown **anObject)
 {
-    *anObject = mMetric->getObject();
+    m.object.queryInterfaceTo(anObject);
     return S_OK;
 }
@@ -489 +500 @@
 STDMETHODIMP PerformanceMetric::COMGETTER(Period) (ULONG *aPeriod)
 {
-    *aPeriod = mMetric->getPeriod();
+    *aPeriod = m.period;
     return S_OK;
 }
@@ -495 +506 @@
 STDMETHODIMP PerformanceMetric::COMGETTER(Count) (ULONG *aCount)
 {
-    *aCount = mMetric->getLength();
+    *aCount = m.count;
     return S_OK;
 }
@@ -501 +512 @@
 STDMETHODIMP PerformanceMetric::COMGETTER(Unit) (BSTR *aUnit)
 {
-    Bstr tmp (mMetric->getUnit());
-    tmp.detachTo(aUnit);
+    m.unit.cloneTo(aUnit);
     return S_OK;
 }
@@ -508 +518 @@
 STDMETHODIMP PerformanceMetric::COMGETTER(MinimumValue) (LONG *aMinValue)
 {
-    *aMinValue = mMetric->getMinValue();
+    *aMinValue = m.min;
     return S_OK;
 }
@@ -514 +524 @@
 STDMETHODIMP PerformanceMetric::COMGETTER(MaximumValue) (LONG *aMaxValue)
 {
-    *aMaxValue = mMetric->getMaxValue();
-    return S_OK;
-}
-
+    *aMaxValue = m.max;
+    return S_OK;
+}
+

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

@@ -50 +50 @@
     public IPerformanceMetric
 {
-private:
-
-    struct Data
-    {
-        /* Constructor. */
-        Data() { }
-
-        bool operator== (const Data &that) const
-        {
-            return this == &that;
-        }
-    };
-
 public:
 
@@ -102 +89 @@
 private:
 
-    pm::Metric *mMetric;
+    struct Data
+    {
+        /* Constructor. */
+        Data() : period(0), count(0), min(0), max(0) { }
+
+        Bstr             name;
+        ComPtr<IUnknown> object;
+        ULONG            period;
+        ULONG            count;
+        Bstr             unit;
+        LONG             min;
+        LONG             max;
+    };
+
+    Data m;
 };
 

trunk/src/VBox/Main/testcase/tstAPI.cpp

@@ -926 +926 @@
 #endif
 
-#if 0
+#if 1
     do {
         // Get collector
@@ -1017 +1017 @@
 }
 
-#if 0
+#if 1
 void queryMetrics (ComPtr <IPerformanceCollector> collector,
                    ComSafeArrayIn (IUnknown *, objects))
@@ -1053 +1053 @@
         Bstr metricUnit(metricUnitBSTR);
         Bstr metricName(retNames[i]);
-        printf("%ls", metricName.raw());
+        printf("obj(%p) %ls", anObject[0], metricName.raw());
         for (unsigned j = 0; j < retLengths[i]; j++)
         {