Changeset 67726 in vbox for trunk/src/VBox/Main/src-server/PerformanceImpl.cpp

Timestamp:

Jun 30, 2017 12:06:06 PM (8 years ago)

Author:

vboxsync

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

116575

Message:

Main: more Log*Func

File:

• trunk/src/VBox/Main/src-server/PerformanceImpl.cpp (modified) (9 diffs)

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

@@ -529 +529 @@
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-    Log7(("{%p} " LOG_FN_FMT ": obj=%p name=%s\n", this, __PRETTY_FUNCTION__,
-          (void *)baseMetric->getObject(), baseMetric->getName()));
+    Log7Func(("{%p}: obj=%p name=%s\n", this, (void *)baseMetric->getObject(), baseMetric->getName()));
     m.baseMetrics.push_back(baseMetric);
     //LogFlowThisFuncLeave();
@@ -542 +541 @@
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-    Log7(("{%p} " LOG_FN_FMT ": obj=%p name=%s\n", this, __PRETTY_FUNCTION__, (void *)metric->getObject(), metric->getName()));
+    Log7Func(("{%p}: obj=%p name=%s\n", this, (void *)metric->getObject(), metric->getName()));
     m.metrics.push_back(metric);
     //LogFlowThisFuncLeave();
@@ -564 +563 @@
             ++n;
         }
-    Log7(("{%p} " LOG_FN_FMT ": obj=%p, name=%s, marked %d metrics\n",
-          this, __PRETTY_FUNCTION__, (void *)aObject, name.c_str(), n));
+    Log7Func(("{%p}: obj=%p, name=%s, marked %d metrics\n", this, (void *)aObject, name.c_str(), n));
     //LogFlowThisFuncLeave();
 }
@@ -578 +576 @@
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-    Log7(("{%p} " LOG_FN_FMT ": obj=%p, name=%s\n", this, __PRETTY_FUNCTION__, (void *)aObject, name.c_str()));
+    Log7Func(("{%p}: obj=%p, name=%s\n", this, (void *)aObject, name.c_str()));
     MetricList::iterator it;
     for (it = m.metrics.begin(); it != m.metrics.end();)
@@ -666 +664 @@
 void PerformanceCollector::samplerCallback(uint64_t iTick)
 {
-    Log4(("{%p} " LOG_FN_FMT ": ENTER\n", this, __PRETTY_FUNCTION__));
+    Log4Func(("{%p}: ENTER\n", this));
     /* No locking until stage 3!*/
 
@@ -683 +681 @@
     if (toBeCollected.size() == 0)
     {
-        Log4(("{%p} " LOG_FN_FMT ": LEAVE (nothing to collect)\n", this, __PRETTY_FUNCTION__));
+        Log4Func(("{%p}: LEAVE (nothing to collect)\n", this));
         return;
     }
@@ -701 +699 @@
      * Those should be destroyed now.
      */
-    Log7(("{%p} " LOG_FN_FMT ": before remove_if: toBeCollected.size()=%d\n", this, __PRETTY_FUNCTION__, toBeCollected.size()));
+    Log7Func(("{%p}: before remove_if: toBeCollected.size()=%d\n", this, toBeCollected.size()));
     toBeCollected.remove_if(std::mem_fun(&pm::BaseMetric::isUnregistered));
-    Log7(("{%p} " LOG_FN_FMT ": after remove_if: toBeCollected.size()=%d\n", this, __PRETTY_FUNCTION__, toBeCollected.size()));
-    Log7(("{%p} " LOG_FN_FMT ": before remove_if: m.baseMetrics.size()=%d\n", this, __PRETTY_FUNCTION__, m.baseMetrics.size()));
+    Log7Func(("{%p}: after remove_if: toBeCollected.size()=%d\n", this, toBeCollected.size()));
+    Log7Func(("{%p}: before remove_if: m.baseMetrics.size()=%d\n", this, m.baseMetrics.size()));
     for (it = m.baseMetrics.begin(); it != m.baseMetrics.end();)
         if ((*it)->isUnregistered())
@@ -713 +711 @@
         else
             ++it;
-    Log7(("{%p} " LOG_FN_FMT ": after remove_if: m.baseMetrics.size()=%d\n", this, __PRETTY_FUNCTION__, m.baseMetrics.size()));
+    Log7Func(("{%p}: after remove_if: m.baseMetrics.size()=%d\n", this, m.baseMetrics.size()));
     /*
      * Now when we have destroyed all base metrics that could
@@ -724 +722 @@
     std::for_each(toBeCollected.begin(), toBeCollected.end(),
                   std::mem_fun(&pm::BaseMetric::collect));
-    Log4(("{%p} " LOG_FN_FMT ": LEAVE\n", this, __PRETTY_FUNCTION__));
+    Log4Func(("{%p}: LEAVE\n", this));
 }