DM tweaks

dm/DMReporter.cpp

 #include "DMReporter.h"
 
+#include "SkDynamicAnnotations.h"
 #include "SkCommandLineFlags.h"
 #include "OverwriteLine.h"
 
 DEFINE_bool2(quiet, q, false, "If true, don't print status updates.");
 DEFINE_bool2(verbose, v, false, "If true, print status updates one-per-line.");
 
 namespace DM {
 
-void Reporter::finish(SkString name, SkMSec timeMs) {
-    sk_atomic_inc(&fFinished);
-
+void Reporter::printStatus(SkString name, SkMSec timeMs) const {
     if (FLAGS_quiet) {
         return;
     }
 
+    // It's okay if these are a little off---they're just for show---so we can read unprotectedly.
+    const int32_t failed  = SK_ANNOTATE_UNPROTECTED_READ(fFailed);
+    const int32_t pending = SK_ANNOTATE_UNPROTECTED_READ(fPending) - 1;
+
     SkString status;
-    status.printf("%s%d tasks left",
-                  FLAGS_verbose ? "\n" : kSkOverwriteLine,
-                  this->started() - this->finished());
-    const int failed = this->failed();
+    status.printf("%s%d tasks left", FLAGS_verbose ? "\n" : kSkOverwriteLine, pending);
     if (failed > 0) {
         status.appendf(", %d failed", failed);
     }
     if (FLAGS_verbose) {
         status.appendf("\t%5dms %s", timeMs, name.c_str());
     }
     SkDebugf("%s", status.c_str());
 }
 
-int32_t Reporter::failed() const {
-    SkAutoMutexAcquire reader(&fMutex);
-    return fFailures.count();
-}
+void Reporter::fail(SkString msg) {
+    sk_atomic_inc(&fFailed);
 
-void Reporter::fail(SkString msg) {
     SkAutoMutexAcquire writer(&fMutex);
     fFailures.push_back(msg);
 }
 
 void Reporter::getFailures(SkTArray<SkString>* failures) const {
     SkAutoMutexAcquire reader(&fMutex);
     *failures = fFailures;
 }
 
 }  // namespace DM