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

Remove 'skip on stop' job attribute

Browse Source
This commit is contained in:
Vinnie Falco
2016-02-26 15:59:07 -05:00
parent b82be0a9b0
commit 6e70a6c6f5
4 changed files with 68 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
src/ripple/core/impl/JobQueue.cpp
View File

@@ -112,16 +112,6 @@ JobQueue::addJob (JobType type, std::string const& name,
! areChildrenStopped()));
}
// Don't even add it to the queue if we're stopping
// and the job type is marked for skipOnStop.
//
if (isStopping() && skipOnStop (type))
{
JLOG(m_journal.debug) <<
"Skipping addJob ('" << name << "')";
return;
}
{
std::lock_guard <std::mutex> lock (m_mutex);
@@ -330,6 +320,13 @@ JobQueue::getJobTypeData (JobType type)
return c->second;
}
void
JobQueue::onStop()
{
// onStop must be defined and empty here,
// otherwise the base class will do the wrong thing.
}
void
JobQueue::checkStopped (std::lock_guard <std::mutex> const& lock)
{
@@ -454,37 +451,23 @@ JobQueue::processTask ()
JobType type;
{
Job job;
{
std::lock_guard <std::mutex> lock (m_mutex);
getNextJob (job);
++m_processCount;
}
JobTypeData& data (getJobTypeData (job.getType ()));
// Skip the job if we are stopping and the
// skipOnStop flag is set for the job type
//
if (!isStopping() || !data.info.skip ())
Job::clock_type::time_point const start_time (
Job::clock_type::now());
{
Job job;
{
std::lock_guard <std::mutex> lock (m_mutex);
getNextJob (job);
++m_processCount;
}
type = job.getType();
JobTypeData& data(getJobTypeData(type));
beast::Thread::setCurrentThreadName (data.name ());
JLOG(m_journal.trace) << "Doing " << data.name () << " job";
Job::clock_type::time_point const start_time (
Job::clock_type::now());
on_dequeue (job.getType (), start_time - job.queue_time ());
job.doJob ();
on_execute (job.getType (), Job::clock_type::now() - start_time);
}
else
{
JLOG(m_journal.trace) << "Skipping processTask ('" << data.name () << "')";
}
type = job.getType();
on_execute(type, Job::clock_type::now() - start_time);
}
{
@@ -502,15 +485,6 @@ JobQueue::processTask ()
// to the associated LoadEvent object (in the Job) may be destroyed.
}
bool
JobQueue::skipOnStop (JobType type)
{
JobTypeInfo const& j (getJobTypes ().get (type));
assert (j.type () != jtINVALID);
return j.skip ();
}
int
JobQueue::getJobLimit (JobType type)
{
@@ -520,59 +494,6 @@ JobQueue::getJobLimit (JobType type)
return j.limit ();
}
void
JobQueue::onStop ()
{
// VFALCO NOTE I wanted to remove all the jobs that are skippable
// but then the Workers count of tasks to process
// goes wrong.
/*
{
std::lock_guard <std::mutex> lock (m_mutex);
// Remove all jobs whose type is skipOnStop
using JobDataMap = hash_map <JobType, std::size_t>;
JobDataMap counts;
bool const report (m_journal.debug.active());
for (std::set <Job>::const_iterator iter (m_jobSet.begin());
iter != m_jobSet.end();)
{
if (skipOnStop (iter->getType()))
{
if (report)
{
std::pair <JobDataMap::iterator, bool> result (
counts.insert (std::make_pair (iter->getType(), 1)));
if (! result.second)
++(result.first->second);
}
iter = m_jobSet.erase (iter);
}
else
{
++iter;
}
}
if (report)
{
beast::Journal::ScopedStream s (m_journal.debug);
for (JobDataMap::const_iterator iter (counts.begin());
iter != counts.end(); ++iter)
{
s << std::endl <<
"Removed " << iter->second <<
" skiponStop jobs of type " << Job::toString (iter->first);
}
}
}
*/
}
void
JobQueue::onChildrenStopped ()
{