commit 072233fa73f058a43986809b01a65373d26f6251
author Ana Krulec <akrulec@google.com> Fri Aug 10 15:03:23 2018 -0700
committer Ana Krulec <akrulec@google.com> Mon Aug 13 16:21:29 2018 -0700
tree a26f75493dba7f5ae11d272a2ab0891afed6a25c
parent 0c6385a1fb6480c855b0eb3aeff1347c73fbff7b

SF: Move DispSyncSource to STL plus thread safety annotations

This change is part of go/surface-flinger-scheduler

Test: No added tests for now.

Change-Id: I74b53d27999150bad925ab6d2d9ba0cad78a838c

services/surfaceflinger/Scheduler/DispSyncSource.h

diff --git a/services/surfaceflinger/Scheduler/DispSyncSource.h b/services/surfaceflinger/Scheduler/DispSyncSource.h
index 1915b5a..0fd84a2 100644
--- a/services/surfaceflinger/Scheduler/DispSyncSource.h
+++ b/services/surfaceflinger/Scheduler/DispSyncSource.h
@@ -15,8 +15,8 @@
  */
 #pragma once
 
-#include <utils/Mutex.h>
-#include <utils/String8.h>
+#include <mutex>
+#include <string>
 
 #include "DispSync.h"
 #include "EventThread.h"
@@ -39,21 +39,20 @@
     virtual void onDispSyncEvent(nsecs_t when);
 
     const char* const mName;
-
-    int mValue;
+    int mValue = 0;
 
     const bool mTraceVsync;
-    const String8 mVsyncOnLabel;
-    const String8 mVsyncEventLabel;
+    const std::string mVsyncOnLabel;
+    const std::string mVsyncEventLabel;
 
     DispSync* mDispSync;
 
-    Mutex mCallbackMutex; // Protects the following
-    VSyncSource::Callback* mCallback = nullptr;
+    std::mutex mCallbackMutex;
+    VSyncSource::Callback* mCallback GUARDED_BY(mCallbackMutex) = nullptr;
 
-    Mutex mVsyncMutex; // Protects the following
-    nsecs_t mPhaseOffset;
-    bool mEnabled;
+    std::mutex mVsyncMutex;
+    nsecs_t mPhaseOffset GUARDED_BY(mVsyncMutex);
+    bool mEnabled GUARDED_BY(mVsyncMutex) = false;
 };
 
 } // namespace android
\ No newline at end of file