Remove unused TimerData that generates errors

tools/bbh_shootout.cpp

 /*
  * Copyright 2013 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 "LazyDecodeBitmap.h"
 #include "PictureBenchmark.h"
@@ skipping 279 matching lines @@
             break;
     }
     do_benchmark_work(&renderer, benchControl.fType,
             path, pic, numRecordings, "recording", timer);
 }
 
 /**
  * Takes argc,argv along with one of the benchmark functions defined above.
  * Will loop along all skp files and perform measurments.
  *
  * Returns a SkScalar representing CPU time taken during benchmark.

[mtklein, 2014/03/05 15:04:53]

While we're here, this comment seems at least two revisions obsolete.  Delete?

[iancottrell, 2014/03/05 15:41:11]

Done.

  * As a side effect, it spits the timer result to stdout.
  * Will return -1.0 on error.
  */
-static bool benchmark_loop(
+static void benchmark_loop(
         int argc,
         char **argv,
         const BenchmarkControl& benchControl,
         SkTArray<Histogram>& histogram) {
     static const SkString timeFormat("%f");

[mtklein, 2014/03/05 15:04:53]

Now unused?

[iancottrell, 2014/03/05 15:41:11]

Done.

-    TimerData timerData(argc - 1);
     for (int index = 1; index < argc; ++index) {
         BenchTimer timer;
         SkString path(argv[index]);
         SkAutoTUnref<SkPicture> pic(pic_from_path(path.c_str()));
         if (NULL == pic) {
             SkDebugf("Couldn't create picture. Ignoring path: %s\n", path.c_str());
             continue;
         }
         benchControl.fFunction(benchControl, path, pic, &timer);
-
         histogram[index - 1].fPath = path;
         histogram[index - 1].fCpuTime = SkDoubleToScalar(timer.fCpu);
     }
-
-    const SkString timerResult = timerData.getResult(
-            /*doubleFormat = */ timeFormat.c_str(),
-            /*result = */ TimerData::kAvg_Result,
-            /*configName = */ benchControl.fName.c_str(),
-            /*timerFlags = */ TimerData::kCpu_Flag);
-
-    const char findStr[] = "= ";
-    int pos = timerResult.find(findStr);
-    if (-1 == pos) {
-        SkDebugf("Unexpected output from TimerData::getResult(...). Unable to parse.\n");
-        return false;
-    }
-
-    SkScalar cpuTime = SkDoubleToScalar(atof(timerResult.c_str() + pos + sizeof(findStr) - 1));
-    if (cpuTime == 0) {  // atof returns 0.0 on error.
-        SkDebugf("Unable to read value from timer result.\n");
-        return false;
-    }
-    return true;
 }
 
 int tool_main(int argc, char** argv);
 int tool_main(int argc, char** argv) {
     SkAutoGraphics ag;
     SkString usage;
     usage.printf("Usage: filename [filename]*\n");
 
     if (argc < 2) {
         SkDebugf("%s\n", usage.c_str());
         return -1;
     }
 
     SkTArray<Histogram> histograms[kNumBenchmarks];
 
     for (size_t i = 0; i < kNumBenchmarks; ++i) {
         histograms[i].reset(argc - 1);
-        bool success = benchmark_loop(
+        benchmark_loop(
                 argc, argv,

[mtklein, 2014/03/05 15:04:53]

Funky alignment now.

[iancottrell, 2014/03/05 15:41:11]

Done.

                 BenchmarkControl::Make(i),
                 histograms[i]);
-        if (!success) {
-            SkDebugf("benchmark_loop failed at index %d\n", i);
-        }
     }
 
     // Output gnuplot readable histogram data..
     const char* pbTitle = "bbh_shootout_playback.dat";
     const char* recTitle = "bbh_shootout_record.dat";
     SkFILEWStream playbackOut(pbTitle);
     SkFILEWStream recordOut(recTitle);
     recordOut.writeText("# ");
     playbackOut.writeText("# ");
     for (size_t i = 0; i < kNumBenchmarks; ++i) {
@@ skipping 53 matching lines @@
     SkDebugf("\nWrote data to gnuplot-readable files: %s %s\n", pbTitle, recTitle);
 
     return 0;
 }
 
 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
 int main(int argc, char** argv) {
     return tool_main(argc, argv);
 }
 #endif