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.

Browse Source
This commit is contained in:
JoelKatz
2012-05-29 12:35:23 -07:00
parent e84c3ba714
commit c74dad5478
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/LedgerConsensus.cpp
View File

@@ -130,15 +130,21 @@ bool LCTransaction::updatePosition(int seconds)
// To prevent avalanche stalls, we increase the needed weight slightly over time
bool newPosition;
if (seconds <= LEDGER_CONVERGE) newPosition = weight >= MIN_CONSENSUS;
else if (seconds >= LEDGER_FORCE_CONVERGE) newPosition = weight >= MAX_CONSENSUS;
else newPosition = weight >= AVG_CONSENSUS;
if (seconds <= LEDGER_CONVERGE) newPosition = weight >= AV_MIN_CONSENSUS;
else if (seconds >= LEDGER_FORCE_CONVERGE) newPosition = weight >= AV_MAX_CONSENSUS;
else newPosition = weight >= AV_AVG_CONSENSUS;
if (newPosition == mOurPosition) return false;
mOurPosition = newPosition;
return true;
}
int LCTransaction::getAgreeLevel()
{ // how much do nodes agree with us
if (mOurPosition) return (mYays * 100 + 100) / (mYays + mNays + 1);
return (mNays * 100 + 100) / (mYays + mNays + 1);
}
LedgerConsensus::LedgerConsensus(Ledger::pointer previousLedger, uint32 closeTime)
: mState(lcsPRE_CLOSE), mCloseTime(closeTime), mPreviousLedger(previousLedger)
{
@@ -244,6 +250,7 @@ int LedgerConsensus::startup()
int LedgerConsensus::timerEntry()
{
int sinceClose = theApp->getOPs().getNetworkTimeNC() - mCloseTime;
if ((mState == lcsESTABLISH) || (mState == lcsCUTOFF))
{
if (sinceClose >= LEDGER_FORCE_CONVERGE)
@@ -253,6 +260,7 @@ int LedgerConsensus::timerEntry()
}
bool changes = false;
bool stable = true;
SHAMap::pointer ourPosition;
std::vector<uint256> addedTx, removedTx;
@@ -265,6 +273,7 @@ int LedgerConsensus::timerEntry()
{
ourPosition = mComplete[mOurPosition->getCurrentHash()]->snapShot();
changes = true;
stable = false;
}
if (it->second->getOurPosition()) // now a yes
{
@@ -277,6 +286,8 @@ int LedgerConsensus::timerEntry()
removedTx.push_back(it->first);
}
}
else if (it->second->getAgreeLevel() < AV_PCT_STOP)
stable = false;
}
if (changes)
@@ -288,6 +299,8 @@ int LedgerConsensus::timerEntry()
hashes.push_back(newHash);
sendHaveTxSet(hashes);
}
else if (stable && (mState == lcsCUTOFF))
mState = lcsFINISHED;
}
return 1;
}

4
src/LedgerConsensus.h
View File

@@ -60,14 +60,16 @@ public:
void setVote(const uint256& peer, bool votesYes);
bool updatePosition(int timePassed);
int getAgreeLevel();
};
enum LCState
{
lcsPRE_CLOSE, // We haven't closed our ledger yet, but others might have
lcsPOST_CLOSE, // Ledger closed, but wobble time
lcsESTABLISH, // Establishing consensus
lcsCUTOFF, // Past the cutoff for consensus
lcsFINSHED, // We have closed on a transaction set
lcsFINISHED, // We have closed on a transaction set
lcsACCEPTED, // We have accepted/validated a new last closed ledger
lcsABORTED // Abandoned
};