ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-21 03:26:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a cause of deadlocks. Cannot acquire the master lock while

Browse Source 
holding a PeerSet lock.
This commit is contained in:
JoelKatz
2013-06-01 22:17:26 -07:00
parent 183d09906a
commit 880d2f9264
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/cpp/ripple/TransactionAcquire.cpp
View File

@@ -13,21 +13,27 @@ TransactionAcquire::TransactionAcquire(const uint256& hash) : PeerSet(hash, TX_A
mMap = boost::make_shared<SHAMap>(smtTRANSACTION, hash); mMap = boost::make_shared<SHAMap>(smtTRANSACTION, hash);
} }
void TransactionAcquire::done() static void TACompletionHandler(uint256 hash, SHAMap::pointer map)
{ {
boost::recursive_mutex::scoped_lock sl(theApp->getMasterLock()); boost::recursive_mutex::scoped_lock sl(theApp->getMasterLock());
theApp->getOPs().mapComplete(hash, map);
theApp->getMasterLedgerAcquire().dropLedger(hash);
}
void TransactionAcquire::done()
{ // We hold a PeerSet lock and so cannot acquire the master lock here
SHAMap::pointer map;
if (mFailed) if (mFailed)
{ {
WriteLog (lsWARNING, TransactionAcquire) << "Failed to acquire TX set " << mHash; WriteLog (lsWARNING, TransactionAcquire) << "Failed to acquire TX set " << mHash;
theApp->getOPs().mapComplete(mHash, SHAMap::pointer());
} }
else else
{ {
WriteLog (lsINFO, TransactionAcquire) << "Acquired TX set " << mHash; WriteLog (lsINFO, TransactionAcquire) << "Acquired TX set " << mHash;
mMap->setImmutable(); mMap->setImmutable();
theApp->getOPs().mapComplete(mHash, mMap); map = mMap;
} }
theApp->getMasterLedgerAcquire().dropLedger(mHash); theApp->getIOService().post(boost::bind(&TACompletionHandler, mHash, map));
} }
void TransactionAcquire::onTimer(bool progress) void TransactionAcquire::onTimer(bool progress)