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:
Steve Checkoway
2005-12-15 08:59:27 +00:00
parent 315d907ef1
commit 5e7176015a
1 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageThreads.cpp
+22 -21
View File
@@ -79,13 +79,12 @@ struct ThreadSlot
}; };
void ThreadSlot::ThreadCheckpoint::Set(const char *File_, int Line_, const char *Message_) void ThreadSlot::ThreadCheckpoint::Set( const char *File_, int Line_, const char *Message_ )
{ {
File=File_; File=File_;
Line=Line_; Line=Line_;
Message=Message_; Message=Message_;
sprintf( FormattedBuf, " %s:%i %s", sprintf( FormattedBuf, " %s:%i %s", File, Line, Message? Message:"" );
File, Line, Message? Message:"" );
} }
const char *ThreadSlot::ThreadCheckpoint::GetFormattedCheckpoint() const char *ThreadSlot::ThreadCheckpoint::GetFormattedCheckpoint()
@@ -118,11 +117,11 @@ struct ThreadSlot *g_pUnknownThreadSlot = NULL;
/* Lock this mutex before using or modifying pImpl. Other values are just identifiers, /* Lock this mutex before using or modifying pImpl. Other values are just identifiers,
* so possibly racing over them is harmless (simply using a stale thread ID, etc). */ * so possibly racing over them is harmless (simply using a stale thread ID, etc). */
static RageMutex g_ThreadSlotsLock("ThreadSlots"); static RageMutex g_ThreadSlotsLock( "ThreadSlots" );
static int FindEmptyThreadSlot() static int FindEmptyThreadSlot()
{ {
LockMut(g_ThreadSlotsLock); LockMut( g_ThreadSlotsLock );
for( int entry = 0; entry < MAX_THREADS; ++entry ) for( int entry = 0; entry < MAX_THREADS; ++entry )
{ {
if( g_ThreadSlots[entry].used ) if( g_ThreadSlots[entry].used )
@@ -132,7 +131,7 @@ static int FindEmptyThreadSlot()
return entry; return entry;
} }
RageException::Throw("Out of thread slots!"); RageException::Throw( "Out of thread slots!" );
} }
static void InitThreads() static void InitThreads()
@@ -205,7 +204,7 @@ const char *ThreadSlot::GetThreadName() const
{ {
/* This function may be called in crash conditions, so guarantee the string /* This function may be called in crash conditions, so guarantee the string
* is null-terminated. */ * is null-terminated. */
name[ sizeof(name)-1] = 0; name[sizeof(name)-1] = 0;
return name; return name;
} }
@@ -226,11 +225,13 @@ void RageThread::Create( int (*fn)(void *), void *data )
if( name == "" ) if( name == "" )
{ {
if( LOG ) if( LOG )
LOG->Warn("Created a thread without naming it first."); LOG->Warn( "Created a thread without naming it first." );
/* If you don't name it, I will: */ /* If you don't name it, I will: */
strcpy( m_pSlot->name, "Joe" ); strcpy( m_pSlot->name, "Joe" );
} else { }
else
{
strcpy( m_pSlot->name, name.c_str() ); strcpy( m_pSlot->name, name.c_str() );
} }
@@ -315,7 +316,7 @@ int RageThread::Wait()
else else
ret = m_pSlot->pImpl->Wait(); ret = m_pSlot->pImpl->Wait();
LockMut(g_ThreadSlotsLock); LockMut( g_ThreadSlotsLock );
delete m_pSlot->pImpl; delete m_pSlot->pImpl;
m_pSlot->pImpl = NULL; m_pSlot->pImpl = NULL;
@@ -393,7 +394,7 @@ static const char *GetCheckpointLog( int slotno, int lineno )
return NULL; return NULL;
/* Only show the "Unknown thread" entry if it has at least one checkpoint. */ /* Only show the "Unknown thread" entry if it has at least one checkpoint. */
if( &slot == g_pUnknownThreadSlot && slot.GetFormattedCheckpoint( 0 ) == NULL ) if( &slot == g_pUnknownThreadSlot && slot.GetFormattedCheckpoint(0) == NULL )
return NULL; return NULL;
if( lineno != 0 ) if( lineno != 0 )
@@ -416,7 +417,7 @@ void Checkpoints::GetLogs( char *pBuf, int iSize, const char *delim )
strcat( pBuf, buf ); strcat( pBuf, buf );
strcat( pBuf, delim ); strcat( pBuf, delim );
for( int line = 1; (buf = GetCheckpointLog( slotno, line )) != NULL; ++line ) for( int line = 1; (buf = GetCheckpointLog(slotno, line)) != NULL; ++line )
{ {
strcat( pBuf, buf ); strcat( pBuf, buf );
strcat( pBuf, delim ); strcat( pBuf, delim );
@@ -569,7 +570,7 @@ RageMutex::~RageMutex()
void RageMutex::Lock() void RageMutex::Lock()
{ {
uint64_t iThisThreadId = (uint64_t) GetThisThreadId(); uint64_t iThisThreadId = GetThisThreadId();
if( m_LockedBy == iThisThreadId ) if( m_LockedBy == iThisThreadId )
{ {
++m_LockCnt; ++m_LockCnt;
@@ -612,7 +613,7 @@ void RageMutex::Lock()
bool RageMutex::TryLock() bool RageMutex::TryLock()
{ {
if( m_LockedBy == (uint64_t) GetThisThreadId() ) if( m_LockedBy == GetThisThreadId() )
{ {
++m_LockCnt; ++m_LockCnt;
return true; return true;
@@ -644,11 +645,11 @@ bool RageMutex::IsLockedByThisThread() const
return m_LockedBy == GetThisThreadId(); return m_LockedBy == GetThisThreadId();
} }
LockMutex::LockMutex(RageMutex &pMutex, const char *file_, int line_): LockMutex::LockMutex( RageMutex &pMutex, const char *file_, int line_ ):
mutex(pMutex), mutex( pMutex ),
file(file_), file( file_ ),
line(line_), line( line_ ),
locked_at(RageTimer::GetTimeSinceStart()) locked_at( RageTimer::GetTimeSinceStart() )
{ {
mutex.Lock(); mutex.Lock();
locked = true; locked = true;
@@ -656,7 +657,7 @@ LockMutex::LockMutex(RageMutex &pMutex, const char *file_, int line_):
LockMutex::~LockMutex() LockMutex::~LockMutex()
{ {
if(locked) if( locked )
mutex.Unlock(); mutex.Unlock();
} }
@@ -676,7 +677,7 @@ void LockMutex::Unlock()
} }
RageEvent::RageEvent( CString name ): RageEvent::RageEvent( CString name ):
RageMutex(name) RageMutex( name )
{ {
m_pEvent = MakeEvent( m_pMutex ); m_pEvent = MakeEvent( m_pMutex );
} }