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

dsiable g_MutexList and g_FreeMutexIDs: they're not threadsafe themselves,

Browse Source 
and they're only used by MarkLockedMutex which is already disabled
This commit is contained in:
Glenn Maynard
2004-06-09 17:15:58 +00:00
parent e915e5d4d5
commit b2b661dd8c
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageThreads.cpp
+8 -3
View File
@@ -47,7 +47,7 @@
/* XXX: char*GetLockedMutexesForThisThread? */ /* XXX: char*GetLockedMutexesForThisThread? */
#define MAX_THREADS 128 #define MAX_THREADS 128
static vector<RageMutex*> *g_MutexList = NULL; /* watch out for static initialization order problems */ //static vector<RageMutex*> *g_MutexList = NULL; /* watch out for static initialization order problems */
static const unsigned int UnknownThreadID = 0xFFFFFFFF; static const unsigned int UnknownThreadID = 0xFFFFFFFF;
struct ThreadSlot struct ThreadSlot
@@ -776,6 +776,7 @@ bool RageMutexImpl::IsLockedByThisThread() const
} }
#endif #endif
#if 0
static const int MAX_MUTEXES = 256; static const int MAX_MUTEXES = 256;
/* g_MutexesBefore[n] is a list of mutex IDs which must be locked before n (if at all). /* g_MutexesBefore[n] is a list of mutex IDs which must be locked before n (if at all).
@@ -843,13 +844,14 @@ void RageMutex::MarkLockedMutex()
/* XXX: How can g_FreeMutexIDs and g_MutexList be threadsafed? */ /* XXX: How can g_FreeMutexIDs and g_MutexList be threadsafed? */
static set<int> *g_FreeMutexIDs = NULL; static set<int> *g_FreeMutexIDs = NULL;
#endif
RageMutex::RageMutex( const CString name ): RageMutex::RageMutex( const CString name ):
m_sName( name ) m_sName( name )
{ {
mut = new RageMutexImpl(this); mut = new RageMutexImpl(this);
if( g_FreeMutexIDs == NULL ) /* if( g_FreeMutexIDs == NULL )
{ {
g_FreeMutexIDs = new set<int>; g_FreeMutexIDs = new set<int>;
for( int i = 0; i < MAX_MUTEXES; ++i ) for( int i = 0; i < MAX_MUTEXES; ++i )
@@ -871,16 +873,19 @@ RageMutex::RageMutex( const CString name ):
} }
m_UniqueID = *g_FreeMutexIDs->begin(); m_UniqueID = *g_FreeMutexIDs->begin();
g_FreeMutexIDs->erase( g_FreeMutexIDs->begin() ); g_FreeMutexIDs->erase( g_FreeMutexIDs->begin() );
if( g_MutexList == NULL ) if( g_MutexList == NULL )
g_MutexList = new vector<RageMutex*>; g_MutexList = new vector<RageMutex*>;
g_MutexList->push_back( this ); g_MutexList->push_back( this );
*/
} }
RageMutex::~RageMutex() RageMutex::~RageMutex()
{ {
/*
vector<RageMutex*>::iterator it = find( g_MutexList->begin(), g_MutexList->end(), this ); vector<RageMutex*>::iterator it = find( g_MutexList->begin(), g_MutexList->end(), this );
ASSERT( it != g_MutexList->end() ); ASSERT( it != g_MutexList->end() );
g_MutexList->erase( it ); g_MutexList->erase( it );
@@ -893,7 +898,7 @@ RageMutex::~RageMutex()
delete mut; delete mut;
g_FreeMutexIDs->insert( m_UniqueID ); g_FreeMutexIDs->insert( m_UniqueID );
*/
} }
void RageMutex::Lock() void RageMutex::Lock()