Merge pull request #20009 from Dr15Jones/waitToDestroySerialTaskQueue

Wait in destructor of SerialTaskQueue
cms-sw · Aug 2, 2017 · 753afe1 · 753afe1
2 parents 1b89497 + 9fbd9bb
commit 753afe1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/FWCore/Concurrency/interface/SerialTaskQueue.h b/FWCore/Concurrency/interface/SerialTaskQueue.h
@@ -70,6 +70,8 @@ namespace edm {
       m_pauseCount{0}
       {  }
 
+      ~SerialTaskQueue();
+
       // ---------- const member functions ---------------------
       /// Checks to see if the queue has been paused.
       /**\return true if the queue is paused

diff --git a/FWCore/Concurrency/src/SerialTaskQueue.cc b/FWCore/Concurrency/src/SerialTaskQueue.cc
@@ -23,6 +23,16 @@ using namespace edm;
 //
 // member functions
 //
+SerialTaskQueue::~SerialTaskQueue()
+{
+  //be certain all tasks have completed
+  bool isEmpty = m_tasks.empty();
+  bool isTaskChosen = m_taskChosen;
+  if ( (not isEmpty and not isPaused()) or isTaskChosen) {
+    pushAndWait([]() {return;});
+  }
+}
+
 bool
 SerialTaskQueue::resume() {
   if(0==--m_pauseCount) {