Better threading communication

Author: dcwhite

src/Dataflow/Engine/Controller/NetworkEditorController.cc

@@ -373,14 +373,20 @@ void NetworkEditorController::executeGeneric(const ExecutableLookup* lookup, Mod
 }
 
 ExecutionQueueManager::ExecutionQueueManager(ExecutionStrategyHandle& currentExecutor) : contexts_(1), currentExecutor_(currentExecutor),
-  executionLaunchThread_([this]() {executeTopContext(); } )
+  executionLaunchThread_([this]() {executeTopContext(); } ),
+  executionMutex_("executionQueue"),
+  somethingToExecute_("executionQueue")
 {
 }
 
 void ExecutionQueueManager::enqueueContext(ExecutionContextHandle context)
 {
+  Guard g(executionMutex_.get());
   if (contexts_.push(context))
+  {
     std::cout << "ctx queued" << std::endl;
+    somethingToExecute_.conditionBroadcast();
+  }
   else
     std::cout << "ctx queue is full" << std::endl;
 }
@@ -389,9 +395,12 @@ void ExecutionQueueManager::executeTopContext()
 {
   while (true)
   {
-    if (contexts_.read_available())
-      contexts_.consume_one([&](ExecutionContextHandle ctx) { currentExecutor_->execute(*ctx); });
-    boost::this_thread::sleep(boost::posix_time::milliseconds(1000));
+    UniqueLock lock(executionMutex_.get());
+    while (0 == contexts_.read_available())
+    {
+      somethingToExecute_.wait(lock);
+    }
+    contexts_.consume_one([&](ExecutionContextHandle ctx) { currentExecutor_->execute(*ctx); });
   }
 }
 

src/Dataflow/Engine/Scheduler/ExecutionStrategy.h

@@ -32,6 +32,7 @@
 #include <Dataflow/Engine/Scheduler/SchedulerInterfaces.h>
 #include <Dataflow/Engine/Scheduler/DynamicExecutor/WorkQueue.h>
 #include <boost/thread.hpp>
+#include <Core/Thread/ConditionVariable.h>
 #include <Dataflow/Engine/Scheduler/share.h>
 
 namespace SCIRun {
@@ -79,6 +80,8 @@ namespace Engine {
     ExecutionStrategyHandle& currentExecutor_;
 
     boost::thread executionLaunchThread_;
+    Core::Thread::Mutex executionMutex_;
+    Core::Thread::ConditionVariable somethingToExecute_;
 
     void executeTopContext();
   };