Changed JSON formatting to fit BigQuery requirements

bench/ResultsWriter.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
  * Classes for writing out bench results in various formats.
  */
 #ifndef SkResultsWriter_DEFINED
 #define SkResultsWriter_DEFINED
@@ skipping 81 matching lines @@
  *   },
  *   "results" : {
  *      "Xfermode_Luminosity_640_480" : {
  *         "565" : {
  *            "cmsecs" : 143.188128906250,
  *            "msecs" : 143.835957031250
  *         },
  *         ...
  */
 class JSONResultsWriter : public ResultsWriter {
+private:
+    Json::Value* find_named_node(Json::Value* root, const char name[]) {
+        Json::Value* search_results = NULL;
+        for(Json::Value::iterator iter = root->begin();
+                iter!= root->end(); ++iter) {
+            if(SkString(name).equals((*iter)["name"].asCString())) {
+                search_results = &(*iter);

[jcgregorio, 2014/05/19 17:05:12]

break;  ?

[kelvinly, 2014/05/19 17:10:46]

Ah, my bad.
Would
return &(*iter);
be better/worse?

+            }
+        }
+
+        if(search_results != NULL) {
+            return search_results;
+        } else {
+            return &(root->append(Json::Value()));
+        }
+    }
 public:
     explicit JSONResultsWriter(const char filename[])
         : fFilename(filename)
         , fRoot()
         , fResults(fRoot["results"])
         , fBench(NULL)
         , fConfig(NULL) {
     }
     virtual void option(const char name[], const char value[]) {
         fRoot["options"][name] = value;
     }
     virtual void bench(const char name[], int32_t x, int32_t y) {
-        fBench = &fResults[SkStringPrintf( "%s_%d_%d", name, x, y).c_str()];
+        const char* full_name = SkStringPrintf( "%s_%d_%d", name, x, y).c_str();
+        Json::Value* bench_node = find_named_node(&fResults, full_name);
+        (*bench_node)["name"] = full_name;
+        fBench = &(*bench_node)["results"];
     }
     virtual void config(const char name[]) {
         SkASSERT(NULL != fBench);
-        fConfig = &(*fBench)[name];
+        fConfig = find_named_node(fBench, name);
+        (*fConfig)["name"] = name;
     }
     virtual void timer(const char name[], double ms) {
         SkASSERT(NULL != fConfig);
         (*fConfig)[name] = ms;
     }
     virtual void end() {
         SkFILEWStream stream(fFilename.c_str());
         stream.writeText(fRoot.toStyledString().c_str());
         stream.flush();
     }
@@ skipping 50 matching lines @@
  */
 template <typename T> class CallEnd : SkNoncopyable {
 public:
     CallEnd(T& obj) : fObj(obj) {}
     ~CallEnd() { fObj.end(); }
 private:
     T&  fObj;
 };
 
 #endif