From 72315bffe3d5adc94eba66c80347fe52d6ee65cb Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Mon, 12 Aug 2013 01:26:43 -0700 Subject: [PATCH] Cleanups. --- modules/ripple_app/ledger/Ledger.cpp | 9 ++++++--- modules/ripple_app/ledger/LedgerMaster.cpp | 6 +++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/modules/ripple_app/ledger/Ledger.cpp b/modules/ripple_app/ledger/Ledger.cpp index 5254576ea..6770b2291 100644 --- a/modules/ripple_app/ledger/Ledger.cpp +++ b/modules/ripple_app/ledger/Ledger.cpp @@ -1832,11 +1832,14 @@ bool Ledger::pendSaveValidated (bool isSynchronous, bool isCurrent) { saveValidatedLedger(isCurrent); } + else if (isCurrent) + { + getApp().getJobQueue ().addJob (jtPUBLEDGER, "Ledger::pendSave", + BIND_TYPE (&Ledger::saveValidatedLedgerAsync, shared_from_this (), P_1, isCurrent)); + } else { - getApp().getJobQueue ().addJob ( - isCurrent ? jtPUBLEDGER : jtPUBOLDLEDGER, - isCurrent ? "Ledger::pendSave" : "Ledger::pendOldSave", + getApp().getJobQueue ().addLimitJob (jtPUBOLDLEDGER, "Ledger::pendOldSave", 2, BIND_TYPE (&Ledger::saveValidatedLedgerAsync, shared_from_this (), P_1, isCurrent)); } diff --git a/modules/ripple_app/ledger/LedgerMaster.cpp b/modules/ripple_app/ledger/LedgerMaster.cpp index e9e9e0042..d5da4598c 100644 --- a/modules/ripple_app/ledger/LedgerMaster.cpp +++ b/modules/ripple_app/ledger/LedgerMaster.cpp @@ -546,7 +546,7 @@ void LedgerMaster::advanceThread() if (pubLedgers.empty()) { if (!getConfig().RUN_STANDALONE && !getApp().getFeeTrack().isLoadedLocal() && - (getApp().getJobQueue().getJobCount(jtPUBOLDLEDGER) < 3) && + (getApp().getJobQueue().getJobCount(jtPUBOLDLEDGER) < 10) && (mValidLedger->getLedgerSeq() == mPubLedger->getLedgerSeq())) { // We are in sync, so can acquire uint32 missing = mCompleteLedgers.prevMissing(mPubLedger->getLedgerSeq()); @@ -570,7 +570,11 @@ void LedgerMaster::advanceThread() getApp().getInboundLedgers().findCreate(nextLedger->getParentHash(), nextLedger->getLedgerSeq() - 1); if (acq && acq->isComplete() && !acq->isFailed()) + { ledger = acq->getLedger(); + getApp().getInboundLedgers().findCreate(ledger->getParentHash(), + ledger->getLedgerSeq() - 1); + } sl.lock();