commit c789c9055896adfc78843b0a200bafe11177c9cd
author Vishnu Nair <vishnun@google.com> Tue Feb 16 20:05:14 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 16 20:05:14 2021 +0000
tree e49343255a169ce514f73dcbd87e3525659585a2
parent 30230614f6dfd6bc4a50311eb12f07cd1c995e60
parent c96ad66de2d901ce6c9acbe5e00cef78b77c7c12

Merge "Grab the tracing lock before calling the trace runner" into sc-dev

services/surfaceflinger/SurfaceTracing.cpp

diff --git a/services/surfaceflinger/SurfaceTracing.cpp b/services/surfaceflinger/SurfaceTracing.cpp
index 1d1f0c5..b4d8a9a 100644
--- a/services/surfaceflinger/SurfaceTracing.cpp
+++ b/services/surfaceflinger/SurfaceTracing.cpp
@@ -71,12 +71,14 @@
 }
 
 void SurfaceTracing::notify(const char* where) {
+    std::scoped_lock lock(mTraceLock);
     if (mEnabled) {
         runner->notify(where);
     }
 }
 
 void SurfaceTracing::notifyLocked(const char* where) {
+    std::scoped_lock lock(mTraceLock);
     if (mEnabled) {
         runner->notifyLocked(where);
     }

services/surfaceflinger/SurfaceTracing.h

diff --git a/services/surfaceflinger/SurfaceTracing.h b/services/surfaceflinger/SurfaceTracing.h
index 497ebd3..15a503d 100644
--- a/services/surfaceflinger/SurfaceTracing.h
+++ b/services/surfaceflinger/SurfaceTracing.h
@@ -81,8 +81,8 @@
 
     SurfaceFlinger& mFlinger;
     mutable std::mutex mTraceLock;
-    bool mEnabled = false;
-    std::unique_ptr<Runner> runner;
+    bool mEnabled GUARDED_BY(mTraceLock) = false;
+    std::unique_ptr<Runner> runner GUARDED_BY(mTraceLock);
 
     struct Config {
         uint32_t flags = TRACE_CRITICAL | TRACE_INPUT | TRACE_SYNC;