Revert of PictureBenchmark JSON logging

tools/PictureBenchmark.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
+#include "SkBenchLogger.h"
 #include "BenchTimer.h"
 #include "PictureBenchmark.h"
 #include "SkCanvas.h"
 #include "SkPicture.h"
 #include "SkString.h"
 #include "picture_utils.h"
 
 namespace sk_tools {
 
 PictureBenchmark::PictureBenchmark()
 : fRepeats(1)
+, fLogger(NULL)
 , fRenderer(NULL)
 , fTimerResult(TimerData::kAvg_Result)
 , fTimerTypes(0)
 , fTimeIndividualTiles(false)
 , fPurgeDecodedTex(false)
 , fPreprocess(false)
-, fWriter(NULL)
 {}
 
 PictureBenchmark::~PictureBenchmark() {
     SkSafeUnref(fRenderer);
 }
 
 void PictureBenchmark::setTimersToShow(bool wall,
                                        bool truncatedWall,
                                        bool cpu,
                                        bool truncatedCpu,
                                        bool gpu) {
     fTimerTypes = 0;
     fTimerTypes |= wall ? TimerData::kWall_Flag : 0;
     fTimerTypes |= truncatedWall ? TimerData::kTruncatedWall_Flag : 0;
     fTimerTypes |= cpu ? TimerData::kCpu_Flag : 0;
     fTimerTypes |= truncatedCpu ? TimerData::kTruncatedCpu_Flag : 0;
     fTimerTypes |= gpu ? TimerData::kGpu_Flag : 0;
 }
 
 BenchTimer* PictureBenchmark::setupTimer(bool useGLTimer) {
 #if SK_SUPPORT_GPU
     if (useGLTimer && fRenderer != NULL && fRenderer->isUsingGpuDevice()) {
         return SkNEW_ARGS(BenchTimer, (fRenderer->getGLContext()));
     }
 #endif
     return SkNEW_ARGS(BenchTimer, (NULL));
 }
 
+void PictureBenchmark::logProgress(const char msg[]) {
+    if (fLogger != NULL) {
+        fLogger->logProgress(msg);
+    }
+}
+
 PictureRenderer* PictureBenchmark::setRenderer(sk_tools::PictureRenderer* renderer) {
     SkRefCnt_SafeAssign(fRenderer, renderer);
     return renderer;
 }
 
 void PictureBenchmark::run(SkPicture* pict) {
     SkASSERT(pict);
     if (NULL == pict) {
         return;
     }
@@ skipping 59 matching lines @@
         TiledPictureRenderer* tiledRenderer = fRenderer->getTiledRenderer();
         SkASSERT(tiledRenderer && tiledRenderer->supportsTimingIndividualTiles());
         if (NULL == tiledRenderer || !tiledRenderer->supportsTimingIndividualTiles()) {
             return;
         }
         int xTiles, yTiles;
         if (!tiledRenderer->tileDimensions(xTiles, yTiles)) {
             return;
         }
 
+        // Insert a newline so that each tile is reported on its own line (separate from the line
+        // that describes the skp being run).
+        this->logProgress("\n");
+
         int x, y;
         while (tiledRenderer->nextTile(x, y)) {
             // There are two timers, which will behave slightly differently:
             // 1) longRunningTimer, along with perTileTimerData, will time how long it takes to draw
             // one tile fRepeats times, and take the average. As such, it will not respect the
             // logPerIter or printMin options, since it does not know the time per iteration. It
             // will also be unable to call flush() for each tile.
             // The goal of this timer is to make up for a system timer that is not precise enough to
             // measure the small amount of time it takes to draw one tile once.
             //
@@ skipping 23 matching lines @@
                     if (fPurgeDecodedTex) {
                         fRenderer->purgeTextures();
                     }
                 }
                 longRunningTimer->truncatedEnd();
                 tiledRenderer->resetState(true);       // flush, swapBuffers and Finish
                 longRunningTimer->end();
                 SkAssertResult(longRunningTimerData.appendTimes(longRunningTimer.get()));
             }
 
-            fWriter->tileConfig(tiledRenderer->getConfigName());
-            fWriter->tileMeta(x, y, xTiles, yTiles);
+            SkString configName = tiledRenderer->getConfigName();
+            configName.appendf(": tile [%i,%i] out of [%i,%i]", x, y, xTiles, yTiles);
 
             // TODO(borenet): Turn off per-iteration tile time reporting for now.
             // Avoiding logging the time for every iteration for each tile cuts
             // down on data file size by a significant amount. Re-enable this once
             // we're loading the bench data directly into a data store and are no
             // longer generating SVG graphs.
 #if 0
-            fWriter->tileData(
-                    &perTileTimerData, 
-                    timeFormat.c_str(), 
-                    fTimerResult,
-                    timerTypes);
+            SkString result = perTileTimerData.getResult(timeFormat.c_str(), fTimerResult,
+                                                         configName.c_str(), timerTypes);
+            result.append("\n");
+            this->logProgress(result.c_str());
 #endif
 
             if (fPurgeDecodedTex) {
-                fWriter->addTileFlag(PictureResultsWriter::kPurging);
+                configName.append(" <withPurging>");
             }
-            fWriter->addTileFlag(PictureResultsWriter::kAvg);
-            fWriter->tileData(
-                &longRunningTimerData, 
+            configName.append(" <averaged>");
+            SkString longRunningResult = longRunningTimerData.getResult(
                 tiledRenderer->getNormalTimeFormat().c_str(),
                 TimerData::kAvg_Result,
-                timerTypes,
-                numInnerLoops);
+                configName.c_str(), timerTypes, numInnerLoops);
+            longRunningResult.append("\n");
+            this->logProgress(longRunningResult.c_str());
         }
     } else {
         SkAutoTDelete<BenchTimer> longRunningTimer(this->setupTimer());
         TimerData longRunningTimerData(numOuterLoops);
 
         for (int outer = 0; outer < numOuterLoops; ++outer) {
             SkAutoTDelete<BenchTimer> perRunTimer(this->setupTimer(false));
             TimerData perRunTimerData(numInnerLoops);
 
             longRunningTimer->start();
@@ skipping 17 matching lines @@
                 if (fPurgeDecodedTex) {
                     fRenderer->purgeTextures();
                 }
             }
             longRunningTimer->truncatedEnd();
             fRenderer->resetState(true);        // flush, swapBuffers and Finish
             longRunningTimer->end();
             SkAssertResult(longRunningTimerData.appendTimes(longRunningTimer.get()));
         }
 
-        fWriter->tileConfig(fRenderer->getConfigName());
+        SkString configName = fRenderer->getConfigName();
         if (fPurgeDecodedTex) {
-            fWriter->addTileFlag(PictureResultsWriter::kPurging);
+            configName.append(" <withPurging>");
         }
 
         // Beware - since the per-run-timer doesn't ever include a glFinish it can
         // report a lower time then the long-running-timer
 #if 0
-        fWriter->tileData(
-                &perRunTimerData,
-                timeFormat.c_str(),
-                fTimerResult,
-                timerTypes);
+        SkString result = perRunTimerData.getResult(timeFormat.c_str(),
+                                                    fTimerResult,
+                                                    configName.c_str(),
+                                                    timerTypes);
+        result.append("\n");
+
+        this->logProgress(result.c_str());
 #else
-        fWriter->tileData(
-                &longRunningTimerData,
-                timeFormat.c_str(),
-                fTimerResult,
-                timerTypes,
-                numInnerLoops);
+        SkString result = longRunningTimerData.getResult(timeFormat.c_str(),
+                                                            fTimerResult,
+                                                            configName.c_str(),
+                                                            timerTypes,
+                                                            numInnerLoops);
+        result.append("\n");
+        this->logProgress(result.c_str());
 #endif
     }
 
     fRenderer->end();
 }
 
 }