commit 5b4b29bd98a36e57e9dee9fb9ee617163f5d0176
author chaviw <chaviw@google.com> Mon Jun 06 15:35:15 2022 -0500
committer Chavi Weingarten <chaviw@google.com> Thu Jul 14 18:30:54 2022 +0000
tree 7de4a8011b855ce85e546a4ab4d62d29d69edbcc
parent 69e60a86c9e142d3cf6101ee70e26a9d90b2fdcc

Add Consumer name in Surface::dequeueBuffer trace

Test: name is in trace
Change-Id: Ib42a562dcbffda41ac942e782d03718056af2e91

libs/gui/Surface.cpp

diff --git a/libs/gui/Surface.cpp b/libs/gui/Surface.cpp
index e8aac2f..fef83ea 100644
--- a/libs/gui/Surface.cpp
+++ b/libs/gui/Surface.cpp
@@ -30,9 +30,10 @@
 #include <android/gui/DisplayStatInfo.h>
 #include <android/native_window.h>
 
+#include <gui/TraceUtils.h>
 #include <utils/Log.h>
-#include <utils/Trace.h>
 #include <utils/NativeHandle.h>
+#include <utils/Trace.h>
 
 #include <ui/DynamicDisplayInfo.h>
 #include <ui/Fence.h>
@@ -637,7 +638,7 @@
 }
 
 int Surface::dequeueBuffer(android_native_buffer_t** buffer, int* fenceFd) {
-    ATRACE_CALL();
+    ATRACE_FORMAT("dequeueBuffer - %s", getDebugName());
     ALOGV("Surface::dequeueBuffer");
 
     IGraphicBufferProducer::DequeueBufferInput dqInput;
@@ -2651,4 +2652,12 @@
     mSurfaceControlHandle = nullptr;
 }
 
+const char* Surface::getDebugName() {
+    std::unique_lock lock{mNameMutex};
+    if (mName.empty()) {
+        mName = getConsumerName();
+    }
+    return mName.c_str();
+}
+
 }; // namespace android