ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-26 14:05:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't let ledger fetching go too fast.

Browse Source
This commit is contained in:
JoelKatz
2013-03-12 15:17:26 -07:00
parent 0b52905cb7
commit e9a02882f1
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cpp/ripple/JobQueue.cpp
View File

@@ -118,6 +118,14 @@ int JobQueue::getJobCount(JobType t)
return (c == mJobCounts.end()) ? 0 : c->second.first;
}
int JobQueue::getJobCountTotal(JobType t)
{
boost::mutex::scoped_lock sl(mJobLock);
std::map< JobType, std::pair<int, int> >::iterator c = mJobCounts.find(t);
return (c == mJobCounts.end()) ? 0 : (c->second.first + c->second.second);
}
int JobQueue::getJobCountGE(JobType t)
{ // return the number of jobs at this priority level or greater
int ret = 0;

5
src/cpp/ripple/JobQueue.h
View File

@@ -103,8 +103,9 @@ public:
void addJob(JobType type, const std::string& name, const boost::function<void(Job&)>& job);
int getJobCount(JobType t); // Jobs at this priority
int getJobCountGE(JobType t); // All jobs at or greater than this priority
int getJobCount(JobType t); // Jobs waiting at this priority
int getJobCountTotal(JobType t); // Jobs waiting plus running at this priority
int getJobCountGE(JobType t); // All waiting jobs at or greater than this priority
std::vector< std::pair<JobType, std::pair<int, int> > > getJobCounts(); // jobs waiting, threads doing
void shutdown();

2
src/cpp/ripple/Ledger.cpp
View File

@@ -512,7 +512,7 @@ void Ledger::saveAcceptedLedger(Job&, bool fromConsensus)
if (!fromConsensus)
dropCache();
if (theApp->getJobQueue().getJobCount(jtPUBOLDLEDGER) == 0)
if (theApp->getJobQueue().getJobCountTotal(jtPUBOLDLEDGER) == 0)
theApp->getLedgerMaster().resumeAcquiring();
}

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

@@ -388,7 +388,7 @@ void LedgerMaster::setFullLedger(Ledger::pointer ledger)
return;
}
if (theApp->getJobQueue().getJobCount(jtPUBOLDLEDGER) > 2)
if (theApp->getJobQueue().getJobCountTotal(jtPUBOLDLEDGER) > 1)
{
cLog(lsDEBUG) << "Too many pending ledger saves";
return;