commit d4de1742cef5c32facf95a7f30d0f0b0ade9b752
author Bart Van Assche <bvanassche@google.com> Tue Nov 22 09:51:19 2022 -0800
committer Bart Van Assche <bvanassche@google.com> Tue Nov 29 09:40:35 2022 -0800
tree 6250fb941631fc7899cc29a67f08c11d90364926
parent f97b7b4a806bbbe056abc07c4c3750f9cfb7a62f

Make the test code compatible with -Wthread-safety

Make it clear to the compiler that gMutex is held while reading or
writing gReady.

Bug: 260725458
Change-Id: I197aca02c0e309c2c53b4e1995e9175b72109cb5
Signed-off-by: Bart Van Assche <bvanassche@google.com>

tests/stresstest/MultithreadTest.cpp

diff --git a/tests/stresstest/MultithreadTest.cpp b/tests/stresstest/MultithreadTest.cpp
index 560b517..d32d0b4 100644
--- a/tests/stresstest/MultithreadTest.cpp
+++ b/tests/stresstest/MultithreadTest.cpp
@@ -21,17 +21,19 @@
 #include <random>
 #include <thread>
 
+#include <android-base/thread_annotations.h>
 #include <cutils/log.h>
 #include <gtest/gtest.h>
 
 #include "minikin/FontCollection.h"
 #include "minikin/Macros.h"
 #include "minikin/MinikinPaint.h"
-
 #include "FontTestUtils.h"
 #include "MinikinInternal.h"
 #include "PathUtils.h"
 
+using android::base::ScopedLockAssertion;
+
 namespace minikin {
 
 constexpr int LAYOUT_COUNT_PER_COLLECTION = 500;
@@ -63,7 +65,7 @@
     {
         // Wait until all threads are created.
         std::unique_lock<std::mutex> lock(gMutex);
-        gCv.wait(lock, [] { return gReady; });
+        gCv.wait(lock, []() EXCLUSIVE_LOCKS_REQUIRED(gMutex) { return gReady; });
     }
 
     std::mt19937 mt(tid);
@@ -90,7 +92,7 @@
     std::vector<std::thread> threads;
 
     {
-        std::unique_lock<std::mutex> lock(gMutex);
+        ScopedLockAssertion lock(gMutex);
         threads.reserve(NUM_THREADS);
         for (int i = 0; i < NUM_THREADS; ++i) {
             threads.emplace_back(&thread_main, i);