diff options
author | 2014-07-15 19:17:44 -0400 | |
---|---|---|
committer | 2014-07-15 19:17:44 -0400 | |
commit | e51b6bd1f9910b676e26c9db930d25c651c96c71 (patch) | |
tree | ba69eb9594d6428edae6fbf0c98d735cfa15b738 /tools/timer | |
parent | 7edaeb515c7b33ff965f301322d0477c6d11c728 (diff) |
revert timer changes
BUG=skia:
Review URL: https://codereview.chromium.org/397843002
Diffstat (limited to 'tools/timer')
-rw-r--r-- | tools/timer/SysTimer_windows.cpp | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/tools/timer/SysTimer_windows.cpp b/tools/timer/SysTimer_windows.cpp index d24a6aae71..2f9d0a5d58 100644 --- a/tools/timer/SysTimer_windows.cpp +++ b/tools/timer/SysTimer_windows.cpp @@ -6,8 +6,6 @@ */ #include "SysTimer_windows.h" -#include <intrin.h> - static ULONGLONG win_cpu_time() { FILETIME createTime; FILETIME exitTime; @@ -25,6 +23,11 @@ static ULONGLONG win_cpu_time() { return start_cpu_sys.QuadPart + start_cpu_usr.QuadPart; } +void SysTimer::startWall() { + if (0 == ::QueryPerformanceCounter(&fStartWall)) { + fStartWall.QuadPart = 0; + } +} void SysTimer::startCpu() { fStartCpu = win_cpu_time(); } @@ -33,22 +36,11 @@ double SysTimer::endCpu() { ULONGLONG end_cpu = win_cpu_time(); return static_cast<double>(end_cpu - fStartCpu) / 10000.0L; } - -static void wall_timestamp(LARGE_INTEGER* now) { - _ReadWriteBarrier(); - if (0 == ::QueryPerformanceCounter(now)) { - now->QuadPart = 0; - } - _ReadWriteBarrier(); -} - -void SysTimer::startWall() { - wall_timestamp(&fStartWall); -} - double SysTimer::endWall() { LARGE_INTEGER end_wall; - wall_timestamp(&end_wall); + if (0 == ::QueryPerformanceCounter(&end_wall)) { + end_wall.QuadPart = 0; + } LARGE_INTEGER ticks_elapsed; ticks_elapsed.QuadPart = end_wall.QuadPart - fStartWall.QuadPart; |