fixed worker pool on exit and added pause funciton to jobqueue

Author: brichards64

src/DataModelBase/JobQueue.cpp

@@ -34,7 +34,7 @@ JobQueue::~JobQueue(){
 
 bool JobQueue::AddJob(Job* job){
 
-  if(job!=0 && job->func!=0){
+  if(job!=0 && job->func!=0 && !pause){
     job->m_complete=false;
     job->m_in_progress=false;
     job->m_failed=false;

src/DataModelBase/JobQueue.h

@@ -52,14 +52,15 @@ namespace ToolFramework{
     void Print();
     void ClearStats();
     void Clear();
-    
+
+    bool pause =false;
 
   private:
 
     std::queue<Job*> m_jobs;
     std::mutex m_lock;
     std::map<std::string, QueueStats> m_stats;
-    
+  
   };
 
 }

src/DataModelBase/Utilities.cpp

@@ -69,6 +69,15 @@ bool Utilities::KillThread(Thread_args* &args){
     args->kill=true;
 
     pthread_join(args->thread, NULL);
+   
+    for(std::map<std::string, Thread_args*>::iterator it= Threads.begin(); it!=Threads.end(); it++){
+    
+      if(it->second == args){
+	Threads.erase(it->first);
+	break;
+      }
+      
+    }
     //delete args;
     //args=0;    
 

src/DataModelBase/WorkerPoolManager.cpp

@@ -49,19 +49,27 @@ WorkerPoolManager::WorkerPoolManager(JobQueue& job_queue, unsigned int* thread_c
 
 WorkerPoolManager::~WorkerPoolManager() {
 
+  m_job_queue->pause = true;
+  while(m_job_queue->size()){
+    //    printf("job queue size=%u\n",m_job_queue->size());
+    usleep(10);
+  }
+
   m_util.KillThread(&m_manager_args);
-  
+ 
   for (unsigned int i = 0; i < m_manager_args.args.size(); i++){
+
     m_util.KillThread(m_manager_args.args.at(i));
     delete m_manager_args.args.at(i);
-  }
+ 
+ }
 
   m_manager_args.args.clear();
-
   //  delete m_util;
   // m_util = 0;
 
   ClearStats();
+  m_job_queue->pause = false;
 
 }
 
@@ -300,14 +308,10 @@ void WorkerPoolManager::PrintStats(){
 
 void WorkerPoolManager::ClearStats(){
 
-  m_job_queue->m_lock.lock();
   m_manager_args.stats_mtx.lock(); 
-
-  m_job_queue->ClearStats();
   m_manager_args.stats.clear();
-  
   m_manager_args.stats_mtx.unlock();
-  m_job_queue->m_lock.unlock();
 
+  m_job_queue->ClearStats();
 
 }