From af231d1a63dc203c097fae71ef731fe1304e3323 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 5 Apr 2005 05:07:13 +0000 Subject: [PATCH] cleanup --- stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp | 12 +++++------- stepmania/src/arch/ArchHooks/ArchHooks_Unix.h | 3 +-- stepmania/src/arch/Threads/Threads_Pthreads.cpp | 4 ++-- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp b/stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp index 35f48fdc4f..78830361e6 100644 --- a/stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp +++ b/stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp @@ -17,8 +17,7 @@ #endif -int64_t ArchHooks_Unix::iStartTime = 0; -bool ArchHooks_Unix::bTimerInitialized = false; +int64_t ArchHooks_Unix::m_iStartTime = 0; static bool IsFatalSignal( int signal ) { @@ -108,11 +107,10 @@ static int64_t GetMicrosecondsSinceEpoch() int64_t ArchHooks::GetMicrosecondsSinceStart( bool bAccurate ) { - if (!ArchHooks_Unix::bTimerInitialized) { - ArchHooks_Unix::bTimerInitialized = true; - ArchHooks_Unix::iStartTime = GetMicrosecondsSinceEpoch(); - } - int64_t ret = GetMicrosecondsSinceEpoch() - ArchHooks_Unix::iStartTime; + if( ArchHooks_Unix::m_iStartTime == 0 ) + ArchHooks_Unix::m_iStartTime = GetMicrosecondsSinceEpoch(); + + int64_t ret = GetMicrosecondsSinceEpoch() - ArchHooks_Unix::m_iStartTime; if( bAccurate ) ret = FixupTimeIfBackwards( ret ); return ret; diff --git a/stepmania/src/arch/ArchHooks/ArchHooks_Unix.h b/stepmania/src/arch/ArchHooks/ArchHooks_Unix.h index a09f801bbd..c23317111f 100644 --- a/stepmania/src/arch/ArchHooks/ArchHooks_Unix.h +++ b/stepmania/src/arch/ArchHooks/ArchHooks_Unix.h @@ -5,8 +5,7 @@ class ArchHooks_Unix: public ArchHooks { public: - static int64_t iStartTime; - static bool bTimerInitialized; + static int64_t m_iStartTime; ArchHooks_Unix(); void DumpDebugInfo(); diff --git a/stepmania/src/arch/Threads/Threads_Pthreads.cpp b/stepmania/src/arch/Threads/Threads_Pthreads.cpp index ffdbfdf2cf..8c72134ddb 100644 --- a/stepmania/src/arch/Threads/Threads_Pthreads.cpp +++ b/stepmania/src/arch/Threads/Threads_Pthreads.cpp @@ -227,8 +227,8 @@ bool EventImpl_Pthreads::Wait( RageTimer *pTimeout ) } timespec abstime; - abstime.tv_sec = pTimeout->m_secs + ArchHooks_Unix::iStartTime/1000000; - abstime.tv_nsec = (pTimeout->m_us + ArchHooks_Unix::iStartTime%1000000) * 1000; + abstime.tv_sec = pTimeout->m_secs + ArchHooks_Unix::m_iStartTime/1000000; + abstime.tv_nsec = (pTimeout->m_us + ArchHooks_Unix::m_iStartTime%1000000) * 1000; int iRet = pthread_cond_timedwait( &m_Cond, &m_pParent->mutex, &abstime ); return iRet != ETIMEDOUT; }