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

Fix some performance problems with the new ledger master code.

Browse Source
This commit is contained in:
JoelKatz
2013-09-09 02:02:23 -07:00
parent d3159aba88
commit a4e81fb6ad
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -359,7 +359,7 @@ void LedgerMaster::tryFill (Ledger::pointer ledger)
{
ScopedLockType ml (mLock, __FILE__, __LINE__);
mCompleteLedgers.setRange (minHas, maxHas);
mFillInProgress = false;
mFillInProgress = 0;
tryAdvance();
}
}
@@ -555,25 +555,25 @@ void LedgerMaster::advanceThread()
ScopedLockType sl (mLock, __FILE__, __LINE__);
assert (mValidLedger && mAdvanceThread);
bool progress;
WriteLog (lsTRACE, LedgerMaster) << "advanceThread<";
do
{
progress = false;
mAdvanceWork = false; // If there's work to do, we'll make progress
bool progress = false;
std::list<Ledger::pointer> pubLedgers = findNewLedgersToPublish (sl);
if (pubLedgers.empty())
{
if (!mFillInProgress && !getConfig().RUN_STANDALONE && !getApp().getFeeTrack().isLoadedLocal() &&
if (!getConfig().RUN_STANDALONE && !getApp().getFeeTrack().isLoadedLocal() &&
(getApp().getJobQueue().getJobCount(jtPUBOLDLEDGER) < 10) &&
(mValidLedger->getLedgerSeq() == mPubLedger->getLedgerSeq()))
{ // We are in sync, so can acquire
uint32 missing = mCompleteLedgers.prevMissing(mPubLedger->getLedgerSeq());
WriteLog (lsTRACE, LedgerMaster) << "tryAdvance discovered missing " << missing;
if ((missing != RangeSet::absent) && (missing > 0) &&
shouldAcquire(mValidLedger->getLedgerSeq(), getConfig().LEDGER_HISTORY, missing))
shouldAcquire(mValidLedger->getLedgerSeq(), getConfig().LEDGER_HISTORY, missing) &&
((mFillInProgress == 0) || (missing > mFillInProgress)))
{
WriteLog (lsTRACE, LedgerMaster) << "advanceThread should acquire";
sl.unlock();
@@ -607,10 +607,10 @@ void LedgerMaster::advanceThread()
assert(ledger->getLedgerSeq() == missing);
WriteLog (lsTRACE, LedgerMaster) << "tryAdvance acquired " << ledger->getLedgerSeq();
setFullLedger(ledger, false, false);
if (Ledger::getHashByIndex(ledger->getLedgerSeq() - 1) == ledger->getParentHash())
if ((mFillInProgress == 0) && (Ledger::getHashByIndex(ledger->getLedgerSeq() - 1) == ledger->getParentHash()))
{ // Previous ledger is in DB
sl.lock(__FILE__, __LINE__);
mFillInProgress = true;
mFillInProgress = ledger->getLedgerSeq();
getApp().getJobQueue().addJob(jtADVANCE, "tryFill", BIND_TYPE (&LedgerMaster::tryFill, this, ledger));
sl.unlock();
}
@@ -671,7 +671,9 @@ void LedgerMaster::advanceThread()
BIND_TYPE (&LedgerMaster::updatePaths, this));
}
}
} while (progress);
if (progress)
mAdvanceWork = true;
} while (mAdvanceWork);
mAdvanceThread = false;
WriteLog (lsTRACE, LedgerMaster) << "advanceThread>";
@@ -771,6 +773,7 @@ void LedgerMaster::tryAdvance()
ScopedLockType ml (mLock, __FILE__, __LINE__);
// Can't advance without at least one fully-valid ledger
mAdvanceWork = true;
if (!mAdvanceThread && mValidLedger)
{
mAdvanceThread = true;

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

@@ -29,7 +29,8 @@ public:
, mMinValidations (0)
, mLastValidateSeq (0)
, mAdvanceThread (false)
, mFillInProgress (false)
, mAdvanceWork (false)
, mFillInProgress (0)
, mPathFindThread (false)
, mPathFindNewRequest (false)
{
@@ -226,7 +227,8 @@ private:
std::list<Ledger::pointer> mPubLedgers; // List of ledgers to publish
bool mAdvanceThread; // Publish thread is running
bool mFillInProgress;
bool mAdvanceWork; // Publish thread has work to do
int mFillInProgress;
bool mPathFindThread; // Pathfind thread is running
bool mPathFindNewLedger;