LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge branch 'lockcontention' of https://github.com/TheBlueMatt/bitcoin

Browse source
This commit is contained in:
Gavin Andresen 2012-01-23 13:15:43 -05:00
commit a702ceaafc
1 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/util.cpp
View file

@ -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(); mutex.lock();
}
#else
mutex.lock();
#endif
} }
void CCriticalSection::Leave() void CCriticalSection::Leave()