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

Small tweaks.

Browse Source
This commit is contained in:
JoelKatz
2013-03-29 10:17:17 -07:00
parent a455d71901
commit 3b40a7787d
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/cpp/ripple/LedgerAcquire.cpp
View File

@@ -13,9 +13,9 @@ SETUP_LOG();
DECLARE_INSTANCE(LedgerAcquire);
#define LA_DEBUG
#define LEDGER_ACQUIRE_TIMEOUT 1000 // millisecond for each ledger timeout
#define LEDGER_ACQUIRE_TIMEOUT 2000 // millisecond for each ledger timeout
#define LEDGER_TIMEOUT_COUNT 10 // how many timeouts before we giveup
#define LEDGER_TIMEOUT_AGGRESSIVE 4 // how many timeouts before we get aggressive
#define LEDGER_TIMEOUT_AGGRESSIVE 6 // how many timeouts before we get aggressive
#define TRUST_NETWORK
PeerSet::PeerSet(const uint256& hash, int interval) : mHash(hash), mTimerInterval(interval), mTimeouts(0),
@@ -191,6 +191,9 @@ bool LedgerAcquire::tryLocal()
void LedgerAcquire::onTimer(bool progress)
{
mRecentTXNodes.clear();
mRecentASNodes.clear();
if (getTimeouts() > LEDGER_TIMEOUT_COUNT)
{
cLog(lsWARNING) << "Too many timeouts for ledger " << mHash;
@@ -199,15 +202,13 @@ void LedgerAcquire::onTimer(bool progress)
return;
}
mRecentTXNodes.clear();
mRecentASNodes.clear();
if (!progress)
{
mAggressive = true;
mByHash = true;
cLog(lsDEBUG) << "No progress for ledger " << mHash;
if (!getPeerCount())
int pc = getPeerCount();
cLog(lsDEBUG) << "No progress(" << pc << ") for ledger " << pc << mHash;
if (pc == 0)
addPeers();
else
trigger(Peer::pointer());
@@ -307,8 +308,9 @@ void LedgerAcquire::trigger(Peer::ref peer)
boost::recursive_mutex::scoped_lock sl(mLock);
if (mAborted || mComplete || mFailed)
{
cLog(lsTRACE) << "Trigger on ledger:" <<
(mAborted ? " aborted": "") << (mComplete ? " completed": "") << (mFailed ? " failed" : "");
cLog(lsDEBUG) << "Trigger on ledger:" <<
(mAborted ? " aborted": "") << (mComplete ? " completed": "") << (mFailed ? " failed" : "") <<
" wc=" << mWaitCount;
return;
}