In skia_test.cc, atomics -> mutex.

tests/skia_test.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCommandLineFlags.h"
 #include "SkGraphics.h"
 #include "SkOSFile.h"
@@ skipping 66 matching lines @@
     virtual bool allowThreaded() const SK_OVERRIDE {
         return fAllowThreaded;
     }
 
     virtual bool verbose() const SK_OVERRIDE {
         return fVerbose;
     }
 
 protected:
     virtual void onStart(Test* test) {
-        const int index = sk_atomic_inc(&fNextIndex)+1;
-        const int pending = sk_atomic_inc(&fPending)+1;
-        SkDebugf("[%3d/%3d] (%d) %s\n", index, fTotal, pending, test->getName());
+        SkAutoMutexAcquire lock(fStartEndMutex);
+        fNextIndex++;
+        fPending++;
+        SkDebugf("[%3d/%3d] (%d) %s\n", fNextIndex, fTotal, fPending, test->getName());
     }
+
     virtual void onReportFailed(const SkString& desc) {
         SkDebugf("\tFAILED: %s\n", desc.c_str());
     }
 
     virtual void onEnd(Test* test) {
+        SkAutoMutexAcquire lock(fStartEndMutex);
         if (!test->passed()) {
             SkDebugf("---- %s FAILED\n", test->getName());
         }
 
-        sk_atomic_dec(&fPending);
+        fPending--;
         if (fNextIndex == fTotal) {
             // Just waiting on straggler tests.  Shame them by printing their name and runtime.
             SkDebugf("          (%d) %5.1fs %s\n",
                      fPending, test->elapsedMs() / 1e3, test->getName());
         }
     }
 
 private:
+    SkMutex fStartEndMutex;  // Guards fNextIndex and fPending.
     int32_t fNextIndex;
     int32_t fPending;
+
+    // Once the tests get going, these are logically const.
     int fTotal;
     bool fAllowExtendedTest;
     bool fAllowThreaded;
     bool fVerbose;
 };
 
 DEFINE_string2(match, m, NULL, "[~][^]substring[$] [...] of test name to run.\n" \
                                "Multiple matches may be separated by spaces.\n" \
                                "~ causes a matching test to always be skipped\n" \
                                "^ requires the start of the test to match\n" \
@@ skipping 143 matching lines @@
     GpuTest::DestroyContexts();
 
     return (failCount == 0) ? 0 : 1;
 }
 
 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif