From eccb6eb9363b7956a5d4960603f1ccac8c8bb953 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Tue, 5 Mar 2013 21:54:04 -0800 Subject: [PATCH] Cleanups and a small fix. --- src/cpp/ripple/LedgerAcquire.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/cpp/ripple/LedgerAcquire.cpp b/src/cpp/ripple/LedgerAcquire.cpp index 5d1e7c96e..025046b91 100644 --- a/src/cpp/ripple/LedgerAcquire.cpp +++ b/src/cpp/ripple/LedgerAcquire.cpp @@ -14,13 +14,13 @@ SETUP_LOG(); DECLARE_INSTANCE(LedgerAcquire); #define LA_DEBUG -#define LEDGER_ACQUIRE_TIMEOUT 750 // 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_ACQUIRE_TIMEOUT 1000 // 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 TRUST_NETWORK PeerSet::PeerSet(const uint256& hash, int interval) : mHash(hash), mTimerInterval(interval), mTimeouts(0), - mComplete(false), mFailed(false), mProgress(true), mAggressive(true), mTimer(theApp->getIOService()) + mComplete(false), mFailed(false), mProgress(true), mAggressive(false), mTimer(theApp->getIOService()) { mLastAction = upTime(); assert((mTimerInterval > 10) && (mTimerInterval < 30000)); @@ -195,14 +195,13 @@ void LedgerAcquire::onTimer(bool progress) if (!progress) { mAggressive = true; + mByHash = true; cLog(lsDEBUG) << "No progress for ledger " << mHash; if (!getPeerCount()) addPeers(); else trigger(Peer::pointer()); } - else - mByHash = true; } void LedgerAcquire::addPeers() @@ -532,8 +531,7 @@ void LedgerAcquire::filterNodes(std::vector& nodeIDs, std::vector duplicates; duplicates.reserve(nodeIDs.size()); - int dupCount=0; - + int dupCount = 0; for (unsigned int i = 0; i < nodeIDs.size(); ++i) { bool isDup = recentNodes.count(nodeIDs[i]) != 0; @@ -733,7 +731,7 @@ LedgerAcquire::pointer LedgerAcquireMaster::findCreate(const uint256& hash) ptr->setTimer(); // Cannot call in constructor } else - cLog(lsDEBUG) << "LedgerAcquireMaster acquiring ledger we already have"; + cLog(lsDEBUG) << "Acquiring ledger we already have: " << hash; return ptr; }