ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-28 23:15:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some bugfixes.

Browse Source
This commit is contained in:
JoelKatz
2013-08-11 14:09:56 -07:00
parent a67f4fe9ba
commit f9eb6b5ee1
1 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -91,20 +91,27 @@ void LedgerMaster::pushLedger (Ledger::pointer newLedger)
// all candidate transactions must already be applied
WriteLog (lsINFO, LedgerMaster) << "PushLedger: " << newLedger->getHash ();
if (getConfig().RUN_STANDALONE)
setFullLedger(newLedger, true, false);
boost::recursive_mutex::scoped_lock ml (mLock);
if (mClosedLedger)
{
mClosedLedger->setClosed ();
WriteLog (lsTRACE, LedgerMaster) << "Finalizes: " << mClosedLedger->getHash ();
boost::recursive_mutex::scoped_lock ml (mLock);
if (mClosedLedger)
{
mClosedLedger->setClosed ();
WriteLog (lsTRACE, LedgerMaster) << "Finalizes: " << mClosedLedger->getHash ();
}
mClosedLedger = mCurrentLedger;
mCurrentLedger = newLedger;
mEngine.setLedger (newLedger);
}
mClosedLedger = mCurrentLedger;
mCurrentLedger = newLedger;
mEngine.setLedger (newLedger);
if (getConfig().RUN_STANDALONE)
{
setFullLedger(newLedger, true, false);
tryAdvance();
}
else
checkAccept(newLedger->getHash(), newLedger->getLedgerSeq());
}
void LedgerMaster::pushLedger (Ledger::pointer newLCL, Ledger::pointer newOL)
@@ -112,19 +119,6 @@ void LedgerMaster::pushLedger (Ledger::pointer newLCL, Ledger::pointer newOL)
assert (newLCL->isClosed () && newLCL->isAccepted ());
assert (!newOL->isClosed () && !newOL->isAccepted ());
if (getConfig().RUN_STANDALONE)
setFullLedger(newLCL, true, false);
boost::recursive_mutex::scoped_lock ml (mLock);
if (newLCL->isAccepted ())
{
assert (newLCL->isClosed ());
assert (newLCL->isImmutable ());
WriteLog (lsINFO, LedgerMaster) << "StashAccepted: " << newLCL->getHash ();
if (getConfig().RUN_STANDALONE)
newLCL->setValidated();
}
{
boost::recursive_mutex::scoped_lock ml (mLock);
@@ -133,7 +127,13 @@ void LedgerMaster::pushLedger (Ledger::pointer newLCL, Ledger::pointer newOL)
mEngine.setLedger (newOL);
}
checkAccept (newLCL->getHash (), newLCL->getLedgerSeq ());
if (getConfig().RUN_STANDALONE)
{
setFullLedger(newLCL, true, false);
tryAdvance();
}
else
checkAccept (newLCL->getHash (), newLCL->getLedgerSeq ());
}
void LedgerMaster::switchLedgers (Ledger::pointer lastClosed, Ledger::pointer current)
@@ -431,12 +431,18 @@ void LedgerMaster::setFullLedger (Ledger::pointer ledger, bool isSynchronous, bo
WriteLog (lsDEBUG, LedgerMaster) << "Ledger " << ledger->getLedgerSeq () << " accepted :" << ledger->getHash ();
assert (ledger->peekAccountStateMap ()->getHash ().isNonZero ());
ledger->setValidated();
mLedgerHistory.addLedger(ledger);
boost::recursive_mutex::scoped_lock ml (mLock);
mCompleteLedgers.setValue (ledger->getLedgerSeq ());
ledger->pendSaveValidated (isSynchronous, isCurrent);
if (!mValidLedger || (ledger->getLedgerSeq() > mValidLedger->getLedgerSeq()))
mValidLedger = ledger;
if ((ledger->getLedgerSeq () != 0) && mCompleteLedgers.hasValue (ledger->getLedgerSeq () - 1))
{
// we think we have the previous ledger, double check