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

Simplify tracking of recently requested ledger entries

Browse Source 
Instead of tracking recently-requested entries from inbound
ledgers by node ID, track by hash. This allows state and
transaction entries to be tracked in the same set.
This commit is contained in:
JoelKatz
2015-03-03 15:53:33 -08:00
committed by Tom Ritchford
parent 2cccd8ab28
commit fc8bf39043
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/ripple/app/ledger/InboundLedger.cpp
View File

@@ -234,8 +234,7 @@ bool InboundLedger::tryLocal ()
*/
void InboundLedger::onTimer (bool wasProgress, ScopedLockType&)
{
mRecentTXNodes.clear ();
mRecentASNodes.clear ();
mRecentNodes.clear ();
if (isDone())
{
@@ -598,8 +597,7 @@ void InboundLedger::trigger (Peer::ptr const& peer)
{
// VFALCO Why 128? Make this a constant
if (!mAggressive)
filterNodes (nodeIDs, nodeHashes, mRecentASNodes,
128, !isProgress ());
filterNodes (nodeIDs, nodeHashes, 128, !isProgress ());
if (!nodeIDs.empty ())
{
@@ -669,8 +667,7 @@ void InboundLedger::trigger (Peer::ptr const& peer)
else
{
if (!mAggressive)
filterNodes (nodeIDs, nodeHashes, mRecentTXNodes,
128, !isProgress ());
filterNodes (nodeIDs, nodeHashes, 128, !isProgress ());
if (!nodeIDs.empty ())
{
@@ -705,8 +702,7 @@ void InboundLedger::trigger (Peer::ptr const& peer)
}
void InboundLedger::filterNodes (std::vector<SHAMapNodeID>& nodeIDs,
std::vector<uint256>& nodeHashes, std::set<SHAMapNodeID>& recentNodes,
int max, bool aggressive)
std::vector<uint256>& nodeHashes, int max, bool aggressive)
{
// ask for new nodes in preference to ones we've already asked for
assert (nodeIDs.size () == nodeHashes.size ());
@@ -716,9 +712,9 @@ void InboundLedger::filterNodes (std::vector<SHAMapNodeID>& nodeIDs,
int dupCount = 0;
for(auto const& nodeID : nodeIDs)
for (auto const& nodeHash : nodeHashes)
{
if (recentNodes.count (nodeID) != 0)
if (mRecentNodes.count (nodeHash) != 0)
{
duplicates.push_back (true);
++dupCount;
@@ -769,9 +765,9 @@ void InboundLedger::filterNodes (std::vector<SHAMapNodeID>& nodeIDs,
nodeHashes.resize (max);
}
for (auto const& n : nodeIDs)
for (auto const& nodeHash : nodeHashes)
{
recentNodes.insert (n);
mRecentNodes.insert (nodeHash);
}
}

6
src/ripple/app/ledger/InboundLedger.h
View File

@@ -101,7 +101,7 @@ public:
// VFALCO TODO Replace uint256 with something semanticallyh meaningful
void filterNodes (std::vector<SHAMapNodeID>& nodeIDs, std::vector<uint256>& nodeHashes,
std::set<SHAMapNodeID>& recentNodes, int max, bool aggressive);
int max, bool aggressive);
/** Return a Json::objectValue. */
Json::Value getJson (int);
@@ -145,9 +145,7 @@ private:
std::uint32_t mSeq;
fcReason mReason;
std::set <SHAMapNodeID> mRecentTXNodes;
std::set <SHAMapNodeID> mRecentASNodes;
std::set <uint256> mRecentNodes;
// Data we have received from peers
PeerSet::LockType mReceivedDataLock;