Do timer allocation and string building outside of bench loops

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 250 matching lines @@
  * Returns a SkScalar representing CPU time taken during benchmark.
  * As a side effect, it spits the timer result to stdout.
  * Will return -1.0 on error.
  */
 static bool benchmark_loop(
         int argc,
         char **argv,
         const BenchmarkControl& benchControl,
         SkTArray<Histogram>& histogram) {
     static const SkString timeFormat("%f");
-    TimerData timerData(timeFormat, timeFormat);
+    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.fType, benchControl.fTileSize, path, pic, &timer);
-        timerData.appendTimes(&timer, argc - 1 == index);
+        SkAssertResult(timerData.appendTimes(&timer));
 
         histogram[index - 1].fPath = path;
         histogram[index - 1].fCpuTime = SkDoubleToScalar(timer.fCpu);
     }
 
     const SkString timerResult = timerData.getResult(
-            /*logPerIter = */ false,
-            /*printMin = */ false,
-            /*repeatDraw = */ 1,
+            /*doubleFormat = */ timeFormat.c_str(),
+            /*result = */ TimerData::kAvg_Result,
             /*configName = */ benchControl.fName.c_str(),
-            /*showWallTime = */ false,
-            /*showTruncatedWallTime = */ false,
-            /*showCpuTime = */ true,
-            /*showTruncatedCpuTime = */ false,
-            /*showGpuTime = */ false);
+            /*timerFlags = */ TimerData::kCpu_Flag);
 
     const char findStr[] = "= ";
     int pos = timerResult.find(findStr);
     if (-1 == pos) {
         SkDebugf("Unexpected output from TimerData::getResult(...). Unable to parse.");
         return false;
     }
 
     SkScalar cpuTime = SkDoubleToScalar(atof(timerResult.c_str() + pos + sizeof(findStr) - 1));
     if (cpuTime == 0) {  // atof returns 0.0 on error.
@@ skipping 71 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