ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove transaction set acquire logic from consensus object

Browse Source 
This creates a new InboundTransactions object that handles transaction sets,
removing this responsibility from the consensus object. The main benefit is
that many inbound transaction operations no longer require the master lock.

Improve logic to decide which peers to query, when to add more peers, and
when to re-query existing peers.
This commit is contained in:
David Schwartz
2015-03-09 11:39:52 -07:00
committed by Tom Ritchford
parent 00596f1436
commit 1fedede771
15 changed files with 575 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/ripple/overlay/impl/PeerImp.cpp
View File

@@ -27,6 +27,7 @@
#include <ripple/app/misc/NetworkOPs.h>
#include <ripple/app/peers/ClusterNodeStatus.h>
#include <ripple/app/peers/UniqueNodeList.h>
#include <ripple/app/tx/InboundTransactions.h>
#include <ripple/basics/StringUtilities.h>
#include <ripple/basics/UptimeTimer.h>
#include <ripple/core/JobQueue.h>
@@ -1613,10 +1614,7 @@ PeerImp::getLedger (std::shared_ptr<protocol::TMGetLedger> const& m)
uint256 txHash;
memcpy (txHash.begin (), packet.ledgerhash ().data (), 32);
{
std::lock_guard<Application::MutexType> lock(getApp().getMasterMutex());
map = getApp().getOPs ().getTXMap (txHash);
}
map = getApp().getInboundTransactions().getSet (txHash, false);
if (!map)
{
@@ -1946,44 +1944,12 @@ PeerImp::getLedger (std::shared_ptr<protocol::TMGetLedger> const& m)
send (oPacket);
}
// VFALCO TODO Make this non-static
void
PeerImp::peerTXData (Job&, uint256 const& hash,
std::shared_ptr <protocol::TMLedgerData> const& pPacket,
beast::Journal journal)
{
protocol::TMLedgerData& packet = *pPacket;
std::list<SHAMapNodeID> nodeIDs;
std::list< Blob > nodeData;
for (int i = 0; i < packet.nodes ().size (); ++i)
{
const protocol::TMLedgerNode& node = packet.nodes (i);
if (!node.has_nodeid () || !node.has_nodedata () || (
node.nodeid ().size () != 33))
{
journal.warning << "LedgerData request with invalid node ID";
charge (Resource::feeInvalidRequest);
return;
}
nodeIDs.push_back (SHAMapNodeID {node.nodeid ().data (),
static_cast<int>(node.nodeid ().size ())});
nodeData.push_back (Blob (node.nodedata ().begin (),
node.nodedata ().end ()));
}
SHAMapAddNode san;
{
std::lock_guard<Application::MutexType> lock(getApp().getMasterMutex());
san = getApp().getOPs().gotTXData (shared_from_this(),
hash, nodeIDs, nodeData);
}
if (san.isInvalid ())
charge (Resource::feeUnwantedData);
getApp().getInboundTransactions().gotData (hash, shared_from_this(), pPacket);
}
} // ripple