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

Updates to CLC.

Browse Source
This commit is contained in:
JoelKatz
2012-07-09 15:56:36 -07:00
parent 98c8529701
commit 632bf2e586
2 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/LedgerConsensus.cpp
View File

@@ -196,7 +196,8 @@ int LCTransaction::getAgreeLevel()
}
LedgerConsensus::LedgerConsensus(const uint256& prevLCLHash, Ledger::pointer previousLedger, uint64 closeTime)
: mState(lcsPRE_CLOSE), mCloseTime(closeTime), mPrevLedgerHash(prevLCLHash), mPreviousLedger(previousLedger)
: mState(lcsPRE_CLOSE), mCloseTime(closeTime), mPrevLedgerHash(prevLCLHash), mPreviousLedger(previousLedger),
mPreviousProposers(0), mPreviousSeconds(0)
{
mValSeed = theConfig.VALIDATION_SEED;
Log(lsDEBUG) << "Creating consensus object";
@@ -357,10 +358,15 @@ int LedgerConsensus::startup()
int LedgerConsensus::statePreClose(int currentSeconds)
{ // it is shortly before ledger close time
if (ConinuousLedgerTiming::shouldClose())
bool anyTransactions = mNetOps->getCurrentLedger()->peekTransactionMap()->getHash().isNonZero();
int proposersClosed = mPeerPositions.size();
if (ContinuousLedgerTiming::shouldClose(anyTransactions, mPreviousProposers, proposersClosed,
mPreviousSeconds, currentSeconds))
{ // it is time to close the ledger (swap default and wobble ledgers)
Log(lsINFO) << "Closing ledger";
mState = lcsESTABLISH;
mConsensusStartTime = boost::posix_time::second_clock::universal_time();
theApp->getMasterLedger().closeTime();
statusChange(newcoin::neCLOSING_LEDGER, mPreviousLedger);
Ledger::pointer initial = theApp->getMasterLedger().endWobble();
@@ -437,10 +443,9 @@ void LedgerConsensus::timerEntry()
assert(false);
}
bool LedgerConsensus::updateOurPositions(int percentPrevConverge)
{ // returns true if the network has consensus
void LedgerConsensus::updateOurPositions(int percentPrevConverge)
{
bool changes = false;
bool stable = true;
SHAMap::pointer ourPosition;
std::vector<uint256> addedTx, removedTx;
@@ -482,6 +487,23 @@ bool LedgerConsensus::updateOurPositions(int percentPrevConverge)
return stable;
}
bool LedgerConsensus::haveConsensus(int currentSeconds)
{
int agree = 0, disagree = 0;
uint256 ourPosition = mOurPosition->getCurrentHash();
for (boost::unordered_map<uint160, LedgerProposal::pointer>::iterator it = mPeerPosition.begin(),
end = mPeerPositions.end(); it != end; ++it)
{
if (it->second->getCurrentHash() == ourPosition)
++agree;
else
++disagree;
}
int currentValidations =
return ContinuousLedgerTiming::haveConsensus(mPreviousProposers, agree + disagree, agree, currentValidations,
prevagreetime, currentSeconds);
}
SHAMap::pointer LedgerConsensus::getTransactionTree(const uint256& hash, bool doAcquire)
{
boost::unordered_map<uint256, SHAMap::pointer>::iterator it = mComplete.find(hash);

7
src/LedgerConsensus.h
View File

@@ -87,8 +87,9 @@ protected:
NewcoinAddress mValSeed;
bool mProposing, mValidating, mHaveCorrectLCL;
int mPreviousClose; // The number of seconds the previous ledger took to close
int mPreviousValidators; // The number of validations for the previous ledger
boost::posix_time::ptime mConsensusStartTime;
int mPreviousProposers;
int mPreviousSeconds;
// Convergence tracking, trusted peers indexed by hash of public key
boost::unordered_map<uint160, LedgerProposal::pointer> mPeerPositions;
@@ -126,7 +127,7 @@ protected:
// manipulating our own position
void takeInitialPosition(Ledger::pointer initialLedger);
bool updateOurPositions(int percentPrevConverge);
void updateOurPositions(int percentPrevConverge);
void statusChange(newcoin::NodeEvent, Ledger::pointer ledger);
int getThreshold();
void beginAccept();