revert timer changes

BUG=skia:

Review URL: https://codereview.chromium.org/397843002
This commit is contained in:
Mike Klein 2014-07-15 19:17:44 -04:00
parent 7edaeb515c
commit e51b6bd1f9

View File

@ -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;