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

Beging removing the "wobble" logic, as CLC doesn't use it.

Browse Source
This commit is contained in:
JoelKatz
2012-07-16 12:02:09 -07:00
parent f9e0a6ae72
commit 19b4ea8160
3 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/LedgerConsensus.cpp
View File

@@ -375,12 +375,10 @@ int LedgerConsensus::statePreClose()
Log(lsINFO) << "CLC:: closing ledger"; Log(lsINFO) << "CLC:: closing ledger";
mState = lcsESTABLISH; mState = lcsESTABLISH;
mConsensusStartTime = boost::posix_time::second_clock::universal_time(); mConsensusStartTime = boost::posix_time::second_clock::universal_time();
theApp->getMasterLedger().beginWobble();
theApp->getMasterLedger().closeTime();
mCloseTime = theApp->getOPs().getNetworkTimeNC(); mCloseTime = theApp->getOPs().getNetworkTimeNC();
theApp->getOPs().setLastCloseNetTime(mCloseTime); theApp->getOPs().setLastCloseNetTime(mCloseTime);
statusChange(newcoin::neCLOSING_LEDGER, mPreviousLedger); statusChange(newcoin::neCLOSING_LEDGER, mPreviousLedger);
Ledger::pointer initial = theApp->getMasterLedger().endWobble(); Ledger::pointer initial = theApp->getMasterLedger().closeLedger();
assert (initial->getParentHash() == mPreviousLedger->getHash()); assert (initial->getParentHash() == mPreviousLedger->getHash());
takeInitialPosition(initial); takeInitialPosition(initial);
} }

14
src/LedgerMaster.cpp
View File

@@ -68,27 +68,17 @@ void LedgerMaster::storeLedger(Ledger::pointer ledger)
mLedgerHistory.addLedger(ledger); mLedgerHistory.addLedger(ledger);
} }
void LedgerMaster::beginWobble() Ledger::pointer LedgerMaster::closeLedger()
{ { // FIXME: This needs to be cleaned up, now that wobble time is gone
boost::recursive_mutex::scoped_lock sl(mLock); boost::recursive_mutex::scoped_lock sl(mLock);
assert(!mWobbleLedger); assert(!mWobbleLedger);
mWobbleLedger = boost::make_shared<Ledger>(boost::ref(*mCurrentLedger), true); mWobbleLedger = boost::make_shared<Ledger>(boost::ref(*mCurrentLedger), true);
mEngine.setDefaultLedger(mCurrentLedger); mEngine.setDefaultLedger(mCurrentLedger);
mEngine.setAlternateLedger(mWobbleLedger); mEngine.setAlternateLedger(mWobbleLedger);
}
void LedgerMaster::closeTime()
{ // swap current and wobble ledgers
boost::recursive_mutex::scoped_lock sl(mLock);
assert(mCurrentLedger && mWobbleLedger); assert(mCurrentLedger && mWobbleLedger);
std::swap(mCurrentLedger, mWobbleLedger); std::swap(mCurrentLedger, mWobbleLedger);
mEngine.setDefaultLedger(mCurrentLedger); mEngine.setDefaultLedger(mCurrentLedger);
mEngine.setAlternateLedger(mWobbleLedger); mEngine.setAlternateLedger(mWobbleLedger);
}
Ledger::pointer LedgerMaster::endWobble()
{
boost::recursive_mutex::scoped_lock sl(mLock);
assert(mWobbleLedger && mCurrentLedger); assert(mWobbleLedger && mCurrentLedger);
Ledger::pointer ret = mWobbleLedger; Ledger::pointer ret = mWobbleLedger;
mWobbleLedger = Ledger::pointer(); mWobbleLedger = Ledger::pointer();

4
src/LedgerMaster.h
View File

@@ -56,9 +56,7 @@ public:
void switchLedgers(Ledger::pointer lastClosed, Ledger::pointer newCurrent); void switchLedgers(Ledger::pointer lastClosed, Ledger::pointer newCurrent);
void closeTime(); Ledger::pointer closeLedger();
void beginWobble();
Ledger::pointer endWobble();
Ledger::pointer getLedgerBySeq(uint32 index) Ledger::pointer getLedgerBySeq(uint32 index)
{ {