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

Simplify fetch pack logic

Browse Source
This commit is contained in:
JoelKatz
2013-08-12 19:30:05 -07:00
parent 824b1dab20
commit 2a872563d3
1 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -364,13 +364,11 @@ void LedgerMaster::tryFill (Ledger::pointer ledger)
void LedgerMaster::getFetchPack (Ledger::ref nextLedger) void LedgerMaster::getFetchPack (Ledger::ref nextLedger)
{ {
uint32 fetchSeq = nextLedger->getLedgerSeq () - 1;
protocol::TMGetObjectByHash tmBH; protocol::TMGetObjectByHash tmBH;
tmBH.set_type (protocol::TMGetObjectByHash::otFETCH_PACK); tmBH.set_type (protocol::TMGetObjectByHash::otFETCH_PACK);
tmBH.set_query (true); tmBH.set_query (true);
tmBH.set_seq (fetchSeq); tmBH.set_seq (nextLedger->getLedgerSeq());
tmBH.set_ledgerhash (nextLedger->getParentHash().begin (), 32); tmBH.set_ledgerhash (nextLedger->getHash().begin (), 32);
std::vector<Peer::pointer> peerList = getApp().getPeers ().getPeerVector (); std::vector<Peer::pointer> peerList = getApp().getPeers ().getPeerVector ();
Peer::pointer target; Peer::pointer target;
@@ -378,7 +376,7 @@ void LedgerMaster::getFetchPack (Ledger::ref nextLedger)
BOOST_FOREACH (const Peer::pointer & peer, peerList) BOOST_FOREACH (const Peer::pointer & peer, peerList)
{ {
if (peer->hasRange (fetchSeq, fetchSeq + 1)) if (peer->hasRange (nextLedger->getLedgerSeq() - 1, nextLedger->getLedgerSeq()))
{ {
if (count++ == 0) if (count++ == 0)
target = peer; target = peer;
@@ -585,26 +583,13 @@ void LedgerMaster::advanceThread()
{ {
if (!getApp().getInboundLedgers().isFailure(nextLedger->getParentHash())) if (!getApp().getInboundLedgers().isFailure(nextLedger->getParentHash()))
{ {
sl.unlock();
if ((missing > 40000) && getApp().getOPs().shouldFetchPack(missing))
getFetchPack(nextLedger);
InboundLedger::pointer acq = InboundLedger::pointer acq =
getApp().getInboundLedgers().findCreate(nextLedger->getParentHash(), getApp().getInboundLedgers().findCreate(nextLedger->getParentHash(),
nextLedger->getLedgerSeq() - 1); nextLedger->getLedgerSeq() - 1);
if (acq && acq->isComplete() && !acq->isFailed()) if (acq && acq->isComplete() && !acq->isFailed())
{
ledger = acq->getLedger(); ledger = acq->getLedger();
getApp().getInboundLedgers().findCreate(ledger->getParentHash(), else if ((missing > 40000) && getApp().getOPs().shouldFetchPack(missing))
ledger->getLedgerSeq() - 1); getFetchPack(nextLedger);
}
sl.lock();
// If things changed while we released the lock, we need another pass
if (mValidLedger->getLedgerSeq() != mPubLedger->getLedgerSeq())
progress = true;
} }
} }
if (ledger) if (ledger)