ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid deadlock.

Browse Source
This commit is contained in:
JoelKatz
2013-08-12 20:17:52 -07:00
parent 98d88c8ded
commit ae8969529d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/ripple_app/ledger/LedgerMaster.cpp
View File

@@ -575,6 +575,7 @@ void LedgerMaster::advanceThread()
if ((missing != RangeSet::absent) && if ((missing != RangeSet::absent) &&
shouldAcquire(mValidLedger->getLedgerSeq(), getConfig().LEDGER_HISTORY, missing)) shouldAcquire(mValidLedger->getLedgerSeq(), getConfig().LEDGER_HISTORY, missing))
{ {
sl.unlock();
Ledger::pointer nextLedger = mLedgerHistory.getLedgerBySeq(missing + 1); Ledger::pointer nextLedger = mLedgerHistory.getLedgerBySeq(missing + 1);
if (nextLedger) if (nextLedger)
{ {
@@ -594,10 +595,8 @@ void LedgerMaster::advanceThread()
} }
if (ledger) if (ledger)
{ {
sl.unlock();
setFullLedger(ledger, false, false); setFullLedger(ledger, false, false);
tryFill(ledger); tryFill(ledger);
sl.lock();
progress = true; progress = true;
} }
} }
@@ -607,6 +606,9 @@ void LedgerMaster::advanceThread()
WriteLog (lsFATAL, LedgerMaster) << "Pub:" << mPubLedger->getLedgerSeq() << " Val:" << mValidLedger->getLedgerSeq(); WriteLog (lsFATAL, LedgerMaster) << "Pub:" << mPubLedger->getLedgerSeq() << " Val:" << mValidLedger->getLedgerSeq();
assert(false); assert(false);
} }
sl.lock();
if (mValidLedger->getLedgerSeq() != mPubLedger->getLedgerSeq())
progress = true;
} }
} }
else else