highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-20 05:42:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

log: Avoid broken DEBUG_LOCKORDER log

Browse Source
This commit is contained in:
MarcoFalke 2021-09-27 13:55:34 +02:00
parent faffaa85cd
commit faeae2980f
No known key found for this signature in database
GPG Key ID: CE2B75697E69A548
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/sync.cpp
View File

@ -97,27 +97,29 @@ static void potential_deadlock_detected(const LockPair& mismatch, const LockStac
LogPrintf("POTENTIAL DEADLOCK DETECTED\n");
LogPrintf("Previous lock order was:\n");
for (const LockStackItem& i : s1) {
std::string prefix{};
if (i.first == mismatch.first) {
LogPrintf(" (1)"); /* Continued */
prefix = " (1)";
}
if (i.first == mismatch.second) {
LogPrintf(" (2)"); /* Continued */
prefix = " (2)";
}
LogPrintf(" %s\n", i.second.ToString());
LogPrintf("%s %s\n", prefix, i.second.ToString());
}
std::string mutex_a, mutex_b;
LogPrintf("Current lock order is:\n");
for (const LockStackItem& i : s2) {
std::string prefix{};
if (i.first == mismatch.first) {
LogPrintf(" (1)"); /* Continued */
prefix = " (1)";
mutex_a = i.second.Name();
}
if (i.first == mismatch.second) {
LogPrintf(" (2)"); /* Continued */
prefix = " (2)";
mutex_b = i.second.Name();
}
LogPrintf(" %s\n", i.second.ToString());
LogPrintf("%s %s\n", prefix, i.second.ToString());
}
if (g_debug_lockorder_abort) {
tfm::format(std::cerr, "Assertion failed: detected inconsistent lock order for %s, details in debug log.\n", s2.back().second.ToString());
@ -131,10 +133,11 @@ static void double_lock_detected(const void* mutex, const LockStack& lock_stack)
LogPrintf("DOUBLE LOCK DETECTED\n");
LogPrintf("Lock order:\n");
for (const LockStackItem& i : lock_stack) {
std::string prefix{};
if (i.first == mutex) {
LogPrintf(" (*)"); /* Continued */
prefix = " (*)";
}
LogPrintf(" %s\n", i.second.ToString());
LogPrintf("%s %s\n", prefix, i.second.ToString());
}
if (g_debug_lockorder_abort) {
tfm::format(std::cerr,