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

Don't send redundant ledger queries. Cleanup.

Browse Source
This commit is contained in:
JoelKatz
2013-06-17 13:23:29 -07:00
parent c91cdbeff1
commit be8ce20f73
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/cpp/ripple/ripple_InboundLedger.cpp
View File

@@ -289,8 +289,7 @@ void InboundLedger::trigger (Peer::ref peer)
if ((mWaitCount > 0) && peer) if ((mWaitCount > 0) && peer)
{ {
mRecentPeers.push_back (peer->getPeerId ()); WriteLog (lsTRACE, InboundLedger) << "Skipping peer";
WriteLog (lsTRACE, InboundLedger) << "Deferring peer";
return; return;
} }
@@ -314,6 +313,7 @@ void InboundLedger::trigger (Peer::ref peer)
if (mFailed) if (mFailed)
{ {
WriteLog (lsWARNING, InboundLedger) << " failed local for " << mHash; WriteLog (lsWARNING, InboundLedger) << " failed local for " << mHash;
return;
} }
} }
@@ -401,6 +401,7 @@ void InboundLedger::trigger (Peer::ref peer)
* (tmGL.add_nodeids ()) = SHAMapNode ().getRawString (); * (tmGL.add_nodeids ()) = SHAMapNode ().getRawString ();
WriteLog (lsTRACE, InboundLedger) << "Sending TX root request to " << (peer ? "selected peer" : "all peers"); WriteLog (lsTRACE, InboundLedger) << "Sending TX root request to " << (peer ? "selected peer" : "all peers");
sendRequest (tmGL, peer); sendRequest (tmGL, peer);
return;
} }
else else
{ {
@@ -431,13 +432,14 @@ void InboundLedger::trigger (Peer::ref peer)
if (!nodeIDs.empty ()) if (!nodeIDs.empty ())
{ {
tmGL.set_itype (protocol::liTX_NODE); tmGL.set_itype (protocol::liTX_NODE);
BOOST_FOREACH (SHAMapNode & it, nodeIDs) BOOST_FOREACH (SHAMapNode const& it, nodeIDs)
{ {
* (tmGL.add_nodeids ()) = it.getRawString (); * (tmGL.add_nodeids ()) = it.getRawString ();
} }
WriteLog (lsTRACE, InboundLedger) << "Sending TX node " << nodeIDs.size () WriteLog (lsTRACE, InboundLedger) << "Sending TX node " << nodeIDs.size ()
<< " request to " << (peer ? "selected peer" : "all peers"); << " request to " << (peer ? "selected peer" : "all peers");
sendRequest (tmGL, peer); sendRequest (tmGL, peer);
return;
} }
} }
} }
@@ -454,6 +456,7 @@ void InboundLedger::trigger (Peer::ref peer)
* (tmGL.add_nodeids ()) = SHAMapNode ().getRawString (); * (tmGL.add_nodeids ()) = SHAMapNode ().getRawString ();
WriteLog (lsTRACE, InboundLedger) << "Sending AS root request to " << (peer ? "selected peer" : "all peers"); WriteLog (lsTRACE, InboundLedger) << "Sending AS root request to " << (peer ? "selected peer" : "all peers");
sendRequest (tmGL, peer); sendRequest (tmGL, peer);
return;
} }
else else
{ {
@@ -484,19 +487,20 @@ void InboundLedger::trigger (Peer::ref peer)
if (!nodeIDs.empty ()) if (!nodeIDs.empty ())
{ {
tmGL.set_itype (protocol::liAS_NODE); tmGL.set_itype (protocol::liAS_NODE);
BOOST_FOREACH (SHAMapNode & it, nodeIDs) BOOST_FOREACH (SHAMapNode const& it, nodeIDs)
* (tmGL.add_nodeids ()) = it.getRawString (); {
* (tmGL.add_nodeids ()) = it.getRawString ();
}
WriteLog (lsTRACE, InboundLedger) << "Sending AS node " << nodeIDs.size () WriteLog (lsTRACE, InboundLedger) << "Sending AS node " << nodeIDs.size ()
<< " request to " << (peer ? "selected peer" : "all peers"); << " request to " << (peer ? "selected peer" : "all peers");
CondLog (nodeIDs.size () == 1, lsTRACE, InboundLedger) << "AS node: " << nodeIDs[0]; CondLog (nodeIDs.size () == 1, lsTRACE, InboundLedger) << "AS node: " << nodeIDs[0];
sendRequest (tmGL, peer); sendRequest (tmGL, peer);
return;
} }
} }
} }
} }
mRecentPeers.clear ();
if (mComplete || mFailed) if (mComplete || mFailed)
{ {
WriteLog (lsDEBUG, InboundLedger) << "Done:" << (mComplete ? " complete" : "") << (mFailed ? " failed " : " ") WriteLog (lsDEBUG, InboundLedger) << "Done:" << (mComplete ? " complete" : "") << (mFailed ? " failed " : " ")

2
src/cpp/ripple/ripple_InboundLedger.h
View File

@@ -115,8 +115,6 @@ private:
std::set <SHAMapNode> mRecentTXNodes; std::set <SHAMapNode> mRecentTXNodes;
std::set <SHAMapNode> mRecentASNodes; std::set <SHAMapNode> mRecentASNodes;
std::vector <uint64> mRecentPeers;
std::vector <FUNCTION_TYPE <void (InboundLedger::pointer)> > mOnComplete; std::vector <FUNCTION_TYPE <void (InboundLedger::pointer)> > mOnComplete;
}; };