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

Cleanups.

Browse Source
This commit is contained in:
JoelKatz
2013-08-12 01:26:43 -07:00
parent 54daa40b81
commit 72315bffe3
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/ripple_app/ledger/Ledger.cpp
View File

@@ -1832,11 +1832,14 @@ bool Ledger::pendSaveValidated (bool isSynchronous, bool isCurrent)
{ {
saveValidatedLedger(isCurrent); saveValidatedLedger(isCurrent);
} }
else if (isCurrent)
{
getApp().getJobQueue ().addJob (jtPUBLEDGER, "Ledger::pendSave",
BIND_TYPE (&Ledger::saveValidatedLedgerAsync, shared_from_this (), P_1, isCurrent));
}
else else
{ {
getApp().getJobQueue ().addJob ( getApp().getJobQueue ().addLimitJob (jtPUBOLDLEDGER, "Ledger::pendOldSave", 2,
isCurrent ? jtPUBLEDGER : jtPUBOLDLEDGER,
isCurrent ? "Ledger::pendSave" : "Ledger::pendOldSave",
BIND_TYPE (&Ledger::saveValidatedLedgerAsync, shared_from_this (), P_1, isCurrent)); BIND_TYPE (&Ledger::saveValidatedLedgerAsync, shared_from_this (), P_1, isCurrent));
} }

6
modules/ripple_app/ledger/LedgerMaster.cpp
View File

@@ -546,7 +546,7 @@ void LedgerMaster::advanceThread()
if (pubLedgers.empty()) if (pubLedgers.empty())
{ {
if (!getConfig().RUN_STANDALONE && !getApp().getFeeTrack().isLoadedLocal() && if (!getConfig().RUN_STANDALONE && !getApp().getFeeTrack().isLoadedLocal() &&
(getApp().getJobQueue().getJobCount(jtPUBOLDLEDGER) < 3) && (getApp().getJobQueue().getJobCount(jtPUBOLDLEDGER) < 10) &&
(mValidLedger->getLedgerSeq() == mPubLedger->getLedgerSeq())) (mValidLedger->getLedgerSeq() == mPubLedger->getLedgerSeq()))
{ // We are in sync, so can acquire { // We are in sync, so can acquire
uint32 missing = mCompleteLedgers.prevMissing(mPubLedger->getLedgerSeq()); uint32 missing = mCompleteLedgers.prevMissing(mPubLedger->getLedgerSeq());
@@ -570,7 +570,11 @@ void LedgerMaster::advanceThread()
getApp().getInboundLedgers().findCreate(nextLedger->getParentHash(), getApp().getInboundLedgers().findCreate(nextLedger->getParentHash(),
nextLedger->getLedgerSeq() - 1); nextLedger->getLedgerSeq() - 1);
if (acq && acq->isComplete() && !acq->isFailed()) if (acq && acq->isComplete() && !acq->isFailed())
{
ledger = acq->getLedger(); ledger = acq->getLedger();
getApp().getInboundLedgers().findCreate(ledger->getParentHash(),
ledger->getLedgerSeq() - 1);
}
sl.lock(); sl.lock();