|
|
|
@ -110,7 +110,6 @@ static void push_lock(void* c, const CLockLocation& locklocation, bool fTry)
@@ -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; |
|
|
|
@ -125,7 +124,6 @@ static void push_lock(void* c, const CLockLocation& locklocation, bool fTry)
@@ -125,7 +124,6 @@ static void push_lock(void* c, const CLockLocation& locklocation, bool fTry)
|
|
|
|
|
if (lockdata.lockorders.count(p2)) |
|
|
|
|
potential_deadlock_detected(p1, lockdata.lockorders[p2], lockdata.lockorders[p1]); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
static void pop_lock() |
|
|
|
|