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

Redesign the way the acquire timer is (re)set so that we won't have bugs

Browse Source 
where we fail to arm it.
This commit is contained in:
JoelKatz
2013-01-03 21:25:40 -08:00
parent b7fe1424fb
commit d4f4d9bf78
3 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/cpp/ripple/LedgerConsensus.cpp
View File

@@ -67,7 +67,6 @@ void TransactionAcquire::onTimer(bool progress)
BOOST_FOREACH(Peer::ref peer, peerList)
peerHas(peer);
}
resetTimer();
}
else if (!progress)
trigger(Peer::pointer(), true);
@@ -111,20 +110,15 @@ void TransactionAcquire::trigger(Peer::ref peer, bool timer)
done();
return;
}
else
{
ripple::TMGetLedger tmGL;
tmGL.set_ledgerhash(mHash.begin(), mHash.size());
tmGL.set_itype(ripple::liTS_CANDIDATE);
if (getTimeouts() != 0)
tmGL.set_querytype(ripple::qtINDIRECT);
BOOST_FOREACH(SHAMapNode& it, nodeIDs)
*(tmGL.add_nodeids()) = it.getRawString();
sendRequest(tmGL, peer);
}
ripple::TMGetLedger tmGL;
tmGL.set_ledgerhash(mHash.begin(), mHash.size());
tmGL.set_itype(ripple::liTS_CANDIDATE);
if (getTimeouts() != 0)
tmGL.set_querytype(ripple::qtINDIRECT);
BOOST_FOREACH(SHAMapNode& it, nodeIDs)
*(tmGL.add_nodeids()) = it.getRawString();
sendRequest(tmGL, peer);
}
if (timer)
resetTimer();
}
SMAddNode TransactionAcquire::takeNodes(const std::list<SHAMapNode>& nodeIDs,
@@ -882,7 +876,7 @@ void LedgerConsensus::startAcquiring(const TransactionAcquire::pointer& acquire)
acquire->peerHas(peer);
}
acquire->resetTimer();
acquire->setTimer();
}
void LedgerConsensus::propose()