use atomic for global test counters

TSAN is failing because multiple threads are incrementing the same global [email protected] Bug: skia: Change-Id: I9c3bc6bb4aa7cbe7ced5b3080790d3c4ad1ff798 Reviewed-on: https://skia-review.googlesource.com/146446 Commit-Queue: Cary Clark <[email protected]> Reviewed-by: Cary Clark <[email protected]> Auto-Submit: Cary Clark <[email protected]>
HistoryFork · Aug 9, 2018 · 8af4c40 · 8af4c40
1 parent 81aa38d
commit 8af4c40
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/tests/PathOpsChalkboardTest.cpp b/tests/PathOpsChalkboardTest.cpp
@@ -7,10 +7,11 @@
 #include "PathOpsExtendedTest.h"
 #include "PathOpsThreadedCommon.h"
 #include "SkRandom.h"
+#include <atomic>
 
 #define TEST(name) { name, #name }
 
-static int gTestNo = 0;
+static std::atomic<int> gTestNo{0};
 
 static void chalkboard(skiatest::Reporter* reporter, uint64_t testlines) {
     SkPath path;

diff --git a/tests/PathOpsOpCircleThreadedTest.cpp b/tests/PathOpsOpCircleThreadedTest.cpp
@@ -8,9 +8,10 @@
 #include "PathOpsExtendedTest.h"
 #include "PathOpsThreadedCommon.h"
 #include "SkString.h"
+#include <atomic>
 
 static int loopNo = 4;
-static int gCirclesTestNo = 0;
+static std::atomic<int> gCirclesTestNo{0};
 
 static void testOpCirclesMain(PathOpsThreadState* data) {
         SkASSERT(data);

diff --git a/tests/PathOpsOpCubicThreadedTest.cpp b/tests/PathOpsOpCubicThreadedTest.cpp
@@ -8,9 +8,10 @@
 #include "PathOpsExtendedTest.h"
 #include "PathOpsThreadedCommon.h"
 #include "SkString.h"
+#include <atomic>
 
 static int loopNo = 158;
-static int gCubicsTestNo = 0;
+static std::atomic<int> gCubicsTestNo{0};
 
 static void testOpCubicsMain(PathOpsThreadState* data) {
 #if DEBUG_SHOW_TEST_NAME

diff --git a/tests/PathOpsOpLoopThreadedTest.cpp b/tests/PathOpsOpLoopThreadedTest.cpp
@@ -8,6 +8,7 @@
 #include "PathOpsExtendedTest.h"
 #include "PathOpsThreadedCommon.h"
 #include "SkString.h"
+#include <atomic>
 
 static int loopNo = 17;
 
@@ -27,7 +28,7 @@ static void add_point(SkString* str, SkScalar x, SkScalar y) {
     }
 }
 
-static int gLoopsTestNo = 0;
+static std::atomic<int> gLoopsTestNo{0};
 
 static void testOpLoopsMain(PathOpsThreadState* data) {
 #if DEBUG_SHOW_TEST_NAME

diff --git a/tests/PathOpsOpRectThreadedTest.cpp b/tests/PathOpsOpRectThreadedTest.cpp
@@ -8,6 +8,7 @@
 #include "PathOpsExtendedTest.h"
 #include "PathOpsThreadedCommon.h"
 #include "SkString.h"
+#include <atomic>
 
 // four rects, of four sizes
 // for 3 smaller sizes, tall, wide
@@ -17,7 +18,7 @@
 // cw or ccw (1 bit)
 
 static int loopNo = 6;
-static int gRectsTestNo = 0;
+static std::atomic<int> gRectsTestNo{0};
 
 static void testPathOpsRectsMain(PathOpsThreadState* data)
 {
@@ -105,7 +106,7 @@ DEF_TEST(PathOpsRectsThreaded, reporter) {
     testRunner.render();
 }
 
-static int gFastTestNo = 0;
+static std::atomic<int> gFastTestNo{0};
 
 static void testPathOpsFastMain(PathOpsThreadState* data)
 {

diff --git a/tests/PathOpsTigerTest.cpp b/tests/PathOpsTigerTest.cpp
@@ -7,6 +7,7 @@
 #include "PathOpsDebug.h"
 #include "PathOpsExtendedTest.h"
 #include "PathOpsThreadedCommon.h"
+#include <atomic>
 
 #define TEST(name) { name, #name }
 
@@ -133,7 +134,7 @@ path.close();
 testSimplify(reporter, path, filename);
 }
 
-int gTigerTests = 0;
+static std::atomic<int> gTigerTests{0};
 
 static void tiger8a_x(skiatest::Reporter* reporter, uint64_t testlines) {
     SkPath path;