ef57b7e653
The main meat of things is in SkThreadPool. We can now give SkThreadPool a type for each thread to create and destroy on its local stack. It's TLS without going through SkTLS. I've split the DM tasks into CpuTasks that run on threads with no TLS, and GpuTasks that run on threads with a thread local GrContextFactory. The old CpuTask and GpuTask have been renamed to CpuGMTask and GpuGMTask. Upshot: default run of out/Debug/dm goes from ~45 seconds to ~20 seconds. BUG=skia: R=bsalomon@google.com, mtklein@google.com, reed@google.com Author: mtklein@chromium.org Review URL: https://codereview.chromium.org/179233005 git-svn-id: http://skia.googlecode.com/svn/trunk@13632 2bbb7eff-a529-9590-31e7-b0007b416f81
63 lines
1.5 KiB
C++
63 lines
1.5 KiB
C++
#ifndef DMTestTask_DEFINED
|
|
#define DMTestTask_DEFINED
|
|
|
|
#include "DMReporter.h"
|
|
#include "DMTask.h"
|
|
#include "DMTaskRunner.h"
|
|
#include "SkString.h"
|
|
#include "SkTemplates.h"
|
|
#include "Test.h"
|
|
|
|
// Runs a unit test.
|
|
namespace DM {
|
|
|
|
class TestReporter : public skiatest::Reporter {
|
|
public:
|
|
TestReporter() {}
|
|
|
|
const char* failure() const { return fFailure.c_str(); }
|
|
|
|
private:
|
|
virtual bool allowExtendedTest() const SK_OVERRIDE;
|
|
virtual bool allowThreaded() const SK_OVERRIDE;
|
|
virtual bool verbose() const SK_OVERRIDE;
|
|
|
|
virtual void onReportFailed(const SkString& desc) SK_OVERRIDE {
|
|
fFailure = desc;
|
|
}
|
|
|
|
SkString fFailure;
|
|
};
|
|
|
|
class CpuTestTask : public CpuTask {
|
|
public:
|
|
CpuTestTask(Reporter*, TaskRunner*, skiatest::TestRegistry::Factory);
|
|
|
|
virtual void draw() SK_OVERRIDE;
|
|
virtual bool shouldSkip() const SK_OVERRIDE { return false; }
|
|
virtual SkString name() const SK_OVERRIDE { return fName; }
|
|
|
|
private:
|
|
TestReporter fTestReporter;
|
|
SkAutoTDelete<skiatest::Test> fTest;
|
|
const SkString fName;
|
|
};
|
|
|
|
class GpuTestTask : public GpuTask {
|
|
public:
|
|
GpuTestTask(Reporter*, TaskRunner*, skiatest::TestRegistry::Factory);
|
|
|
|
virtual void draw(GrContextFactory*) SK_OVERRIDE;
|
|
virtual bool shouldSkip() const SK_OVERRIDE { return false; }
|
|
virtual SkString name() const SK_OVERRIDE { return fName; }
|
|
|
|
private:
|
|
TestReporter fTestReporter;
|
|
SkAutoTDelete<skiatest::Test> fTest;
|
|
const SkString fName;
|
|
};
|
|
|
|
} // namespace DM
|
|
|
|
#endif // DMTestTask_DEFINED
|