commit 454c55240d50de730f023e429ab40b82fd3c440f
author Alec Mouri <alecmouri@google.com> Mon Sep 23 14:05:56 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 23 14:05:56 2024 +0000
tree 5fb9e16dff42efcf360904311f33fbbb7c0e4ba5
parent 3118f969f488b738de1976917a0944705c209173

Revert "Add some tracing for release fences"

This reverts commit 3118f969f488b738de1976917a0944705c209173.

Reason for revert: b/368514217

Change-Id: Id69a0bd8850d2b6c093f7ce78817cdf5705215b1

libs/gui/FenceMonitor.cpp

diff --git a/libs/gui/FenceMonitor.cpp b/libs/gui/FenceMonitor.cpp
index e38f1a8..230c81a 100644
--- a/libs/gui/FenceMonitor.cpp
+++ b/libs/gui/FenceMonitor.cpp
@@ -25,18 +25,9 @@
 namespace android::gui {
 
 FenceMonitor::FenceMonitor(const char* name) : mName(name), mFencesQueued(0), mFencesSignaled(0) {
-    mThread = std::thread(&FenceMonitor::loop, this);
-}
-
-FenceMonitor::~FenceMonitor() {
-    {
-        std::lock_guard<std::mutex> lock(mMutex);
-        mStopped = true;
-        mCondition.notify_one();
-    }
-    if (mThread.joinable()) {
-        mThread.join();
-    }
+    std::thread thread(&FenceMonitor::loop, this);
+    pthread_setname_np(thread.native_handle(), mName);
+    thread.detach();
 }
 
 void FenceMonitor::queueFence(const sp<Fence>& fence) {
@@ -44,26 +35,24 @@
 
     std::lock_guard<std::mutex> lock(mMutex);
     if (fence->getSignalTime() != Fence::SIGNAL_TIME_PENDING) {
-        snprintf(message, sizeof(message), "%s fence %u has signaled", mName.c_str(),
-                 mFencesQueued);
+        snprintf(message, sizeof(message), "%s fence %u has signaled", mName, mFencesQueued);
         ATRACE_NAME(message);
         // Need an increment on both to make the trace number correct.
         mFencesQueued++;
         mFencesSignaled++;
         return;
     }
-    snprintf(message, sizeof(message), "Trace %s fence %u", mName.c_str(), mFencesQueued);
+    snprintf(message, sizeof(message), "Trace %s fence %u", mName, mFencesQueued);
     ATRACE_NAME(message);
 
     mQueue.push_back(fence);
     mCondition.notify_one();
     mFencesQueued++;
-    ATRACE_INT(mName.c_str(), int32_t(mQueue.size()));
+    ATRACE_INT(mName, int32_t(mQueue.size()));
 }
 
 void FenceMonitor::loop() {
-    pthread_setname_np(pthread_self(), mName.c_str());
-    while (!mStopped) {
+    while (true) {
         threadLoop();
     }
 }
@@ -73,18 +62,15 @@
     uint32_t fenceNum;
     {
         std::unique_lock<std::mutex> lock(mMutex);
-        while (mQueue.empty() && !mStopped) {
+        while (mQueue.empty()) {
             mCondition.wait(lock);
         }
-        if (mStopped) {
-            return;
-        }
         fence = mQueue[0];
         fenceNum = mFencesSignaled;
     }
     {
         char message[64];
-        snprintf(message, sizeof(message), "waiting for %s %u", mName.c_str(), fenceNum);
+        snprintf(message, sizeof(message), "waiting for %s %u", mName, fenceNum);
         ATRACE_NAME(message);
 
         status_t result = fence->waitForever(message);
@@ -96,8 +82,8 @@
         std::lock_guard<std::mutex> lock(mMutex);
         mQueue.pop_front();
         mFencesSignaled++;
-        ATRACE_INT(mName.c_str(), int32_t(mQueue.size()));
+        ATRACE_INT(mName, int32_t(mQueue.size()));
     }
 }
 
-} // namespace android::gui
+} // namespace android::gui
\ No newline at end of file