197845ae15
On my quad-core laptop I can get about a 3x speedup:
Debug, --threads 0 40.99s
Debug, --threads 8 14.39s
Release, --threads 0 8.24s
Release, --threads 8 2.80s
I also removed some unused Test.{h,cpp} APIs and refactored a little to make
things thread-safer.
BUG=
R=borenet@google.com, djsollen@google.com, scroggo@google.com, reed@google.com
Author: mtklein@google.com
Review URL: https://chromiumcodereview.appspot.com/13855007
git-svn-id: http://skia.googlecode.com/svn/trunk@8763 2bbb7eff-a529-9590-31e7-b0007b416f81
116 lines
2.5 KiB
C++
116 lines
2.5 KiB
C++
|
|
/*
|
|
* Copyright 2011 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
#include "Test.h"
|
|
|
|
#include "SkString.h"
|
|
#include "SkTArray.h"
|
|
|
|
#if SK_SUPPORT_GPU
|
|
#include "GrContext.h"
|
|
#include "gl/SkNativeGLContext.h"
|
|
#else
|
|
class GrContext;
|
|
#endif
|
|
|
|
SK_DEFINE_INST_COUNT(skiatest::Reporter)
|
|
|
|
using namespace skiatest;
|
|
|
|
Reporter::Reporter() : fTestCount(0) {
|
|
}
|
|
|
|
void Reporter::startTest(Test* test) {
|
|
this->bumpTestCount();
|
|
this->onStart(test);
|
|
}
|
|
|
|
void Reporter::report(const char desc[], Result result) {
|
|
this->onReport(desc ? desc : "<no description>", result);
|
|
}
|
|
|
|
void Reporter::endTest(Test* test) {
|
|
this->onEnd(test);
|
|
}
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
Test::Test() : fReporter(NULL), fPassed(true) {}
|
|
|
|
Test::~Test() {
|
|
SkSafeUnref(fReporter);
|
|
}
|
|
|
|
void Test::setReporter(Reporter* r) {
|
|
SkRefCnt_SafeAssign(fReporter, r);
|
|
}
|
|
|
|
const char* Test::getName() {
|
|
if (fName.size() == 0) {
|
|
this->onGetName(&fName);
|
|
}
|
|
return fName.c_str();
|
|
}
|
|
|
|
namespace {
|
|
class LocalReporter : public Reporter {
|
|
public:
|
|
LocalReporter() {}
|
|
|
|
int failure_size() const { return fFailures.count(); }
|
|
const char* failure(int i) const { return fFailures[i].c_str(); }
|
|
|
|
protected:
|
|
void onReport(const char desc[], Result result) SK_OVERRIDE {
|
|
if (kFailed == result) {
|
|
fFailures.push_back().set(desc);
|
|
}
|
|
}
|
|
|
|
private:
|
|
SkTArray<SkString> fFailures;
|
|
};
|
|
} // namespace
|
|
|
|
void Test::run() {
|
|
// Tell (likely shared) fReporter that this test has started.
|
|
fReporter->startTest(this);
|
|
|
|
// Run the test into a LocalReporter so we know if it's passed or failed without interference
|
|
// from other tests that might share fReporter.
|
|
LocalReporter local;
|
|
this->onRun(&local);
|
|
fPassed = local.failure_size() == 0;
|
|
|
|
// Now tell fReporter about any failures and wrap up.
|
|
for (int i = 0; i < local.failure_size(); i++) {
|
|
fReporter->report(local.failure(i), Reporter::kFailed);
|
|
}
|
|
fReporter->endTest(this);
|
|
}
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#if SK_SUPPORT_GPU
|
|
#include "GrContextFactory.h"
|
|
GrContextFactory gGrContextFactory;
|
|
#endif
|
|
|
|
GrContextFactory* GpuTest::GetGrContextFactory() {
|
|
#if SK_SUPPORT_GPU
|
|
return &gGrContextFactory;
|
|
#else
|
|
return NULL;
|
|
#endif
|
|
}
|
|
|
|
void GpuTest::DestroyContexts() {
|
|
#if SK_SUPPORT_GPU
|
|
gGrContextFactory.destroyContexts();
|
|
#endif
|
|
}
|