aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatt Corallo <git@bluematt.me>2017-07-10 21:08:19 -0400
committerMatt Corallo <git@bluematt.me>2017-07-10 21:08:19 -0400
commit1f668b646806f94acd851acdbd9939c24e0492d3 (patch)
treec771b63f06207f18c7956ca5c40d2924972ba92b /src
parent3192975f1d177aa9f0bbd823c6387cfbfa943610 (diff)
Expose if CScheduler is being serviced, assert its not in EmptyQueue
Diffstat (limited to 'src')
-rw-r--r--src/scheduler.cpp5
-rw-r--r--src/scheduler.h4
2 files changed, 9 insertions, 0 deletions
diff --git a/src/scheduler.cpp b/src/scheduler.cpp
index 35bf0da4be..36a6d5110d 100644
--- a/src/scheduler.cpp
+++ b/src/scheduler.cpp
@@ -140,6 +140,10 @@ size_t CScheduler::getQueueInfo(boost::chrono::system_clock::time_point &first,
return result;
}
+bool CScheduler::AreThreadsServicingQueue() const {
+ return nThreadsServicingQueue;
+}
+
void SingleThreadedSchedulerClient::MaybeScheduleProcessQueue() {
{
@@ -193,6 +197,7 @@ void SingleThreadedSchedulerClient::AddToProcessQueue(std::function<void (void)>
}
void SingleThreadedSchedulerClient::EmptyQueue() {
+ assert(!m_pscheduler->AreThreadsServicingQueue());
bool should_continue = true;
while (should_continue) {
ProcessQueue();
diff --git a/src/scheduler.h b/src/scheduler.h
index 6a079f7749..0365d668b2 100644
--- a/src/scheduler.h
+++ b/src/scheduler.h
@@ -71,6 +71,9 @@ public:
size_t getQueueInfo(boost::chrono::system_clock::time_point &first,
boost::chrono::system_clock::time_point &last) const;
+ // Returns true if there are threads actively running in serviceQueue()
+ bool AreThreadsServicingQueue() const;
+
private:
std::multimap<boost::chrono::system_clock::time_point, Function> taskQueue;
boost::condition_variable newTaskScheduled;
@@ -103,6 +106,7 @@ public:
void AddToProcessQueue(std::function<void (void)> func);
// Processes all remaining queue members on the calling thread, blocking until queue is empty
+ // Must be called after the CScheduler has no remaining processing threads!
void EmptyQueue();
};