|
|
@ -73,7 +73,7 @@ struct LockData { |
|
|
|
std::mutex dd_mutex; |
|
|
|
std::mutex dd_mutex; |
|
|
|
} static lockdata; |
|
|
|
} static lockdata; |
|
|
|
|
|
|
|
|
|
|
|
static thread_local std::unique_ptr<LockStack> lockstack; |
|
|
|
static thread_local LockStack g_lockstack; |
|
|
|
|
|
|
|
|
|
|
|
static void potential_deadlock_detected(const std::pair<void*, void*>& mismatch, const LockStack& s1, const LockStack& s2) |
|
|
|
static void potential_deadlock_detected(const std::pair<void*, void*>& mismatch, const LockStack& s1, const LockStack& s2) |
|
|
|
{ |
|
|
|
{ |
|
|
@ -103,21 +103,18 @@ static void potential_deadlock_detected(const std::pair<void*, void*>& mismatch, |
|
|
|
|
|
|
|
|
|
|
|
static void push_lock(void* c, const CLockLocation& locklocation) |
|
|
|
static void push_lock(void* c, const CLockLocation& locklocation) |
|
|
|
{ |
|
|
|
{ |
|
|
|
if (!lockstack) |
|
|
|
|
|
|
|
lockstack.reset(new LockStack); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
std::lock_guard<std::mutex> lock(lockdata.dd_mutex); |
|
|
|
std::lock_guard<std::mutex> lock(lockdata.dd_mutex); |
|
|
|
|
|
|
|
|
|
|
|
lockstack->push_back(std::make_pair(c, locklocation)); |
|
|
|
g_lockstack.push_back(std::make_pair(c, locklocation)); |
|
|
|
|
|
|
|
|
|
|
|
for (const std::pair<void*, CLockLocation> & i : (*lockstack)) { |
|
|
|
for (const std::pair<void*, CLockLocation>& i : g_lockstack) { |
|
|
|
if (i.first == c) |
|
|
|
if (i.first == c) |
|
|
|
break; |
|
|
|
break; |
|
|
|
|
|
|
|
|
|
|
|
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] = (*lockstack); |
|
|
|
lockdata.lockorders[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); |
|
|
@ -128,7 +125,7 @@ static void push_lock(void* c, const CLockLocation& locklocation) |
|
|
|
|
|
|
|
|
|
|
|
static void pop_lock() |
|
|
|
static void pop_lock() |
|
|
|
{ |
|
|
|
{ |
|
|
|
(*lockstack).pop_back(); |
|
|
|
g_lockstack.pop_back(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
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) |
|
|
@ -144,14 +141,14 @@ void LeaveCritical() |
|
|
|
std::string LocksHeld() |
|
|
|
std::string LocksHeld() |
|
|
|
{ |
|
|
|
{ |
|
|
|
std::string result; |
|
|
|
std::string result; |
|
|
|
for (const std::pair<void*, CLockLocation> & i : *lockstack) |
|
|
|
for (const std::pair<void*, CLockLocation>& i : g_lockstack) |
|
|
|
result += i.second.ToString() + std::string("\n"); |
|
|
|
result += i.second.ToString() + std::string("\n"); |
|
|
|
return result; |
|
|
|
return result; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void AssertLockHeldInternal(const char* pszName, const char* pszFile, int nLine, void* cs) |
|
|
|
void AssertLockHeldInternal(const char* pszName, const char* pszFile, int nLine, void* cs) |
|
|
|
{ |
|
|
|
{ |
|
|
|
for (const std::pair<void*, CLockLocation> & i : *lockstack) |
|
|
|
for (const std::pair<void*, CLockLocation>& i : g_lockstack) |
|
|
|
if (i.first == cs) |
|
|
|
if (i.first == cs) |
|
|
|
return; |
|
|
|
return; |
|
|
|
fprintf(stderr, "Assertion failed: lock %s not held in %s:%i; locks held:\n%s", pszName, pszFile, nLine, LocksHeld().c_str()); |
|
|
|
fprintf(stderr, "Assertion failed: lock %s not held in %s:%i; locks held:\n%s", pszName, pszFile, nLine, LocksHeld().c_str()); |
|
|
@ -160,7 +157,7 @@ void AssertLockHeldInternal(const char* pszName, const char* pszFile, int nLine, |
|
|
|
|
|
|
|
|
|
|
|
void AssertLockNotHeldInternal(const char* pszName, const char* pszFile, int nLine, void* cs) |
|
|
|
void AssertLockNotHeldInternal(const char* pszName, const char* pszFile, int nLine, void* cs) |
|
|
|
{ |
|
|
|
{ |
|
|
|
for (const std::pair<void*, CLockLocation>& i : *lockstack) { |
|
|
|
for (const std::pair<void*, CLockLocation>& i : g_lockstack) { |
|
|
|
if (i.first == cs) { |
|
|
|
if (i.first == cs) { |
|
|
|
fprintf(stderr, "Assertion failed: lock %s held in %s:%i; locks held:\n%s", pszName, pszFile, nLine, LocksHeld().c_str()); |
|
|
|
fprintf(stderr, "Assertion failed: lock %s held in %s:%i; locks held:\n%s", pszName, pszFile, nLine, LocksHeld().c_str()); |
|
|
|
abort(); |
|
|
|
abort(); |
|
|
|