From 968768cdb807d1da01daad5b3db364ee88670d0e Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Thu, 13 Jun 2013 23:38:21 -0700 Subject: [PATCH] Avoid an extraneous dispatch to the same context we're already in. Get rid of stored proposals in a more sane way. --- src/cpp/ripple/ripple_LedgerConsensus.cpp | 2 ++ src/cpp/ripple/ripple_Peer.cpp | 6 +----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/cpp/ripple/ripple_LedgerConsensus.cpp b/src/cpp/ripple/ripple_LedgerConsensus.cpp index cd0841e04..0f5106e46 100644 --- a/src/cpp/ripple/ripple_LedgerConsensus.cpp +++ b/src/cpp/ripple/ripple_LedgerConsensus.cpp @@ -1043,6 +1043,8 @@ void LedgerConsensus::accept(SHAMap::ref set, LoadEvent::pointer) boost::recursive_mutex::scoped_lock masterLock(theApp->getMasterLock()); assert(set->getHash() == mOurPosition->getCurrentHash()); + theApp->getOPs().peekStoredProposals().clear(); // these are now obsolete + uint32 closeTime = roundCloseTime(mOurPosition->getCloseTime()); bool closeTimeCorrect = true; if (closeTime == 0) diff --git a/src/cpp/ripple/ripple_Peer.cpp b/src/cpp/ripple/ripple_Peer.cpp index 375e1f9f0..1b8b2c61e 100644 --- a/src/cpp/ripple/ripple_Peer.cpp +++ b/src/cpp/ripple/ripple_Peer.cpp @@ -1100,11 +1100,7 @@ static void checkPropose(Job& job, boost::shared_ptr packe } if (isTrusted) - { - theApp->getJobQueue().addJob(jtPROPOSAL_t, "trustedProposal", - BIND_TYPE(&NetworkOPs::processTrustedProposal, &theApp->getOPs(), - proposal, packet, nodePublic, prevLedger, sigGood)); - } + theApp->getOPs().processTrustedProposal(proposal, packet, nodePublic, prevLedger, sigGood); else if (sigGood && (prevLedger == consensusLCL)) { // relay untrusted proposal WriteLog (lsTRACE, Peer) << "relaying untrusted proposal";