Switch from Float to Integer Time Values
- Use fast data types where possible so the compiler can optimize for speed based on platform
- for example, 128 bits might be fastest on ARM
- good future-proofing
- Refactor GetTimeSinceStart() to be a bit faster
- multiplication is much faster than division
- Implement a RageTimer method to get the seconds value as a plain int, for the places which cast the seconds value to an int
- Changing from GetTimeSinceStartFast() to GetTimeSinceStart() where accuracy is important
- Changing from GetTimeSinceStart() to GetUsecsSinceStart() for timestamp diffs
- Adjust RageThreads to accomodate an unsigned timestamp value
- a constant for the maximum value of `uint_fast64_t` replaces `-1` to accommodate the change from signed to unsigned for the `locked_at` variable
- i have separate constants for `std::numeric_limits<std::uint_fast64_t>::max()` and `static_cast<std::uint_fast64_t>(-1)`, so the reader understands -1 represents an error code, though they evaluate to the same value, so i could remove one of the two
- Add two methods to calculate the MMSSMsMs / MMSSMsMsMs time value from usecs directly instead of inferring it from a seconds value, in RageUtil
- Use a similar counter/modulo based method for WheelNotifyIcon, similar to what i did for text_glow in NoteField in 2eeee03
- Make `g_iStartTime` static const for safety
Rename two timer functions:
GetUsecsSinceStart -> GetTimeSinceStartMicroseconds
GetMicrosecondsSinceStart -> GetSystemTimeAsMicroseconds
Remove std prefix from uint_fast64_t
This commit is contained in:
+1
-1
@@ -919,7 +919,7 @@ void Actor::UpdateInternal(float delta_time)
|
||||
}
|
||||
break;
|
||||
case CLOCK_TIMER_GLOBAL:
|
||||
generic_global_timer_update(RageTimer::GetUsecsSinceStart(), m_fEffectDelta, m_fSecsIntoEffect);
|
||||
generic_global_timer_update(RageTimer::GetTimeSinceStartMicroseconds(), m_fEffectDelta, m_fSecsIntoEffect);
|
||||
break;
|
||||
case CLOCK_BGM_BEAT:
|
||||
generic_global_timer_update(g_fCurrentBGMBeat, m_fEffectDelta, m_fSecsIntoEffect);
|
||||
|
||||
@@ -101,13 +101,13 @@ float ArrowEffects::GetTime()
|
||||
{
|
||||
case ModTimerType_Default:
|
||||
case ModTimerType_Game:
|
||||
return (RageTimer::GetTimeSinceStartFast()+offset)*mult;
|
||||
return (RageTimer::GetTimeSinceStart()+offset)*mult;
|
||||
case ModTimerType_Beat:
|
||||
return (GAMESTATE->m_Position.m_fSongBeatVisible+offset)*mult;
|
||||
case ModTimerType_Song:
|
||||
return (GAMESTATE->m_Position.m_fMusicSeconds+offset)*mult;
|
||||
default:
|
||||
return RageTimer::GetTimeSinceStartFast()+offset;
|
||||
return RageTimer::GetTimeSinceStart()+offset;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -316,7 +316,7 @@ void ArrowEffects::Init(PlayerNumber pn)
|
||||
void ArrowEffects::Update()
|
||||
{
|
||||
static float fLastTime = 0;
|
||||
float fTime = RageTimer::GetTimeSinceStartFast();
|
||||
float fTime = RageTimer::GetTimeSinceStart();
|
||||
|
||||
FOREACH_EnabledPlayer( pn )
|
||||
{
|
||||
|
||||
@@ -611,7 +611,7 @@ void BGAnimationLayer::UpdateInternal( float fDeltaTime )
|
||||
break;
|
||||
case TYPE_TILES:
|
||||
{
|
||||
float fSecs = RageTimer::GetTimeSinceStartFast();
|
||||
float fSecs = RageTimer::GetTimeSinceStart();
|
||||
float fTotalWidth = m_iNumTilesWide * m_fTilesSpacingX;
|
||||
float fTotalHeight = m_iNumTilesHigh * m_fTilesSpacingY;
|
||||
|
||||
|
||||
+3
-2
@@ -132,8 +132,9 @@ void Inventory::Update( float fDelta )
|
||||
GAMESTATE->m_Position.m_fSongBeat < song.GetLastBeat() )
|
||||
{
|
||||
// every 1 seconds, try to use an item
|
||||
int iLastSecond = (int)(RageTimer::GetTimeSinceStartFast() - fDelta);
|
||||
int iThisSecond = (int)RageTimer::GetTimeSinceStartFast();
|
||||
int iDelta = static_cast<int>(fDelta);
|
||||
int iLastSecond = RageTimer::GetTimeSinceStartSeconds() - iDelta;
|
||||
int iThisSecond = RageTimer::GetTimeSinceStartSeconds();
|
||||
if( iLastSecond != iThisSecond )
|
||||
{
|
||||
for( int s=0; s<NUM_INVENTORY_SLOTS; s++ )
|
||||
|
||||
@@ -217,7 +217,7 @@ void LightsManager::Update( float fDeltaTime )
|
||||
|
||||
case LIGHTSMODE_ATTRACT:
|
||||
{
|
||||
int iSec = (int)RageTimer::GetTimeSinceStartFast();
|
||||
int iSec = RageTimer::GetTimeSinceStartSeconds();
|
||||
int iTopIndex = iSec % 4;
|
||||
|
||||
// Aldo: Disabled this line, apparently it was a forgotten initialization
|
||||
|
||||
+1
-1
@@ -268,7 +268,7 @@ void RageLog::Write( int where, const RString &sLine )
|
||||
puts( sWarningSeparator );
|
||||
}
|
||||
|
||||
RString sTimestamp = SecondsToMMSSMsMsMs( RageTimer::GetTimeSinceStart() ) + ": ";
|
||||
RString sTimestamp = MicrosecondsToMMSSMsMsMs( RageTimer::GetTimeSinceStartMicroseconds() ) + ": ";
|
||||
RString sWarning;
|
||||
if( where & WRITE_LOUD )
|
||||
sWarning = "WARNING: ";
|
||||
|
||||
+9
-5
@@ -662,7 +662,7 @@ LockMutex::LockMutex( RageMutex &pMutex, const char *file_, int line_ ):
|
||||
mutex( pMutex ),
|
||||
file( file_ ),
|
||||
line( line_ ),
|
||||
locked_at( RageTimer::GetTimeSinceStart() ),
|
||||
locked_at( RageTimer::GetTimeSinceStartMicroseconds() ),
|
||||
locked(false) // ensure it gets locked inside.
|
||||
{
|
||||
mutex.Lock();
|
||||
@@ -682,11 +682,15 @@ void LockMutex::Unlock()
|
||||
|
||||
mutex.Unlock();
|
||||
|
||||
if( file && locked_at != -1 )
|
||||
constexpr uint_fast64_t THRESHOLD_USEC = 15000;
|
||||
|
||||
if (file && locked_at != FAST_ULL_MAX)
|
||||
{
|
||||
const float dur = RageTimer::GetTimeSinceStart() - locked_at;
|
||||
if( dur > 0.015f )
|
||||
LOG->Trace( "Lock at %s:%i took %f", file, line, dur );
|
||||
const uint_fast64_t current_usecs = RageTimer::GetTimeSinceStartMicroseconds();
|
||||
const uint_fast64_t dur_usecs = current_usecs - locked_at;
|
||||
|
||||
if (dur_usecs > THRESHOLD_USEC)
|
||||
LOG->Trace("Lock at %s:%i took %llu microseconds", file, line, dur_usecs);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+5
-2
@@ -2,6 +2,9 @@
|
||||
#define RAGE_THREADS_H
|
||||
|
||||
#include <cstdint>
|
||||
#include <limits>
|
||||
|
||||
static constexpr uint_fast64_t FAST_ULL_MAX = std::numeric_limits<uint_fast64_t>::max();
|
||||
|
||||
struct ThreadSlot;
|
||||
class RageTimer;
|
||||
@@ -128,12 +131,12 @@ class LockMutex
|
||||
|
||||
const char *file;
|
||||
int line;
|
||||
float locked_at;
|
||||
uint_fast64_t locked_at;
|
||||
bool locked;
|
||||
|
||||
public:
|
||||
LockMutex(RageMutex &mut, const char *file, int line);
|
||||
LockMutex(RageMutex &mut): mutex(mut), file(nullptr), line(-1), locked_at(-1), locked(true) { mutex.Lock(); }
|
||||
LockMutex(RageMutex &mut): mutex(mut), file(nullptr), line(-1), locked_at(FAST_ULL_MAX), locked(true) { mutex.Lock(); }
|
||||
~LockMutex();
|
||||
LockMutex(LockMutex &cpy): mutex(cpy.mutex), file(nullptr), line(-1), locked_at(cpy.locked_at), locked(true) { mutex.Lock(); }
|
||||
|
||||
|
||||
+14
-7
@@ -32,14 +32,16 @@
|
||||
|
||||
const std::uint64_t ONE_SECOND_IN_MICROSECONDS_ULL = 1000000ULL;
|
||||
const std::int64_t ONE_SECOND_IN_MICROSECONDS_LL = 1000000LL;
|
||||
const uint_fast64_t ONE_SECOND_IN_MICROSECONDS_FAST_ULL = 1000000ULL;
|
||||
const double ONE_SECOND_IN_MICROSECONDS_DBL = 1000000.0;
|
||||
|
||||
const RageTimer RageZeroTimer(0,0);
|
||||
static std::uint64_t g_iStartTime = ArchHooks::GetMicrosecondsSinceStart();
|
||||
static const std::uint64_t g_iStartTime = ArchHooks::GetSystemTimeInMicroseconds();
|
||||
static uint_fast64_t g_iStartTimeFast64 = g_iStartTime;
|
||||
|
||||
static std::uint64_t GetTime()
|
||||
{
|
||||
return ArchHooks::GetMicrosecondsSinceStart();
|
||||
return ArchHooks::GetSystemTimeInMicroseconds();
|
||||
}
|
||||
|
||||
/* The accuracy of RageTimer::GetTimeSinceStart() is directly tied to the
|
||||
@@ -52,14 +54,19 @@ static std::uint64_t GetTime()
|
||||
* and do thorough testing if you change anything here. -sukibaby */
|
||||
double RageTimer::GetTimeSinceStart()
|
||||
{
|
||||
std::uint64_t usecs = GetTime();
|
||||
usecs -= g_iStartTime;
|
||||
return usecs / ONE_SECOND_IN_MICROSECONDS_DBL;
|
||||
constexpr double USEC_TO_SEC = 1.0 / 1000000.0;
|
||||
return static_cast<double>(RageTimer::GetTimeSinceStartMicroseconds()) * USEC_TO_SEC;
|
||||
}
|
||||
|
||||
std::uint64_t RageTimer::GetUsecsSinceStart()
|
||||
int RageTimer::GetTimeSinceStartSeconds()
|
||||
{
|
||||
return GetTime() - g_iStartTime;
|
||||
uint_fast64_t usec = RageTimer::GetTimeSinceStartMicroseconds();
|
||||
return static_cast<int>(usec / ONE_SECOND_IN_MICROSECONDS_FAST_ULL);
|
||||
}
|
||||
|
||||
uint_fast64_t RageTimer::GetTimeSinceStartMicroseconds()
|
||||
{
|
||||
return GetTime() - g_iStartTimeFast64;
|
||||
}
|
||||
|
||||
void RageTimer::Touch()
|
||||
|
||||
+2
-1
@@ -25,7 +25,8 @@ public:
|
||||
|
||||
static double GetTimeSinceStart(); // seconds since the program was started
|
||||
static float GetTimeSinceStartFast() { return GetTimeSinceStart(); }
|
||||
static std::uint64_t GetUsecsSinceStart();
|
||||
static int GetTimeSinceStartSeconds();
|
||||
static uint_fast64_t GetTimeSinceStartMicroseconds();
|
||||
|
||||
/* Get a timer representing half of the time ago as this one. */
|
||||
RageTimer Half() const;
|
||||
|
||||
@@ -252,6 +252,16 @@ RString SecondsToMSSMsMs( float fSecs )
|
||||
return sReturn;
|
||||
}
|
||||
|
||||
RString MicrosecondsToMMSSMsMs(uint64_t usecs)
|
||||
{
|
||||
const uint64_t totalSeconds = usecs / 1000000;
|
||||
const uint64_t iMinsDisplay = totalSeconds / 60;
|
||||
const uint64_t iSecsDisplay = totalSeconds % 60;
|
||||
const uint64_t iLeftoverDisplay = (usecs % 1000000) / 10000; // Adjusted for two decimal places
|
||||
RString sReturn = ssprintf("%02llu:%02llu.%02llu", iMinsDisplay, iSecsDisplay, std::min<uint64_t>(99, iLeftoverDisplay));
|
||||
return sReturn;
|
||||
}
|
||||
|
||||
RString SecondsToMMSSMsMsMs( float fSecs )
|
||||
{
|
||||
const int iMinsDisplay = static_cast<int>(fSecs/60);
|
||||
@@ -261,6 +271,16 @@ RString SecondsToMMSSMsMsMs( float fSecs )
|
||||
return sReturn;
|
||||
}
|
||||
|
||||
RString MicrosecondsToMMSSMsMsMs(uint64_t usecs)
|
||||
{
|
||||
const uint64_t totalSeconds = usecs / 1000000;
|
||||
const uint64_t iMinsDisplay = totalSeconds / 60;
|
||||
const uint64_t iSecsDisplay = totalSeconds % 60;
|
||||
const uint64_t iLeftoverDisplay = (usecs % 1000000) / 1000;
|
||||
RString sReturn = ssprintf("%02llu:%02llu.%03llu", iMinsDisplay, iSecsDisplay, std::min<uint64_t>(999, iLeftoverDisplay));
|
||||
return sReturn;
|
||||
}
|
||||
|
||||
RString SecondsToMSS( float fSecs )
|
||||
{
|
||||
const int iMinsDisplay = static_cast<int>(fSecs/60);
|
||||
|
||||
@@ -326,6 +326,8 @@ RString SecondsToHHMMSS( float fSecs );
|
||||
RString SecondsToMSSMsMs( float fSecs );
|
||||
RString SecondsToMMSSMsMs( float fSecs );
|
||||
RString SecondsToMMSSMsMsMs( float fSecs );
|
||||
RString MicrosecondsToMMSSMsMs(uint64_t usecs);
|
||||
RString MicrosecondsToMMSSMsMsMs(uint64_t usecs);
|
||||
RString SecondsToMSS( float fSecs );
|
||||
RString SecondsToMMSS( float fSecs );
|
||||
RString PrettyPercent( float fNumerator, float fDenominator );
|
||||
|
||||
@@ -1319,7 +1319,7 @@ class DebugLineForceCrash : public IDebugLine
|
||||
class DebugLineUptime : public IDebugLine
|
||||
{
|
||||
virtual RString GetDisplayTitle() { return UPTIME.GetValue(); }
|
||||
virtual RString GetDisplayValue() { return SecondsToMMSSMsMsMs(RageTimer::GetTimeSinceStart()); }
|
||||
virtual RString GetDisplayValue() { return MicrosecondsToMMSSMsMsMs(RageTimer::GetTimeSinceStartMicroseconds()); }
|
||||
virtual bool IsEnabled() { return false; }
|
||||
virtual void DoAndLog( RString &sMessageOut ) {}
|
||||
};
|
||||
|
||||
+9
-9
@@ -48,9 +48,9 @@ static Preference<float> g_iDefaultRecordLength( "DefaultRecordLength", 4 );
|
||||
static Preference<bool> g_bEditorShowBGChangesPlay( "EditorShowBGChangesPlay", true );
|
||||
|
||||
/** @brief How long must the button be held to generate a hold in record mode? */
|
||||
const float record_hold_default= 0.3f;
|
||||
float record_hold_seconds = record_hold_default;
|
||||
const float time_between_autosave= 300.0f; // 5 minutes. -Kyz
|
||||
constexpr uint_fast64_t record_hold_default = 300000; // 0.3 seconds in microseconds
|
||||
uint_fast64_t record_hold_seconds = record_hold_default;
|
||||
constexpr uint_fast64_t time_between_autosave = 300000000; // 300 seconds in microseconds
|
||||
|
||||
#define PLAYER_X (SCREEN_CENTER_X)
|
||||
#define PLAYER_Y (SCREEN_CENTER_Y)
|
||||
@@ -1666,8 +1666,8 @@ void ScreenEdit::Update( float fDeltaTime )
|
||||
|
||||
if(m_EditState == STATE_EDITING)
|
||||
{
|
||||
if(IsDirty() && m_next_autosave_time > -1.0f &&
|
||||
RageTimer::GetTimeSinceStartFast() > m_next_autosave_time)
|
||||
if(IsDirty() && m_next_autosave_time > -1000000 &&
|
||||
RageTimer::GetTimeSinceStartMicroseconds() > m_next_autosave_time)
|
||||
{
|
||||
PerformSave(true);
|
||||
}
|
||||
@@ -4362,7 +4362,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
|
||||
else if( SM == SM_AutoSaveSuccessful )
|
||||
{
|
||||
LOG->Trace("AutoSave successful.");
|
||||
m_next_autosave_time= RageTimer::GetTimeSinceStartFast() + time_between_autosave;
|
||||
m_next_autosave_time= RageTimer::GetTimeSinceStartMicroseconds() + time_between_autosave;
|
||||
SCREENMAN->SystemMessage(AUTOSAVE_SUCCESSFUL);
|
||||
}
|
||||
else if( SM == SM_SaveFailed ) // save failed; stay in the editor
|
||||
@@ -4438,19 +4438,19 @@ void ScreenEdit::SetDirty(bool dirty)
|
||||
if(EDIT_MODE.GetValue() != EditMode_Full)
|
||||
{
|
||||
m_dirty= false;
|
||||
m_next_autosave_time= -1.0f;
|
||||
m_next_autosave_time= -1000000;
|
||||
return;
|
||||
}
|
||||
if(dirty)
|
||||
{
|
||||
if(!m_dirty)
|
||||
{
|
||||
m_next_autosave_time= RageTimer::GetTimeSinceStartFast() + time_between_autosave;
|
||||
m_next_autosave_time= RageTimer::GetTimeSinceStartMicroseconds() + time_between_autosave;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
m_next_autosave_time= -1.0f;
|
||||
m_next_autosave_time= -1000000;
|
||||
}
|
||||
m_dirty= dirty;
|
||||
}
|
||||
|
||||
@@ -125,7 +125,7 @@ void ScreenStatsOverlay::UpdateSkips()
|
||||
|
||||
if( skip )
|
||||
{
|
||||
RString sTime( SecondsToMMSSMsMs(RageTimer::GetTimeSinceStartFast()) );
|
||||
RString sTime( MicrosecondsToMMSSMsMs(RageTimer::GetTimeSinceStartMicroseconds()) );
|
||||
|
||||
static const RageColor colors[] =
|
||||
{
|
||||
|
||||
@@ -86,9 +86,10 @@ void WheelNotifyIcon::Update( float fDeltaTime )
|
||||
/* We should probably end up parsing the vector and then dynamically
|
||||
* insert flag icons based on "priority". Easy to do, hopefully
|
||||
- Midiman */
|
||||
const float fSecondFraction = std::fmod( RageTimer::GetTimeSinceStartFast(), 1 );
|
||||
const int index = (int)(fSecondFraction*m_vIconsToShow.size());
|
||||
Sprite::SetState( m_vIconsToShow[index] );
|
||||
static std::uint_fast32_t updateCounter = 0;
|
||||
updateCounter++;
|
||||
const int index = updateCounter % m_vIconsToShow.size();
|
||||
Sprite::SetState(m_vIconsToShow[index]);
|
||||
}
|
||||
|
||||
Sprite::Update( fDeltaTime );
|
||||
|
||||
@@ -87,7 +87,7 @@ public:
|
||||
* underlying timers may be 32-bit, but implementations should try to avoid
|
||||
* wrapping if possible.
|
||||
*/
|
||||
static std::int64_t GetMicrosecondsSinceStart();
|
||||
static std::int64_t GetSystemTimeInMicroseconds();
|
||||
|
||||
/*
|
||||
* Add file search paths, higher priority first.
|
||||
@@ -129,7 +129,7 @@ public:
|
||||
void RegisterWithLua();
|
||||
|
||||
private:
|
||||
/* This are helpers for GetMicrosecondsSinceStart on systems with a timer
|
||||
/* This are helpers for GetSystemTimeInMicroseconds on systems with a timer
|
||||
* that may loop or move backwards. */
|
||||
static std::int64_t FixupTimeIfLooped( std::int64_t usecs );
|
||||
static std::int64_t FixupTimeIfBackwards( std::int64_t usecs );
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include <cstdint>
|
||||
|
||||
/*
|
||||
* This is a helper for GetMicrosecondsSinceStart on systems with a system
|
||||
* This is a helper for GetSystemTimeInMicroseconds on systems with a system
|
||||
* timer that may loop or move backwards.
|
||||
*
|
||||
* The time may decrease last for at least two reasons:
|
||||
@@ -23,7 +23,7 @@
|
||||
*
|
||||
* This helper only needs to be used if one or both of the above conditions can occur.
|
||||
* If the underlying timer is reliable, this doesn't need to be used (for a small
|
||||
* efficiency bonus). Also, you may omit this for GetMicrosecondsSinceStart() when
|
||||
* efficiency bonus). Also, you may omit this for GetSystemTimeInMicroseconds() when
|
||||
* bAccurate == false.
|
||||
*/
|
||||
|
||||
|
||||
@@ -258,7 +258,7 @@ bool ArchHooks_MacOSX::GoToURL( RString sUrl )
|
||||
return result == 0;
|
||||
}
|
||||
|
||||
std::int64_t ArchHooks::GetMicrosecondsSinceStart()
|
||||
std::int64_t ArchHooks::GetSystemTimeInMicroseconds()
|
||||
{
|
||||
// http://developer.apple.com/qa/qa2004/qa1398.html
|
||||
static double factor = 0.0;
|
||||
|
||||
@@ -120,7 +120,7 @@ static void TestTLS()
|
||||
#endif
|
||||
|
||||
#if 1
|
||||
/* If librt is available, use CLOCK_MONOTONIC to implement GetMicrosecondsSinceStart,
|
||||
/* If librt is available, use CLOCK_MONOTONIC to implement GetSystemTimeInMicroseconds,
|
||||
* if supported, so changes to the system clock don't cause problems. */
|
||||
namespace
|
||||
{
|
||||
@@ -149,7 +149,7 @@ clockid_t ArchHooks_Unix::GetClock()
|
||||
return g_Clock;
|
||||
}
|
||||
|
||||
std::int64_t ArchHooks::GetMicrosecondsSinceStart()
|
||||
std::int64_t ArchHooks::GetSystemTimeInMicroseconds()
|
||||
{
|
||||
OpenGetTime();
|
||||
|
||||
@@ -162,7 +162,7 @@ std::int64_t ArchHooks::GetMicrosecondsSinceStart()
|
||||
return iRet;
|
||||
}
|
||||
#else
|
||||
std::int64_t ArchHooks::GetMicrosecondsSinceStart()
|
||||
std::int64_t ArchHooks::GetSystemTimeInMicroseconds()
|
||||
{
|
||||
struct timeval tv;
|
||||
gettimeofday( &tv, nullptr );
|
||||
|
||||
@@ -13,7 +13,7 @@ public:
|
||||
void DumpDebugInfo();
|
||||
|
||||
void SetTime( tm newtime );
|
||||
std::int64_t GetMicrosecondsSinceStart();
|
||||
std::int64_t GetSystemTimeInMicroseconds();
|
||||
|
||||
void MountInitialFilesystems( const RString &sDirOfExecutable );
|
||||
float GetDisplayAspectRatio() { return 4.0f/3; }
|
||||
|
||||
@@ -39,7 +39,7 @@ static void InitTimer()
|
||||
QueryPerformanceFrequency(&g_liFrequency);
|
||||
}
|
||||
|
||||
std::int64_t ArchHooks::GetMicrosecondsSinceStart()
|
||||
std::int64_t ArchHooks::GetSystemTimeInMicroseconds()
|
||||
{
|
||||
// Make sure the timer is initialized.
|
||||
if (!g_bTimerInitialized) {
|
||||
|
||||
@@ -301,8 +301,9 @@ void RageSoundDriver::Update()
|
||||
// LOG->Trace("set (#%i) %p from STOPPING to HALTING", i, m_Sounds[i].m_pSound);
|
||||
}
|
||||
|
||||
static float fNext = 0;
|
||||
if( RageTimer::GetTimeSinceStart() >= fNext )
|
||||
constexpr uint_fast64_t iUsecs = 1000000;
|
||||
static uint_fast64_t fNextUsecs = 0;
|
||||
if (RageTimer::GetTimeSinceStartMicroseconds() >= fNextUsecs)
|
||||
{
|
||||
/* Lockless: only Mix() can write to underruns. */
|
||||
int current_underruns = underruns;
|
||||
@@ -314,7 +315,7 @@ void RageSoundDriver::Update()
|
||||
|
||||
/* Don't log again for at least a second, or we'll burst output
|
||||
* and possibly cause more underruns. */
|
||||
fNext = RageTimer::GetTimeSinceStart() + 1;
|
||||
fNextUsecs = RageTimer::GetTimeSinceStartMicroseconds() + iUsecs;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -493,7 +494,7 @@ std::int64_t RageSoundDriver::ClampHardwareFrame( std::int64_t iHardwareFrame )
|
||||
/* Clamp the output to one per second, so one underruns don't cascade due to
|
||||
* output spam. */
|
||||
static std::int64_t lastTime = 0;
|
||||
std::int64_t currentTime = RageTimer::GetUsecsSinceStart();
|
||||
std::int64_t currentTime = RageTimer::GetTimeSinceStartMicroseconds();
|
||||
if( lastTime == 0 || (currentTime - lastTime) > 1000000 )
|
||||
{
|
||||
LOG->Trace("RageSoundDriver: driver returned a lesser position (%" PRId64 " < %" PRId64 ")", iHardwareFrame, m_iMaxHardwareFrame);
|
||||
@@ -529,9 +530,9 @@ std::int64_t RageSoundDriver::GetHardwareFrame( RageTimer *pTimestamp=nullptr )
|
||||
|
||||
do
|
||||
{
|
||||
iStartTime = RageTimer::GetUsecsSinceStart();
|
||||
iStartTime = RageTimer::GetTimeSinceStartMicroseconds();
|
||||
iPositionFrames = GetPosition();
|
||||
std::uint64_t elapsedTime = RageTimer::GetUsecsSinceStart() - iStartTime;
|
||||
std::uint64_t elapsedTime = RageTimer::GetTimeSinceStartMicroseconds() - iStartTime;
|
||||
if (elapsedTime <= iThreshold) break;
|
||||
} while (--iTries);
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@ void RageSoundDriver_Null::Update()
|
||||
|
||||
std::int64_t RageSoundDriver_Null::GetPosition() const
|
||||
{
|
||||
return std::int64_t( RageTimer::GetTimeSinceStart() * m_iSampleRate );
|
||||
return (RageTimer::GetTimeSinceStartMicroseconds() * m_iSampleRate) / 1000000;
|
||||
}
|
||||
|
||||
RageSoundDriver_Null::RageSoundDriver_Null()
|
||||
|
||||
Reference in New Issue
Block a user