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

Stop the acquire engine in cases where it shouldn't run.

Browse Source
This commit is contained in:
JoelKatz
2013-03-29 10:16:25 -07:00
parent 24bc094cb1
commit e40b7b9f0b
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cpp/ripple/LedgerMaster.cpp
View File

@@ -248,7 +248,7 @@ bool LedgerMaster::acquireMissingLedger(Ledger::ref origLedger, const uint256& l
int timeoutCount; int timeoutCount;
int fetchCount = theApp->getMasterLedgerAcquire().getFetchCount(timeoutCount); int fetchCount = theApp->getMasterLedgerAcquire().getFetchCount(timeoutCount);
if (fetchCount < fetchMax) if ((fetchCount < fetchMax) && theApp->getOPs().isFull())
{ {
if (timeoutCount > 2) if (timeoutCount > 2)
{ {
@@ -305,7 +305,7 @@ bool LedgerMaster::shouldAcquire(uint32 currentLedger, uint32 ledgerHistory, uin
void LedgerMaster::resumeAcquiring() void LedgerMaster::resumeAcquiring()
{ {
if (theApp->getOPs().isNeedNetworkLedger()) if (!theApp->getOPs().isFull())
return; return;
boost::recursive_mutex::scoped_lock ml(mLock); boost::recursive_mutex::scoped_lock ml(mLock);

1
src/cpp/ripple/NetworkOPs.h
View File

@@ -273,6 +273,7 @@ public:
void needNetworkLedger() { mNeedNetworkLedger = true; } void needNetworkLedger() { mNeedNetworkLedger = true; }
void clearNeedNetworkLedger() { mNeedNetworkLedger = false; } void clearNeedNetworkLedger() { mNeedNetworkLedger = false; }
bool isNeedNetworkLedger() { return mNeedNetworkLedger; } bool isNeedNetworkLedger() { return mNeedNetworkLedger; }
bool isFull() { return !mNeedNetworkLedger && (mMode == omFULL); }
void setProposing(bool p, bool v) { mProposing = p; mValidating = v; } void setProposing(bool p, bool v) { mProposing = p; mValidating = v; }
bool isProposing() { return mProposing; } bool isProposing() { return mProposing; }
bool isValidating() { return mValidating; } bool isValidating() { return mValidating; }