소스 검색

Expose if CScheduler is being serviced, assert its not in EmptyQueue

tags/v0.15.1
Matt Corallo 3 년 전
부모
커밋
1f668b6468
2개의 변경된 파일9개의 추가작업 그리고 0개의 파일을 삭제
  1. 5
    0
      src/scheduler.cpp
  2. 4
    0
      src/scheduler.h

+ 5
- 0
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();

+ 4
- 0
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();
};


Loading…
취소
저장