use usecs in RageTimer

This commit is contained in:
Glenn Maynard
2004-06-21 22:29:50 +00:00
parent f94510fd49
commit a030680707
+15 -15
View File
@@ -12,10 +12,10 @@ const RageTimer RageZeroTimer(0,0);
static void GetTime( unsigned &secs, unsigned &us )
{
/*
* Ticks may be less than last for at least two reasons: the time may have wrapped (after
* about 49 days), or the system clock may have moved backwards. If the system clock moves
* backwards, we can't just clamp the time; if it moved back an hour, we'll sit around for
* an hour until it catches up.
* Ticks may be less than last for at least two reasons. The underlying timer may
* be 32-bit and use millisecs internally, or the system clock may have moved backwards.
* If the system clock moves backwards, we can't just clamp the time; if it moved back
* an hour, we'll sit around for an hour until it catches up.
*
* Keep track of an offset: the amount of time to add to the result of GetMicrosecondsSinceStart.
* If we move back by 100ms, the offset will be increased by 100ms. If we loop, the
@@ -24,26 +24,26 @@ static void GetTime( unsigned &secs, unsigned &us )
* wrapping isn't a problem.
*/
static uint32_t last = 0;
static uint64_t last = 0;
static uint32_t offset_secs = 0, offset_us = 0;
const uint32_t millisecs = (uint32_t) (ArchHooks::GetMicrosecondsSinceStart(true)/1000);
const uint64_t usecs = ArchHooks::GetMicrosecondsSinceStart( true );
/* The time has wrapped if the last time was very high and the current time is very low. */
const uint32_t one_day = 24*60*60*1000;
if( last > (0-one_day) && millisecs < one_day )
const uint64_t one_day = uint64_t(24*60*60)*1000000;
if( last > (0-one_day) && usecs < one_day )
{
const uint32_t wraparound_secs = 4294967; /* (2^32 / 1000) */
const uint32_t wraparound_us = 296000; /* (2^32 % 1000) * 1000 */
offset_secs += wraparound_secs;
offset_us += wraparound_us;
}
else if( millisecs < last )
else if( usecs < last )
{
/* The time has moved backwards. Increase the offset by the amount we moved. */
const uint32_t offset_ms = last - millisecs;
offset_secs += offset_ms/1000;
offset_us += (offset_ms%1000) * 1000;
const uint64_t offset_us_diff = last - usecs;
offset_secs += unsigned(offset_us_diff/1000000);
offset_us += unsigned(offset_us_diff%1000000);
}
if( offset_us >= TIMESTAMP_RESOLUTION )
@@ -52,10 +52,10 @@ static void GetTime( unsigned &secs, unsigned &us )
++offset_secs;
}
last = millisecs;
last = usecs;
secs = millisecs / 1000;
us = (millisecs % 1000)*1000;
secs = unsigned(usecs / 1000000);
us = unsigned(usecs % 1000000);
secs += offset_secs;
us += offset_us;