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

Ledger idle timing fixes.

Browse Source
This commit is contained in:
JoelKatz
2012-08-29 23:38:35 -07:00
parent 6282ad4a88
commit f63d9df60b
5 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/LedgerConsensus.cpp
View File

@@ -421,21 +421,32 @@ void LedgerConsensus::statePreClose()
int proposersClosed = mPeerPositions.size();
// This ledger is open. This computes how long since the last ledger closed
int lastCloseTime;
if (!anyTransactions && mPreviousLedger->getCloseAgree())
uint32 lastCloseTime;
int ledgerInterval = 0;
if (mHaveCorrectLCL && mPreviousLedger->getCloseAgree())
{ // we can use consensus timing
lastCloseTime = mPreviousLedger->getCloseTimeNC();
ledgerInterval = 2 * mPreviousLedger->getCloseResolution();
if (ledgerInterval < LEDGER_IDLE_INTERVAL)
ledgerInterval = LEDGER_IDLE_INTERVAL;
}
else
lastCloseTime = theApp->getOPs().getLastCloseNetTime();
{
lastCloseTime = theApp->getOPs().getLastCloseTime();
ledgerInterval = LEDGER_IDLE_INTERVAL;
}
int sinceClose = 1000 * (theApp->getOPs().getCloseTimeNC() - lastCloseTime);
if (sinceClose >= ContinuousLedgerTiming::shouldClose(anyTransactions, mPreviousProposers, proposersClosed,
mPreviousMSeconds, sinceClose))
mPreviousMSeconds, sinceClose, ledgerInterval))
{ // it is time to close the ledger
Log(lsINFO) << "CLC: closing ledger";
mState = lcsESTABLISH;
mConsensusStartTime = boost::posix_time::microsec_clock::universal_time();
mCloseTime = theApp->getOPs().getCloseTimeNC();
theApp->getOPs().setLastCloseNetTime(mCloseTime);
theApp->getOPs().setLastCloseTime(mCloseTime);
statusChange(newcoin::neCLOSING_LEDGER, *mPreviousLedger);
takeInitialPosition(*theApp->getMasterLedger().closeLedger());
}