actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Glenn Maynard
2005-04-05 05:07:13 +00:00
parent d6bbf9c0f8
commit af231d1a63
3 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp
+5 -7
View File
@@ -17,8 +17,7 @@
#endif #endif
int64_t ArchHooks_Unix::iStartTime = 0; int64_t ArchHooks_Unix::m_iStartTime = 0;
bool ArchHooks_Unix::bTimerInitialized = false;
static bool IsFatalSignal( int signal ) static bool IsFatalSignal( int signal )
{ {
@@ -108,11 +107,10 @@ static int64_t GetMicrosecondsSinceEpoch()
int64_t ArchHooks::GetMicrosecondsSinceStart( bool bAccurate ) int64_t ArchHooks::GetMicrosecondsSinceStart( bool bAccurate )
{ {
if (!ArchHooks_Unix::bTimerInitialized) { if( ArchHooks_Unix::m_iStartTime == 0 )
ArchHooks_Unix::bTimerInitialized = true; ArchHooks_Unix::m_iStartTime = GetMicrosecondsSinceEpoch();
ArchHooks_Unix::iStartTime = GetMicrosecondsSinceEpoch();
} int64_t ret = GetMicrosecondsSinceEpoch() - ArchHooks_Unix::m_iStartTime;
int64_t ret = GetMicrosecondsSinceEpoch() - ArchHooks_Unix::iStartTime;
if( bAccurate ) if( bAccurate )
ret = FixupTimeIfBackwards( ret ); ret = FixupTimeIfBackwards( ret );
return ret; return ret;
stepmania/src/arch/ArchHooks/ArchHooks_Unix.h
+1 -2
View File
@@ -5,8 +5,7 @@
class ArchHooks_Unix: public ArchHooks class ArchHooks_Unix: public ArchHooks
{ {
public: public:
static int64_t iStartTime; static int64_t m_iStartTime;
static bool bTimerInitialized;
ArchHooks_Unix(); ArchHooks_Unix();
void DumpDebugInfo(); void DumpDebugInfo();
stepmania/src/arch/Threads/Threads_Pthreads.cpp
+2 -2
View File
@@ -227,8 +227,8 @@ bool EventImpl_Pthreads::Wait( RageTimer *pTimeout )
} }
timespec abstime; timespec abstime;
abstime.tv_sec = pTimeout->m_secs + ArchHooks_Unix::iStartTime/1000000; abstime.tv_sec = pTimeout->m_secs + ArchHooks_Unix::m_iStartTime/1000000;
abstime.tv_nsec = (pTimeout->m_us + ArchHooks_Unix::iStartTime%1000000) * 1000; abstime.tv_nsec = (pTimeout->m_us + ArchHooks_Unix::m_iStartTime%1000000) * 1000;
int iRet = pthread_cond_timedwait( &m_Cond, &m_pParent->mutex, &abstime ); int iRet = pthread_cond_timedwait( &m_Cond, &m_pParent->mutex, &abstime );
return iRet != ETIMEDOUT; return iRet != ETIMEDOUT;
} }