Revert of PictureBenchmark JSON logging

tools/bench_pictures_main.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 "BenchTimer.h"
 #include "CopyTilesRenderer.h"
 #include "LazyDecodeBitmap.h"
 #include "PictureBenchmark.h"
 #include "PictureRenderingFlags.h"
 #include "SkBenchLogger.h"
 #include "SkCommandLineFlags.h"
-#include "SkData.h"
 #include "SkDiscardableMemoryPool.h"
 #include "SkGraphics.h"
 #include "SkImageDecoder.h"
 #include "SkMath.h"
 #include "SkOSFile.h"
 #include "SkPicture.h"
 #include "SkStream.h"
 #include "picture_utils.h"
-#include "PictureResultsWriter.h"
 
 SkBenchLogger gLogger;
-PictureResultsLoggerWriter gLogWriter(&gLogger);
-PictureResultsMultiWriter gWriter;
 
 // Flags used by this file, in alphabetical order.
 DEFINE_bool(countRAM, false, "Count the RAM used for bitmap pixels in each skp file");
 DECLARE_bool(deferImageDecoding);
 DEFINE_string(filter, "",
         "type:flag : Enable canvas filtering to disable a paint flag, "
         "use no blur or low quality blur, or use no hinting or "
         "slight hinting. For all flags except AAClip, specify the "
         "type of primitive to effect, or choose all. for AAClip "
         "alone, the filter affects all clips independent of type. "
         "Specific flags are listed above.");
 DEFINE_string(logFile, "", "Destination for writing log output, in addition to stdout.");
 DEFINE_bool(logPerIter, false, "Log each repeat timer instead of mean.");
-#ifdef SK_BUILD_JSON_WRITER
-DEFINE_string(jsonLog, "", "Destination for writing JSON data.");
-#endif
 DEFINE_bool(min, false, "Print the minimum times (instead of average).");
 DECLARE_int32(multi);
 DECLARE_string(readPath);
 DEFINE_int32(repeat, 1, "Set the number of times to repeat each test.");
 DEFINE_bool(timeIndividualTiles, false, "Report times for drawing individual tiles, rather than "
             "times for drawing the whole page. Requires tiled rendering.");
 DEFINE_bool(purgeDecodedTex, false, "Purge decoded and GPU-uploaded textures "
             "after each iteration.");
 DEFINE_string(timers, "c", "[wcgWC]*: Display wall, cpu, gpu, truncated wall or truncated cpu time"
               " for each picture.");
@@ skipping 132 matching lines @@
     if (NULL == picture.get()) {
         SkString err;
         err.printf("Could not read an SkPicture from %s\n", inputPath.c_str());
         gLogger.logError(err);
         return false;
     }
 
     SkString filename;
     sk_tools::get_basename(&filename, inputPath);
 
-    gWriter.bench(filename.c_str(), picture->width(), picture->height());
+    SkString result;
+    result.printf("running bench [%i %i] %s ", picture->width(), picture->height(),
+                  filename.c_str());
+    gLogger.logProgress(result);
 
     benchmark.run(picture);
 
 #if SK_LAZY_CACHE_STATS
     if (FLAGS_trackDeferredCaching) {
         int cacheHits = pool->getCacheHits();
         int cacheMisses = pool->getCacheMisses();
         pool->resetCacheHitsAndMisses();
         SkString hitString;
         hitString.printf("Cache hit rate: %f\n", (double) cacheHits / (cacheHits + cacheMisses));
@@ skipping 149 matching lines @@
     renderer->setDrawFilters(drawFilters, filtersName(drawFilters));
     if (FLAGS_logPerIter) {
         benchmark->setTimerResultType(TimerData::kPerIter_Result);
     } else if (FLAGS_min) {
         benchmark->setTimerResultType(TimerData::kMin_Result);
     } else {
         benchmark->setTimerResultType(TimerData::kAvg_Result);
     }
     benchmark->setRenderer(renderer);
     benchmark->setRepeats(FLAGS_repeat);
-    benchmark->setWriter(&gWriter);
+    benchmark->setLogger(&gLogger);
 }
 
 static int process_input(const char* input,
                          sk_tools::PictureBenchmark& benchmark) {
     SkString inputAsSkString(input);
     SkOSFile::Iter iter(input, "skp");
     SkString inputFilename;
     int failures = 0;
     if (iter.next(&inputFilename)) {
         do {
@@ skipping 36 matching lines @@
             SkString str;
             str.printf("Could not open %s for writing.\n", FLAGS_logFile[0]);
             gLogger.logError(str);
             // TODO(borenet): We're disabling this for now, due to
             // write-protected Android devices.  The very short-term
             // solution is to ignore the fact that we have no log file.
             //exit(-1);
         }
     }
 
-#ifdef SK_BUILD_JSON_WRITER
-    SkAutoTDelete<PictureJSONResultsWriter> jsonWriter;
-    if (FLAGS_jsonLog.count() == 1) {
-        jsonWriter.reset(SkNEW(PictureJSONResultsWriter(FLAGS_jsonLog[0])));
-        gWriter.add(jsonWriter.get());
-    }
-
-#endif
-    gWriter.add(&gLogWriter);
-
 
 #if SK_ENABLE_INST_COUNT
     gPrintInstCount = true;
 #endif
     SkAutoGraphics ag;
 
     sk_tools::PictureBenchmark benchmark;
 
     setup_benchmark(&benchmark);
 
     int failures = 0;
     for (int i = 0; i < FLAGS_readPath.count(); ++i) {
         failures += process_input(FLAGS_readPath[i], benchmark);
     }
 
     if (failures != 0) {
         SkString err;
         err.printf("Failed to run %i benchmarks.\n", failures);
         gLogger.logError(err);
         return 1;
     }
 #if SK_LAZY_CACHE_STATS
     if (FLAGS_trackDeferredCaching) {
         SkDebugf("Total cache hit rate: %f\n",
                  (double) gTotalCacheHits / (gTotalCacheHits + gTotalCacheMisses));
     }
 #endif
-    gWriter.end();
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif