diff options
author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-15 16:10:37 +0000 |
---|---|---|
committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-15 16:10:37 +0000 |
commit | 85fd1932231e21703fc4e1846a3769b5a5119c77 (patch) | |
tree | abce9847c5972fbda83a8556880a9cc9cfb7734f /tools | |
parent | 0a68c5ad255f8c684b0732deb4127d655cb15b2e (diff) |
Factor out DumpRecord method from dump_record tool for later use
R=mtklein@google.com
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/282233003
git-svn-id: http://skia.googlecode.com/svn/trunk@14751 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tools')
-rw-r--r-- | tools/DumpRecord.cpp | 113 | ||||
-rw-r--r-- | tools/DumpRecord.h | 24 | ||||
-rw-r--r-- | tools/dump_record.cpp | 97 |
3 files changed, 144 insertions, 90 deletions
diff --git a/tools/DumpRecord.cpp b/tools/DumpRecord.cpp new file mode 100644 index 0000000000..2376fb9cf0 --- /dev/null +++ b/tools/DumpRecord.cpp @@ -0,0 +1,113 @@ +/* + * Copyright 2014 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#include <stdio.h> + +#include "SkRecord.h" +#include "SkRecordDraw.h" + +#include "BenchTimer.h" +#include "DumpRecord.h" + +namespace { + +class Dumper { +public: + explicit Dumper(SkCanvas* canvas, int count, bool timeWithCommand) + : fDigits(0) + , fIndent(0) + , fDraw(canvas) + , fTimeWithCommand(timeWithCommand) { + while (count > 0) { + count /= 10; + fDigits++; + } + } + + unsigned index() const { return fDraw.index(); } + void next() { fDraw.next(); } + + template <typename T> + void operator()(const T& command) { + BenchTimer timer; + timer.start(); + fDraw(command); + timer.end(); + + this->print(command, timer.fCpu); + } + + void operator()(const SkRecords::NoOp&) { + // Move on without printing anything. + } + + template <typename T> + void print(const T& command, double time) { + this->printNameAndTime(command, time); + } + + void print(const SkRecords::Restore& command, double time) { + --fIndent; + this->printNameAndTime(command, time); + } + + void print(const SkRecords::Save& command, double time) { + this->printNameAndTime(command, time); + ++fIndent; + } + + void print(const SkRecords::SaveLayer& command, double time) { + this->printNameAndTime(command, time); + ++fIndent; + } + +private: + template <typename T> + void printNameAndTime(const T& command, double time) { + if (!fTimeWithCommand) { + printf("%6.1f ", time * 1000); + } + printf("%*d ", fDigits, fDraw.index()); + for (int i = 0; i < fIndent; i++) { + putchar('\t'); + } + if (fTimeWithCommand) { + printf("%6.1f ", time * 1000); + } + puts(NameOf(command)); + } + + template <typename T> + static const char* NameOf(const T&) { + #define CASE(U) case SkRecords::U##_Type: return #U; + switch(T::kType) { SK_RECORD_TYPES(CASE); } + #undef CASE + SkDEBUGFAIL("Unknown T"); + return "Unknown T"; + } + + static const char* NameOf(const SkRecords::SaveLayer&) { + return "\x1b[31;1mSaveLayer\x1b[0m"; // Bold red. + } + + int fDigits; + int fIndent; + SkRecords::Draw fDraw; + const bool fTimeWithCommand; +}; + +} // namespace + +void DumpRecord(const SkRecord& record, + SkCanvas* canvas, + bool timeWithCommand) { + for (Dumper dumper(canvas, record.count(), timeWithCommand); + dumper.index() < record.count(); + dumper.next()) { + record.visit<void>(dumper.index(), dumper); + } +} diff --git a/tools/DumpRecord.h b/tools/DumpRecord.h new file mode 100644 index 0000000000..47097472b1 --- /dev/null +++ b/tools/DumpRecord.h @@ -0,0 +1,24 @@ +/* + * Copyright 2014 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ +#ifndef DumpRecord_DEFINED +#define DumpRecord_DEFINED + +class SkRecord; +class SkCanvas; + +/** + * Draw the record to the supplied canvas via SkRecords::Draw, while + * printing each draw command and run time in microseconds to stdout. + * + * @param timeWithCommand If true, print time next to command, else in + * first column. + */ +void DumpRecord(const SkRecord& record, + SkCanvas* canvas, + bool timeWithCommand); + +#endif // DumpRecord_DEFINED diff --git a/tools/dump_record.cpp b/tools/dump_record.cpp index 2d851e7c9f..14b1a5bbe0 100644 --- a/tools/dump_record.cpp +++ b/tools/dump_record.cpp @@ -7,118 +7,35 @@ #include <stdio.h> -#include "BenchTimer.h" -#include "LazyDecodeBitmap.h" #include "SkCommandLineFlags.h" #include "SkGraphics.h" -#include "SkOSFile.h" #include "SkPicture.h" -#include "SkRecord.h" -#include "SkRecordDraw.h" #include "SkRecordOpts.h" #include "SkRecorder.h" #include "SkStream.h" +#include "DumpRecord.h" +#include "LazyDecodeBitmap.h" + DEFINE_string2(skps, r, "", ".SKPs to dump."); DEFINE_string(match, "", "The usual filters on file names to dump."); DEFINE_bool2(optimize, O, false, "Run SkRecordOptimize before dumping."); DEFINE_int32(tile, 1000000000, "Simulated tile size."); DEFINE_bool(timeWithCommand, false, "If true, print time next to command, else in first column."); -class Dumper { -public: - explicit Dumper(SkCanvas* canvas, int count) : fDigits(0), fIndent(0), fDraw(canvas) { - while (count > 0) { - count /= 10; - fDigits++; - } - } - - unsigned index() const { return fDraw.index(); } - void next() { fDraw.next(); } - - template <typename T> - void operator()(const T& command) { - BenchTimer timer; - timer.start(); - fDraw(command); - timer.end(); - - this->print(command, timer.fCpu); - } - - void operator()(const SkRecords::NoOp&) { - // Move on without printing anything. - } - - template <typename T> - void print(const T& command, double time) { - this->printNameAndTime(command, time); - } - - void print(const SkRecords::Restore& command, double time) { - --fIndent; - this->printNameAndTime(command, time); - } - - void print(const SkRecords::Save& command, double time) { - this->printNameAndTime(command, time); - ++fIndent; - } - - void print(const SkRecords::SaveLayer& command, double time) { - this->printNameAndTime(command, time); - ++fIndent; - } - -private: - template <typename T> - void printNameAndTime(const T& command, double time) { - if (!FLAGS_timeWithCommand) { - printf("%6.1f ", time * 1000); - } - printf("%*d ", fDigits, fDraw.index()); - for (int i = 0; i < fIndent; i++) { - putchar('\t'); - } - if (FLAGS_timeWithCommand) { - printf("%6.1f ", time * 1000); - } - puts(NameOf(command)); - } - - template <typename T> - static const char* NameOf(const T&) { - #define CASE(U) case SkRecords::U##_Type: return #U; - switch(T::kType) { SK_RECORD_TYPES(CASE); } - #undef CASE - SkDEBUGFAIL("Unknown T"); - return "Unknown T"; - } - - static const char* NameOf(const SkRecords::SaveLayer&) { - return "\x1b[31;1mSaveLayer\x1b[0m"; // Bold red. - } - - int fDigits; - int fIndent; - SkRecords::Draw fDraw; -}; - - static void dump(const char* name, int w, int h, const SkRecord& record) { SkBitmap bitmap; bitmap.allocN32Pixels(w, h); SkCanvas canvas(bitmap); - canvas.clipRect(SkRect::MakeWH(SkIntToScalar(FLAGS_tile), SkIntToScalar(FLAGS_tile))); + canvas.clipRect(SkRect::MakeWH(SkIntToScalar(FLAGS_tile), + SkIntToScalar(FLAGS_tile))); printf("%s %s\n", FLAGS_optimize ? "optimized" : "not-optimized", name); - for (Dumper dumper(&canvas, record.count()); dumper.index() < record.count(); dumper.next()) { - record.visit<void>(dumper.index(), dumper); - } + DumpRecord(record, &canvas, FLAGS_timeWithCommand); } + int tool_main(int argc, char** argv); int tool_main(int argc, char** argv) { SkCommandLineFlags::Parse(argc, argv); |