|
|
@ -78,7 +78,7 @@ static void push_lock(void* c, const CLockLocation& locklocation, bool fTry) |
|
|
|
if (lockstack.get() == NULL) |
|
|
|
if (lockstack.get() == NULL) |
|
|
|
lockstack.reset(new LockStack); |
|
|
|
lockstack.reset(new LockStack); |
|
|
|
|
|
|
|
|
|
|
|
if (fDebug) LogPrintf("Locking: %s\n", locklocation.ToString().c_str()); |
|
|
|
LogPrint("lock", "Locking: %s\n", locklocation.ToString().c_str()); |
|
|
|
dd_mutex.lock(); |
|
|
|
dd_mutex.lock(); |
|
|
|
|
|
|
|
|
|
|
|
(*lockstack).push_back(std::make_pair(c, locklocation)); |
|
|
|
(*lockstack).push_back(std::make_pair(c, locklocation)); |
|
|
@ -108,7 +108,7 @@ static void pop_lock() |
|
|
|
if (fDebug) |
|
|
|
if (fDebug) |
|
|
|
{ |
|
|
|
{ |
|
|
|
const CLockLocation& locklocation = (*lockstack).rbegin()->second; |
|
|
|
const CLockLocation& locklocation = (*lockstack).rbegin()->second; |
|
|
|
LogPrintf("Unlocked: %s\n", locklocation.ToString().c_str()); |
|
|
|
LogPrint("lock", "Unlocked: %s\n", locklocation.ToString().c_str()); |
|
|
|
} |
|
|
|
} |
|
|
|
dd_mutex.lock(); |
|
|
|
dd_mutex.lock(); |
|
|
|
(*lockstack).pop_back(); |
|
|
|
(*lockstack).pop_back(); |
|
|
|