GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-15 12:51:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve "detected inconsistent lock order" error message

Browse source
This commit is contained in:
Hennadii Stepanov 2020-06-22 18:43:43 +03:00
parent bbe9cf4fe4
commit 0ecff9dd34
No known key found for this signature in database
GPG key ID: 410108112E7EA81F
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/sync.cpp
View file

@ -60,7 +60,7 @@ struct CLockLocation {
std::string ToString() const std::string ToString() const
{ {
return strprintf( return strprintf(
"%s %s:%s%s (in thread %s)", "'%s' in %s:%s%s (in thread '%s')",
mutexName, sourceFile, sourceLine, (fTry ? " (TRY)" : ""), m_thread_name); mutexName, sourceFile, sourceLine, (fTry ? " (TRY)" : ""), m_thread_name);
} }
@ -129,7 +129,7 @@ static void potential_deadlock_detected(const LockPair& mismatch, const LockStac
LogPrintf(" %s\n", i.second.ToString()); LogPrintf(" %s\n", i.second.ToString());
} }
if (g_debug_lockorder_abort) { if (g_debug_lockorder_abort) {
tfm::format(std::cerr, "Assertion failed: detected inconsistent lock order at %s:%i, details in debug log.\n", __FILE__, __LINE__); tfm::format(std::cerr, "Assertion failed: detected inconsistent lock order for %s, details in debug log.\n", s2.back().second.ToString());
abort(); abort();
} }
throw std::logic_error(strprintf("potential deadlock detected: %s -> %s -> %s", mutex_b, mutex_a, mutex_b)); throw std::logic_error(strprintf("potential deadlock detected: %s -> %s -> %s", mutex_b, mutex_a, mutex_b));