Carltonus/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

fix synchronization of TimerState (refs #1729)

Browse Source 
This was SVN commit r12908.
This commit is contained in:
janwas 2012-12-01 06:33:30 +00:00
parent 3787f17e4d
commit 308db6627a
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/lib/sysdep/os/win/whrt/whrt.cpp
View File

@ -207,15 +207,10 @@ static void UpdateTimerState()
double whrt_Time()
{
retry:
// latch timer state (counter and time must be from the same update)
const double time = ts->time;
COMPILER_FENCE;
const u64 counter = ts->counter;
// ts changed after reading time. note: don't compare counter because
// it _might_ have the same value after two updates.
if(time != ts->time)
goto retry;
const volatile TimerState* state = ts;
const double time = state->time;
const u64 counter = state->counter;
const u64 deltaTicks = CounterDelta(counter, Counter());
return (time + deltaTicks/nominalFrequency);