From 19a5676280370148492cf59a5103584cf37893ac Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Thu, 19 Dec 2013 09:09:51 +0100
Subject: Use mutex pointer instead of name for AssertLockHeld

This makes it useable for non-global locks such as the wallet and
keystore locks.
---
 src/sync.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/sync.cpp')

diff --git a/src/sync.cpp b/src/sync.cpp
index 9a20c87f8..b57d8c3c0 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);
 }
 
-- 
cgit v1.2.3