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

Merge branch 'master' into misc

Browse Source
This commit is contained in:
Arthur Britto
2012-06-05 13:09:26 -07:00
parent 480482d618 c7069d842c
commit a9bb5f8d10
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/LedgerConsensus.cpp
View File

@@ -155,9 +155,9 @@ 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 >= AV_MIN_CONSENSUS;
else if (seconds >= LEDGER_FORCE_CONVERGE) newPosition = weight >= AV_MAX_CONSENSUS;
else newPosition = weight >= AV_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;
@@ -625,7 +625,7 @@ void LedgerConsensus::applyTransactions(SHAMap::pointer set, Ledger::pointer led
item = set->peekNextItem(item->getTag());
}
int successes = 0;
int successes;
do
{
successes = 0;
@@ -701,7 +701,15 @@ void LedgerConsensus::accept(SHAMap::pointer set)
newOL->addJson(p, LEDGER_JSON_DUMP_TXNS | LEDGER_JSON_DUMP_STATE);
ssw.write(std::cerr, p);
}
if (1)
{
Log(lsTRACE) << "current ledger";
Json::Value p;
theApp->getMasterLedger().getCurrentLedger()->addJson(p, LEDGER_JSON_DUMP_TXNS | LEDGER_JSON_DUMP_STATE);
ssw.write(std::cerr, p);
}
#endif
ScopedLock sl = theApp->getMasterLedger().getLock();
applyTransactions(theApp->getMasterLedger().getCurrentLedger()->peekTransactionMap(),
@@ -712,7 +720,7 @@ void LedgerConsensus::accept(SHAMap::pointer set)
#ifdef DEBUG
if (1)
{
Log(lsTRACE) << "newOL after transactions";
Log(lsTRACE) << "newOL after current ledger transactions";
Json::Value p;
newOL->addJson(p, LEDGER_JSON_DUMP_TXNS | LEDGER_JSON_DUMP_STATE);
ssw.write(std::cerr, p);