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

Defer/avoid acquiring the master lock on proposals

Browse Source
This commit is contained in:
JoelKatz
2015-03-08 16:29:42 -07:00
committed by Nik Bougalis
parent 60a7abcef6
commit 8de1b20bb5
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1043,22 +1043,15 @@ PeerImp::onMessage (std::shared_ptr <protocol::TMProposeSet> const& m)
p_journal_.trace <<
"Proposal: " << (isTrusted ? "trusted" : "UNTRUSTED");
uint256 consensusLCL;
{
Application::ScopedLockType lock (getApp ().getMasterLock ());
consensusLCL = getApp().getOPs ().getConsensusLCL ();
}
LedgerProposal::pointer proposal = std::make_shared<LedgerProposal> (
prevLedger.isNonZero () ? prevLedger : consensusLCL,
prevLedger.isNonZero () ? prevLedger : uint256(),
set.proposeseq (), proposeHash, set.closetime (),
signerPublic, suppression);
getApp().getJobQueue ().addJob (isTrusted ? jtPROPOSAL_t : jtPROPOSAL_ut,
"recvPropose->checkPropose", std::bind(beast::weak_fn(
&PeerImp::checkPropose, shared_from_this()), std::placeholders::_1,
m, proposal, consensusLCL));
m, proposal));
}
void
@@ -1470,7 +1463,7 @@ PeerImp::checkTransaction (Job&, int flags,
void
PeerImp::checkPropose (Job& job,
std::shared_ptr <protocol::TMProposeSet> const& packet,
LedgerProposal::pointer proposal, uint256 consensusLCL)
LedgerProposal::pointer proposal)
{
bool sigGood = false;
bool isTrusted = (job.getType () == jtPROPOSAL_t);
@@ -1481,14 +1474,22 @@ PeerImp::checkPropose (Job& job,
assert (packet);
protocol::TMProposeSet& set = *packet;
uint256 prevLedger;
uint256 consensusLCL;
if (! set.has_previousledger() || ! isTrusted)
{
Application::ScopedLockType lock (getApp ().getMasterLock ());
consensusLCL = getApp().getOPs ().getConsensusLCL ();
}
uint256 prevLedger;
if (set.has_previousledger ())
{
// proposal includes a previous ledger
p_journal_.trace <<
"proposal with previous ledger";
memcpy (prevLedger.begin (), set.previousledger ().data (), 256 / 8);
proposal->setPrevLedger (prevLedger);
if (! cluster() && !proposal->checkSign (set.signature ()))
{
@@ -1502,6 +1503,7 @@ PeerImp::checkPropose (Job& job,
}
else
{
proposal->setPrevLedger (consensusLCL);
if (consensusLCL.isNonZero () && proposal->checkSign (set.signature ()))
{
prevLedger = consensusLCL;

2
src/ripple/overlay/impl/PeerImp.h
View File

@@ -405,7 +405,7 @@ private:
void
checkPropose (Job& job,
std::shared_ptr<protocol::TMProposeSet> const& packet,
LedgerProposal::pointer proposal, uint256 consensusLCL);
LedgerProposal::pointer proposal);
void
checkValidation (Job&, STValidation::pointer val,