highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-12-04 01:32:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do not report spurious deadlocks caused by TRY_LOCK

Browse Source
This commit is contained in:
Pieter Wuille
2012-04-07 18:55:29 +02:00
parent 908037fe16
commit f342dac1cb
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/util.cpp
View File

@@ -1141,7 +1141,7 @@ static void potential_deadlock_detected(const std::pair<void*, void*>& mismatch,
}
}
static void push_lock(void* c, const CLockLocation& locklocation)
static void push_lock(void* c, const CLockLocation& locklocation, bool fTry)
{
bool fOrderOK = true;
if (lockstack.get() == NULL)
@@ -1152,7 +1152,7 @@ static void push_lock(void* c, const CLockLocation& locklocation)
(*lockstack).push_back(std::make_pair(c, locklocation));
BOOST_FOREACH(const PAIRTYPE(void*, CLockLocation)& i, (*lockstack))
if (!fTry) BOOST_FOREACH(const PAIRTYPE(void*, CLockLocation)& i, (*lockstack))
{
if (i.first == c) break;
@@ -1183,9 +1183,9 @@ static void pop_lock()
dd_mutex.unlock();
}
void EnterCritical(const char* pszName, const char* pszFile, int nLine, void* cs)
void EnterCritical(const char* pszName, const char* pszFile, int nLine, void* cs, bool fTry)
{
push_lock(cs, CLockLocation(pszName, pszFile, nLine));
push_lock(cs, CLockLocation(pszName, pszFile, nLine), fTry);
}
void LeaveCritical()