Further-enforce lockordering by enforcing directly after TRY_LOCKs

This commit is contained in:
Matt Corallo 2017-02-07 14:15:28 -05:00
parent 2a962d4540
commit 618ee9249b

View File

@ -110,7 +110,6 @@ static void push_lock(void* c, const CLockLocation& locklocation, bool fTry)
(*lockstack).push_back(std::make_pair(c, locklocation));
if (!fTry) {
BOOST_FOREACH (const PAIRTYPE(void*, CLockLocation) & i, (*lockstack)) {
if (i.first == c)
break;
@ -126,7 +125,6 @@ static void push_lock(void* c, const CLockLocation& locklocation, bool fTry)
potential_deadlock_detected(p1, lockdata.lockorders[p2], lockdata.lockorders[p1]);
}
}
}
static void pop_lock()
{