diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-12-19 09:09:51 +0100 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-12-19 09:46:11 +0100 |
commit | 19a5676280370148492cf59a5103584cf37893ac (patch) | |
tree | cc3212d12ff9799fc0d5633b289d1832cb0915d0 /src/sync.cpp | |
parent | 636a42bd0e208d1d49dab6a95e23863736823883 (diff) |
Use mutex pointer instead of name for AssertLockHeld
This makes it useable for non-global locks such as the wallet and
keystore locks.
Diffstat (limited to 'src/sync.cpp')
-rw-r--r-- | src/sync.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sync.cpp b/src/sync.cpp index 9a20c87f88..b57d8c3c00 100644 --- a/src/sync.cpp +++ b/src/sync.cpp @@ -136,11 +136,11 @@ std::string LocksHeld() return result; } -void AssertLockHeld(std::string strName) +void AssertLockHeldInternal(const char *pszName, const char* pszFile, int nLine, void *cs) { BOOST_FOREACH(const PAIRTYPE(void*, CLockLocation)&i, *lockstack) - if (i.second.MutexName() == strName) return; - LogPrintf("Lock %s not held; locks held:\n%s", strName.c_str(), LocksHeld().c_str()); + if (i.first == cs) return; + LogPrintf("Lock %s not held in %s:%i; locks held:\n%s", pszName, pszFile, nLine, LocksHeld().c_str()); assert(0); } |