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

include the name of threads and the mutex on mutex deadlock

Browse Source
This commit is contained in:
Glenn Maynard
2004-03-21 04:28:38 +00:00
parent 642b9ba141
commit 4f7432794a
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageThreads.cpp
+21 -13
View File
@@ -475,19 +475,21 @@ struct RageMutexImpl
HANDLE mutex; HANDLE mutex;
DWORD LockedBy; DWORD LockedBy;
volatile int LockCnt; volatile int LockCnt;
RageMutex *m_Parent;
RageMutexImpl(); RageMutexImpl( RageMutex *parent );
~RageMutexImpl(); ~RageMutexImpl();
void Lock(); void Lock();
void Unlock(); void Unlock();
}; };
RageMutexImpl::RageMutexImpl() RageMutexImpl::RageMutexImpl( RageMutex *parent )
{ {
mutex = CreateMutex( NULL, false, NULL ); mutex = CreateMutex( NULL, false, NULL );
LockedBy = NULL; LockedBy = NULL;
LockCnt = 0; LockCnt = 0;
m_Parent = parent;
} }
RageMutexImpl::~RageMutexImpl() RageMutexImpl::~RageMutexImpl()
@@ -569,19 +571,21 @@ struct RageMutexImpl
volatile int LockCnt; volatile int LockCnt;
pthread_mutex_t mutex; pthread_mutex_t mutex;
RageMutex *m_Parent;
RageMutexImpl(); RageMutexImpl( RageMutex *parent );
~RageMutexImpl(); ~RageMutexImpl();
void Lock(); void Lock();
void Unlock(); void Unlock();
}; };
RageMutexImpl::RageMutexImpl() RageMutexImpl::RageMutexImpl( RageMutex *parent )
{ {
pthread_mutex_init( &mutex, NULL ); pthread_mutex_init( &mutex, NULL );
LockedBy = 0; LockedBy = 0;
LockCnt = 0; LockCnt = 0;
m_Parent = parent;
} }
RageMutexImpl::~RageMutexImpl() RageMutexImpl::~RageMutexImpl()
@@ -639,18 +643,20 @@ void RageMutexImpl::Lock()
} }
} }
ThreadSlot *slot = FindThread( LockedBy ); const ThreadSlot *slot = FindThread( LockedBy );
CString ThisThread = RageThread::GetCurThreadName();
CString OtherThread = slot? slot->GetThreadName():"(unknown)";
CString reason = ssprintf( "Thread deadlock between \"%s\" and \"%s\" while locking \"%s\"",
RageThread::GetCurThreadName(), slot->GetThreadName(), m_Parent->m_sName.c_str() );
if( slot == NULL ) if( slot == NULL )
{ {
CString reason = ssprintf( "Thread deadlock between \"%s\" and an unknown thread",
RageThread::GetCurThreadName() );
ForceCrashHandler( reason ); ForceCrashHandler( reason );
_exit(1); _exit(1);
} }
CString reason = ssprintf( "Thread deadlock between \"%s\" and \"%s\"",
RageThread::GetCurThreadName(), slot->GetThreadName() );
BacktraceContext ctx; BacktraceContext ctx;
if( !GetThreadBacktraceContext( slot->pid, &ctx ) ) if( !GetThreadBacktraceContext( slot->pid, &ctx ) )
{ {
@@ -689,19 +695,21 @@ struct RageMutexImpl
volatile int LockCnt; volatile int LockCnt;
SDL_mutex *mutex; SDL_mutex *mutex;
RageMutex *m_Parent;
RageMutexImpl(); RageMutexImpl( RageMutex *parent );
~RageMutexImpl(); ~RageMutexImpl();
void Lock(); void Lock();
void Unlock(); void Unlock();
}; };
RageMutexImpl::RageMutexImpl() RageMutexImpl::RageMutexImpl( RageMutex *parent )
{ {
mutex = SDL_CreateMutex(); mutex = SDL_CreateMutex();
LockedBy = 0; LockedBy = 0;
LockCnt = 0; LockCnt = 0;
m_Parent = parent;
} }
RageMutexImpl::~RageMutexImpl() RageMutexImpl::~RageMutexImpl()
@@ -740,7 +748,7 @@ void RageMutexImpl::Unlock()
RageMutex::RageMutex( const CString name ): RageMutex::RageMutex( const CString name ):
m_sName( name ) m_sName( name )
{ {
mut = new RageMutexImpl; mut = new RageMutexImpl(this);
} }
RageMutex::~RageMutex() RageMutex::~RageMutex()