aboutsummaryrefslogtreecommitdiff
path: root/src/sync.cpp
diff options
context:
space:
mode:
authorGavin Andresen <[email protected]>2014-02-24 14:39:23 -0500
committerGavin Andresen <[email protected]>2014-02-24 14:39:23 -0500
commita16ad1c0f465935d437bd9ae9875b28be49ec65b (patch)
tree99166e16a402c3618fbfa32c5578c3c90625950d /src/sync.cpp
parentMerge pull request #3305 from mikehearn/fee_drop (diff)
parentWallet locking fixes for -DDEBUG_LOCKORDER (diff)
downloaddiscoin-a16ad1c0f465935d437bd9ae9875b28be49ec65b.tar.xz
discoin-a16ad1c0f465935d437bd9ae9875b28be49ec65b.zip
Merge pull request #3704 from gavinandresen/wallet_lock_fixes
Wallet locking fixes for -DDEBUG_LOCKORDER
Diffstat (limited to 'src/sync.cpp')
-rw-r--r--src/sync.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/sync.cpp b/src/sync.cpp
index 8f713807f..e624a9ee8 100644
--- a/src/sync.cpp
+++ b/src/sync.cpp
@@ -140,8 +140,9 @@ void AssertLockHeldInternal(const char *pszName, const char* pszFile, int nLine,
{
BOOST_FOREACH(const PAIRTYPE(void*, CLockLocation)&i, *lockstack)
if (i.first == cs) return;
- LogPrintf("Lock %s not held in %s:%i; locks held:\n%s", pszName, pszFile, nLine, LocksHeld());
- assert(0);
+ fprintf(stderr, "Assertion failed: lock %s not held in %s:%i; locks held:\n%s",
+ pszName, pszFile, nLine, LocksHeld().c_str());
+ abort();
}
#endif /* DEBUG_LOCKORDER */