diff options
author | mtklein <mtklein@chromium.org> | 2015-10-23 07:02:06 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-10-23 07:02:06 -0700 |
commit | 33eefcd58bffc35355382dd7b1b79a02b99f8c6c (patch) | |
tree | bcf4043e0b109154d9d5ae2deabe2a205880762d /tools/timer/Timer.cpp | |
parent | 3b5b7845428a94402c1984c175ecce83cc963c21 (diff) |
SkTime::GetNSecs()
- Move high-precision wall timers from tools/timer to SkTime.
- Implement SkTime::GetMSecs() in terms of SkTime::GetNSecs().
- Delete unused tools/timer code.
I have no idea what's going on there in src/animator.
I don't intend to investigate.
BUG=skia:
Committed: https://skia.googlesource.com/skia/+/70084cbc16ee8162649f2601377feb6e49de0217
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Debug-CrOS_Link-Trybot
Committed: https://skia.googlesource.com/skia/+/a1840d50e29fd95e4df2d1168fe54c34c2a5c30c
Committed: https://skia.googlesource.com/skia/+/38a88e4c0c28a7be981aac7bb4a198ad95a62a63
Review URL: https://codereview.chromium.org/1422513003
Diffstat (limited to 'tools/timer/Timer.cpp')
-rw-r--r-- | tools/timer/Timer.cpp | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/tools/timer/Timer.cpp b/tools/timer/Timer.cpp index b59988ca26..28841cdc84 100644 --- a/tools/timer/Timer.cpp +++ b/tools/timer/Timer.cpp @@ -6,52 +6,6 @@ */ #include "Timer.h" -Timer::Timer(SkGLContext* gl) - : fCpu(-1.0) - , fWall(-1.0) - , fTruncatedCpu(-1.0) - , fTruncatedWall(-1.0) - , fGpu(-1.0) -#if SK_SUPPORT_GPU - , fGpuTimer(gl) -#endif - {} - -void Timer::start() { - fSysTimer.startWall(); - fTruncatedSysTimer.startWall(); -#if SK_SUPPORT_GPU - fGpuTimer.start(); -#endif - fSysTimer.startCpu(); - fTruncatedSysTimer.startCpu(); -} - -void Timer::end() { - fCpu = fSysTimer.endCpu(); -#if SK_SUPPORT_GPU - //It is important to stop the cpu clocks first, - //as the following will cpu wait for the gpu to finish. - fGpu = fGpuTimer.end(); -#endif - fWall = fSysTimer.endWall(); -} - -void Timer::truncatedEnd() { - fTruncatedCpu = fTruncatedSysTimer.endCpu(); - fTruncatedWall = fTruncatedSysTimer.endWall(); -} - -WallTimer::WallTimer() : fWall(-1.0) {} - -void WallTimer::start() { - fSysTimer.startWall(); -} - -void WallTimer::end() { - fWall = fSysTimer.endWall(); -} - SkString HumanizeMs(double ms) { if (ms > 60e+3) return SkStringPrintf("%.3gm", ms/60e+3); if (ms > 1e+3) return SkStringPrintf("%.3gs", ms/1e+3); |