AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changed JSON formatting more, workaround bug where SkStringPrintf causes encoding issues

Browse Source 
BUG=skia:
R=bensong@google.com, jcgregorio@google.com, reed@google.com, bsalomon@google.com

Author: kelvinly@google.com

Review URL: https://codereview.chromium.org/294093002

git-svn-id: http://skia.googlecode.com/svn/trunk@14808 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
commit-bot@chromium.org 2014-05-20 17:35:10 +00:00
parent 7ed173b1eb
commit 97133ade53
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bench/ResultsWriter.h
View File

@ -81,7 +81,7 @@ private:
/**
* This ResultsWriter handles writing out the results in JSON.
*
* The output looks like:
* The output looks like (except compressed to a single line):
*
* {
* "options" : {
@ -90,9 +90,12 @@ private:
* ...
* "system" : "UNIX"
* },
* "results" : {
* "Xfermode_Luminosity_640_480" : {
* "565" : {
* "results" : [
* {
* "name" : "Xfermode_Luminosity_640_480",
* "results" : [
* {
* "name": "565",
* "cmsecs" : 143.188128906250,
* "msecs" : 143.835957031250
* },
@ -113,7 +116,9 @@ private:
if(search_results != NULL) {
return search_results;
} else {
return &(root->append(Json::Value()));
Json::Value* new_val = &(root->append(Json::Value()));
(*new_val)["name"] = name;
return new_val;
}
}
public:
@ -128,15 +133,17 @@ public:
fRoot["options"][name] = value;
}
virtual void bench(const char name[], int32_t x, int32_t y) {
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;
SkString sk_name(name);
sk_name.append("_");
sk_name.appendS32(x);
sk_name.append("_");
sk_name.appendS32(y);
Json::Value* bench_node = find_named_node(&fResults, sk_name.c_str());
fBench = &(*bench_node)["results"];
}
virtual void config(const char name[]) {
SkASSERT(NULL != fBench);
fConfig = find_named_node(fBench, name);
(*fConfig)["name"] = name;
}
virtual void timer(const char name[], double ms) {
SkASSERT(NULL != fConfig);
@ -144,10 +151,11 @@ public:
}
virtual void end() {
SkFILEWStream stream(fFilename.c_str());
stream.writeText(fRoot.toStyledString().c_str());
stream.writeText(Json::FastWriter().write(fRoot).c_str());
stream.flush();
}
private:
SkString fFilename;
Json::Value fRoot;
Json::Value& fResults;

1
include/utils/SkJSONCPP.h
View File

@ -21,6 +21,7 @@
#endif
#include "json/reader.h"
#include "json/value.h"
#include "json/writer.h"
#ifdef SK_BUILD_FOR_WIN
#pragma warning(pop)
#endif