ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-20 11:05:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups.

Browse Source
This commit is contained in:
JoelKatz
2013-08-12 12:01:55 -07:00
parent f4c6fa7873
commit 1ddf8f3969
4 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/ripple_app/ledger/LedgerMaster.cpp
View File

@@ -393,7 +393,7 @@ void LedgerMaster::getFetchPack (Ledger::ref nextLedger)
target->sendPacket (packet, false); target->sendPacket (packet, false);
} }
else else
WriteLog (lsTRACE, LedgerMaster) << "No peer for fetch pack"; WriteLog (lsDEBUG, LedgerMaster) << "No peer for fetch pack";
} }
bool LedgerMaster::shouldAcquire (uint32 currentLedger, uint32 ledgerHistory, uint32 candidateLedger) bool LedgerMaster::shouldAcquire (uint32 currentLedger, uint32 ledgerHistory, uint32 candidateLedger)

21
modules/ripple_app/ledger/ripple_InboundLedger.cpp
View File

@@ -26,25 +26,16 @@ InboundLedger::InboundLedger (uint256 const& hash, uint32 seq)
#ifdef LA_DEBUG #ifdef LA_DEBUG
WriteLog (lsTRACE, InboundLedger) << "Acquiring ledger " << mHash; WriteLog (lsTRACE, InboundLedger) << "Acquiring ledger " << mHash;
#endif #endif
tryLocal (); if (tryLocal ())
done();
} }
// Returns true if progress is made void InboundLedger::checkLocal ()
bool InboundLedger::checkLocal ()
{ {
bool ret = false; boost::recursive_mutex::scoped_lock sl (mLock);
{ if (!isDone () && tryLocal())
boost::recursive_mutex::scoped_lock sl (mLock); done();
if (!isDone () && tryLocal())
{
done();
ret = true;
}
}
return ret;
} }
bool InboundLedger::tryLocal () bool InboundLedger::tryLocal ()

2
modules/ripple_app/ledger/ripple_InboundLedger.h
View File

@@ -71,7 +71,7 @@ public:
void addPeers (); void addPeers ();
void awaitData (); void awaitData ();
void noAwaitData (); void noAwaitData ();
bool checkLocal (); void checkLocal ();
typedef std::pair <protocol::TMGetObjectByHash::ObjectType, uint256> neededHash_t; typedef std::pair <protocol::TMGetObjectByHash::ObjectType, uint256> neededHash_t;

7
modules/ripple_app/ledger/ripple_InboundLedgers.cpp
View File

@@ -257,15 +257,10 @@ void InboundLedgers::gotFetchPack (Job&)
acquires.push_back (it.second); acquires.push_back (it.second);
} }
bool progress = false;
BOOST_FOREACH (const InboundLedger::pointer & acquire, acquires) BOOST_FOREACH (const InboundLedger::pointer & acquire, acquires)
{ {
if (acquire->checkLocal ()) acquire->checkLocal ();
progress = true;
} }
if (progress)
getApp().getLedgerMaster().tryAdvance();
} }
void InboundLedgers::clearFailures () void InboundLedgers::clearFailures ()