LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

threads: add thread names to deadlock debugging message

Browse source 
Also refactor CLockLocation to use an initialization list.
This commit is contained in:
James O'Beirne 2018-05-05 14:15:30 -04:00
parent 383b186c28
commit 8722e54e56
1 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/sync.cpp
View file

@ -3,9 +3,11 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <sync.h> #include <sync.h>
#include <tinyformat.h>
#include <logging.h> #include <logging.h>
#include <util/strencodings.h> #include <util/strencodings.h>
#include <util/threadnames.h>
#include <stdio.h> #include <stdio.h>
@ -37,23 +39,30 @@ void PrintLockContention(const char* pszName, const char* pszFile, int nLine)
// //
struct CLockLocation { struct CLockLocation {
CLockLocation(const char* pszName, const char* pszFile, int nLine, bool fTryIn) CLockLocation(
{ const char* pszName,
mutexName = pszName; const char* pszFile,
sourceFile = pszFile; int nLine,
sourceLine = nLine; bool fTryIn,
fTry = fTryIn; const std::string& thread_name)
} : fTry(fTryIn),
mutexName(pszName),
sourceFile(pszFile),
m_thread_name(thread_name),
sourceLine(nLine) {}
std::string ToString() const std::string ToString() const
{ {
return mutexName + " " + sourceFile + ":" + itostr(sourceLine) + (fTry ? " (TRY)" : ""); return tfm::format(
"%s %s:%s%s (in thread %s)",
mutexName, sourceFile, itostr(sourceLine), (fTry ? " (TRY)" : ""), m_thread_name);
} }
private: private:
bool fTry; bool fTry;
std::string mutexName; std::string mutexName;
std::string sourceFile; std::string sourceFile;
const std::string& m_thread_name;
int sourceLine; int sourceLine;
}; };
@ -125,7 +134,7 @@ static void push_lock(void* c, const CLockLocation& locklocation)
std::pair<void*, void*> p1 = std::make_pair(i.first, c); std::pair<void*, void*> p1 = std::make_pair(i.first, c);
if (lockdata.lockorders.count(p1)) if (lockdata.lockorders.count(p1))
continue; continue;
lockdata.lockorders[p1] = g_lockstack; lockdata.lockorders.emplace(p1, g_lockstack);
std::pair<void*, void*> p2 = std::make_pair(c, i.first); std::pair<void*, void*> p2 = std::make_pair(c, i.first);
lockdata.invlockorders.insert(p2); lockdata.invlockorders.insert(p2);
@ -141,7 +150,7 @@ static void pop_lock()
void EnterCritical(const char* pszName, const char* pszFile, int nLine, void* cs, bool fTry) void EnterCritical(const char* pszName, const char* pszFile, int nLine, void* cs, bool fTry)
{ {
push_lock(cs, CLockLocation(pszName, pszFile, nLine, fTry)); push_lock(cs, CLockLocation(pszName, pszFile, nLine, fTry, util::ThreadGetInternalName()));
} }
void LeaveCritical() void LeaveCritical()