Always enforce lock strict lock ordering (try or not)
This commit is contained in:
parent
fd13eca147
commit
8465631845
1 changed files with 1 additions and 25 deletions
26
src/sync.cpp
26
src/sync.cpp
|
@ -77,52 +77,28 @@ boost::thread_specific_ptr<LockStack> lockstack;
|
|||
|
||||
static void potential_deadlock_detected(const std::pair<void*, void*>& mismatch, const LockStack& s1, const LockStack& s2)
|
||||
{
|
||||
// We attempt to not assert on probably-not deadlocks by assuming that
|
||||
// a try lock will immediately have otherwise bailed if it had
|
||||
// failed to get the lock
|
||||
// We do this by, for the locks which triggered the potential deadlock,
|
||||
// in either lockorder, checking that the second of the two which is locked
|
||||
// is only a TRY_LOCK, ignoring locks if they are reentrant.
|
||||
bool firstLocked = false;
|
||||
bool secondLocked = false;
|
||||
bool onlyMaybeDeadlock = false;
|
||||
|
||||
LogPrintf("POTENTIAL DEADLOCK DETECTED\n");
|
||||
LogPrintf("Previous lock order was:\n");
|
||||
BOOST_FOREACH (const PAIRTYPE(void*, CLockLocation) & i, s2) {
|
||||
if (i.first == mismatch.first) {
|
||||
LogPrintf(" (1)");
|
||||
if (!firstLocked && secondLocked && i.second.fTry)
|
||||
onlyMaybeDeadlock = true;
|
||||
firstLocked = true;
|
||||
}
|
||||
if (i.first == mismatch.second) {
|
||||
LogPrintf(" (2)");
|
||||
if (!secondLocked && firstLocked && i.second.fTry)
|
||||
onlyMaybeDeadlock = true;
|
||||
secondLocked = true;
|
||||
}
|
||||
LogPrintf(" %s\n", i.second.ToString());
|
||||
}
|
||||
firstLocked = false;
|
||||
secondLocked = false;
|
||||
LogPrintf("Current lock order is:\n");
|
||||
BOOST_FOREACH (const PAIRTYPE(void*, CLockLocation) & i, s1) {
|
||||
if (i.first == mismatch.first) {
|
||||
LogPrintf(" (1)");
|
||||
if (!firstLocked && secondLocked && i.second.fTry)
|
||||
onlyMaybeDeadlock = true;
|
||||
firstLocked = true;
|
||||
}
|
||||
if (i.first == mismatch.second) {
|
||||
LogPrintf(" (2)");
|
||||
if (!secondLocked && firstLocked && i.second.fTry)
|
||||
onlyMaybeDeadlock = true;
|
||||
secondLocked = true;
|
||||
}
|
||||
LogPrintf(" %s\n", i.second.ToString());
|
||||
}
|
||||
assert(onlyMaybeDeadlock);
|
||||
assert(false);
|
||||
}
|
||||
|
||||
static void push_lock(void* c, const CLockLocation& locklocation, bool fTry)
|
||||
|
|
Loading…
Reference in a new issue