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

DM: tweak output.

Browse Source 
Show task name in verbose mode only, and add task runtime.

BUG=skia:
R=reed@google.com, bsalomon@google.com, mtklein@google.com

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13639 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
commit-bot@chromium.org 2014-03-03 15:44:56 +00:00
parent 1426c1e9b6
commit a39874b636
4 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dm/DMReporter.cpp
View File

@ -8,7 +8,7 @@ DEFINE_bool2(verbose, v, false, "If true, print status updates one-per-line.");
namespace DM {
void Reporter::finish(SkString name) {
void Reporter::finish(SkString name, SkMSec timeMs) {
sk_atomic_inc(&fFinished);
if (FLAGS_quiet) {
@ -23,7 +23,9 @@ void Reporter::finish(SkString name) {
if (failed > 0) {
status.appendf(", %d failed", failed);
}
status.appendf("\t[%s done]", name.c_str());
if (FLAGS_verbose) {
status.appendf("\t%5dms %s", timeMs, name.c_str());
}
SkDebugf("%s", status.c_str());
}

3
dm/DMReporter.h
View File

@ -4,6 +4,7 @@
#include "SkString.h"
#include "SkTArray.h"
#include "SkThread.h"
#include "SkTime.h"
#include "SkTypes.h"
// Used to report status changes including failures. All public methods are threadsafe.
@ -14,7 +15,7 @@ public:
Reporter() : fStarted(0), fFinished(0) {}
void start() { sk_atomic_inc(&fStarted); }
void finish(SkString name);
void finish(SkString name, SkMSec timeMs);
void fail(SkString msg);
int32_t started() const { return fStarted; }

8
dm/DMTask.cpp
View File

@ -25,8 +25,12 @@ void Task::fail(const char* msg) {
fReporter->fail(failure);
}
void Task::start() {
fStart = SkTime::GetMSecs();
}
void Task::finish() {
fReporter->finish(this->name());
fReporter->finish(this->name(), SkTime::GetMSecs() - fStart);
}
void Task::spawnChild(CpuTask* task) {
@ -37,6 +41,7 @@ CpuTask::CpuTask(Reporter* reporter, TaskRunner* taskRunner) : Task(reporter, ta
CpuTask::CpuTask(const Task& parent) : Task(parent) {}
void CpuTask::run() {
this->start();
if (!this->shouldSkip()) {
this->draw();
}
@ -47,6 +52,7 @@ void CpuTask::run() {
GpuTask::GpuTask(Reporter* reporter, TaskRunner* taskRunner) : Task(reporter, taskRunner) {}
void GpuTask::run(GrContextFactory& factory) {
this->start();
if (!this->shouldSkip()) {
this->draw(&factory);
}

4
dm/DMTask.h
View File

@ -4,6 +4,7 @@
#include "DMReporter.h"
#include "GrContextFactory.h"
#include "SkRunnable.h"
#include "SkTime.h"
// DM will run() these tasks on one of two threadpools.
// Subclasses can call fail() to mark this task as failed, or make any number of spawnChild() calls
@ -31,14 +32,17 @@ protected:
Task(const Task& parent);
virtual ~Task() {}
void start();
void fail(const char* msg = NULL);
void finish();
void spawnChild(CpuTask* task); // For now we don't allow GPU child tasks.
private:
Reporter* fReporter; // Unowned.
TaskRunner* fTaskRunner; // Unowned.
int fDepth;
SkMSec fStart;
};
class CpuTask : public Task, public SkRunnable {