Make SKP bench JSON ouput better

bench/ResultsWriter.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
  * Helper functions for result writing operations.
  */
 
 #include "ResultsWriter.h"
+#include "SkString.h"
+#include "SkTArray.h"
 
 Json::Value* SkFindNamedNode(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);
             break;
         }
     }
 
     if(search_results != NULL) {
         return search_results;
     } else {
         Json::Value* new_val = &(root->append(Json::Value()));
         (*new_val)["name"] = name;
         return new_val;
     }
 }
 

[robertphillips, 2014/06/26 16:17:32]

SkString buildername -> const SkString& builderName ?

[kelvinly, 2014/06/26 17:18:09]

Done.

+Json::Value makeBuilderJSON(SkString buildername) {
+    static const int kNumKeys = 6;

[robertphillips, 2014/06/26 16:17:32]

6 -> kNumKeys here ?

[kelvinly, 2014/06/26 17:18:09]

Done.

+    static const char* kKeys[6] = {
+        "role", "os", "model", "gpu", "arch", "configuration"};
+    Json::Value builderData;
+

[robertphillips, 2014/06/26 16:17:32]

if (!builderName.isEmpty()) { ?

[kelvinly, 2014/06/26 17:18:09]

Done.

+    if (buildername.size() > 0) {
+        SkTArray<SkString> splitBuilder;
+        SkStrSplit(buildername.c_str(), "-", &splitBuilder);

[robertphillips, 2014/06/26 16:17:32]

SkASSERT(splitBuilder.count() >= kNumKeys); ?
++i ?

[kelvinly, 2014/06/26 17:18:09]

Done.

+        for (int i = 0; i < kNumKeys && i < splitBuilder.count(); i++) {
+            builderData[kKeys[i]] = splitBuilder[i].c_str();
+        }
+        builderData["builderName"] = buildername.c_str();
+        if (kNumKeys < splitBuilder.count()) {
+            SkString extras;

[robertphillips, 2014/06/26 16:17:32]

++i ?

[kelvinly, 2014/06/26 17:18:09]

Done.

+            for (int i = kNumKeys; i < splitBuilder.count(); i++) {
+                extras.append(splitBuilder[i]);
+                if (i != splitBuilder.count() - 1) {
+                    extras.append("-");
+                }
+            }
+            builderData["badParams"] = extras.c_str();
+        }
+    } 
+    return builderData;
+}