|
|
@ -1153,7 +1153,18 @@ static void pop_lock() |
|
|
|
void CCriticalSection::Enter(const char* pszName, const char* pszFile, int nLine) |
|
|
|
void CCriticalSection::Enter(const char* pszName, const char* pszFile, int nLine) |
|
|
|
{ |
|
|
|
{ |
|
|
|
push_lock(this, CLockLocation(pszName, pszFile, nLine)); |
|
|
|
push_lock(this, CLockLocation(pszName, pszFile, nLine)); |
|
|
|
|
|
|
|
#ifdef DEBUG_LOCKCONTENTION |
|
|
|
|
|
|
|
bool result = mutex.try_lock(); |
|
|
|
|
|
|
|
if (!result) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
printf("LOCKCONTENTION: %s\n", pszName); |
|
|
|
|
|
|
|
printf("Locker: %s:%d\n", pszFile, nLine); |
|
|
|
mutex.lock(); |
|
|
|
mutex.lock(); |
|
|
|
|
|
|
|
printf("Locked\n"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
#else |
|
|
|
|
|
|
|
mutex.lock(); |
|
|
|
|
|
|
|
#endif |
|
|
|
} |
|
|
|
} |
|
|
|
void CCriticalSection::Leave() |
|
|
|
void CCriticalSection::Leave() |
|
|
|
{ |
|
|
|
{ |
|
|
@ -1170,9 +1181,19 @@ bool CCriticalSection::TryEnter(const char* pszName, const char* pszFile, int nL |
|
|
|
|
|
|
|
|
|
|
|
#else |
|
|
|
#else |
|
|
|
|
|
|
|
|
|
|
|
void CCriticalSection::Enter(const char*, const char*, int) |
|
|
|
void CCriticalSection::Enter(const char* pszName, const char* pszFile, int nLine) |
|
|
|
{ |
|
|
|
{ |
|
|
|
|
|
|
|
#ifdef DEBUG_LOCKCONTENTION |
|
|
|
|
|
|
|
bool result = mutex.try_lock(); |
|
|
|
|
|
|
|
if (!result) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
printf("LOCKCONTENTION: %s\n", pszName); |
|
|
|
|
|
|
|
printf("Locker: %s:%d\n", pszFile, nLine); |
|
|
|
|
|
|
|
mutex.lock(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
#else |
|
|
|
mutex.lock(); |
|
|
|
mutex.lock(); |
|
|
|
|
|
|
|
#endif |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void CCriticalSection::Leave() |
|
|
|
void CCriticalSection::Leave() |
|
|
|