Fix construction of new class

Author: dcwhite

src/Dataflow/Engine/Controller/NetworkEditorController.cc

@@ -64,7 +64,6 @@ NetworkEditorController::NetworkEditorController(ModuleFactoryHandle mf, ModuleS
   reexFactory_(reex),
   executorFactory_(executorFactory),
   serializationManager_(nesm),
-  executionManager_(currentExecutor_), //TODO: pass in factory instead
   signalSwitch_(true)
 {
   dynamicPortManager_.reset(new DynamicPortManager(connectionAdded_, connectionRemoved_, this));
@@ -77,7 +76,7 @@ NetworkEditorController::NetworkEditorController(ModuleFactoryHandle mf, ModuleS
 }
 
 NetworkEditorController::NetworkEditorController(SCIRun::Dataflow::Networks::NetworkHandle network, ExecutionStrategyFactoryHandle executorFactory, NetworkEditorSerializationManager* nesm)
-  : theNetwork_(network), executorFactory_(executorFactory), serializationManager_(nesm), executionManager_(currentExecutor_) //TODO: pass in factory instead
+  : theNetwork_(network), executorFactory_(executorFactory), serializationManager_(nesm)
 {
 }
 
@@ -352,10 +351,7 @@ void NetworkEditorController::executeModule(const ModuleHandle& module, const Ex
 
 void NetworkEditorController::initExecutor()
 {
-  if (!currentExecutor_)
-  {
-    currentExecutor_ = executorFactory_->createDefault();
-  }
+  executionManager_.initExecutor(executorFactory_);
 }
 
 ExecutionContextHandle NetworkEditorController::createExecutionContext(const ExecutableLookup* lookup, ModuleFilter filter)
@@ -372,46 +368,6 @@ void NetworkEditorController::executeGeneric(const ExecutableLookup* lookup, Mod
   executionManager_.enqueueContext(context);
 }
 
-ExecutionQueueManager::ExecutionQueueManager(ExecutionStrategyHandle& currentExecutor) : contexts_(2), currentExecutor_(currentExecutor),
-  executionLaunchThread_([this]() {executeTopContext(); } ),
-  executionMutex_("executionQueue"),
-  somethingToExecute_("executionQueue")
-{
-}
-
-void ExecutionQueueManager::enqueueContext(ExecutionContextHandle context)
-{
-  bool contextReady = false;
-  {
-    Guard g(executionMutex_.get());
-    contextReady = contexts_.push(context);
-  }
-  if (contextReady)
-  {
-    contextCount_.fetch_add(1);
-    //std::cout << "ctx queued" << std::endl;
-    somethingToExecute_.conditionBroadcast();
-  }
-  else
-  {
-    //std::cout << "ctx queue is full" << std::endl;
-  }
-}
-
-void ExecutionQueueManager::executeTopContext()
-{
-  while (true)
-  {
-    UniqueLock lock(executionMutex_.get());
-    while (0 == contextCount_)
-    {
-      somethingToExecute_.wait(lock);
-    }
-    contexts_.consume_one([&](ExecutionContextHandle ctx) { currentExecutor_->execute(*ctx); });
-    contextCount_.fetch_sub(1);
-  }
-}
-
 NetworkHandle NetworkEditorController::getNetwork() const
 {
   return theNetwork_;
@@ -430,7 +386,7 @@ NetworkGlobalSettings& NetworkEditorController::getSettings()
 
 void NetworkEditorController::setExecutorType(int type)
 {
-  currentExecutor_ = executorFactory_->create((ExecutionStrategy::Type)type);
+  executionManager_.setExecutionStrategy(executorFactory_->create((ExecutionStrategy::Type)type));
 }
 
 const ModuleDescriptionMap& NetworkEditorController::getAllAvailableModuleDescriptions() const

src/Dataflow/Engine/Scheduler/ExecutionStrategy.cc

@@ -30,6 +30,7 @@
 
 using namespace SCIRun::Dataflow::Engine;
 using namespace SCIRun::Dataflow::Networks;
+using namespace SCIRun::Core::Thread;
 
 ExecutionBounds ExecutionContext::executionBounds_;
 
@@ -51,3 +52,68 @@ ModuleFilter ExecutionContext::addAdditionalFilter(ModuleFilter filter) const
 
   return boost::bind(filter, _1) && boost::bind(additionalFilter, _1);
 }
+
+ExecutionQueueManager::ExecutionQueueManager() : 
+  contexts_(2), 
+  executionMutex_("executionQueue"),
+  somethingToExecute_("executionQueue")
+{
+}
+
+void ExecutionQueueManager::setExecutionStrategy(ExecutionStrategyHandle exec)
+{ 
+  Guard g(executionMutex_.get());
+  currentExecutor_ = exec; 
+}
+
+void ExecutionQueueManager::initExecutor(ExecutionStrategyFactoryHandle factory)
+{
+  if (!currentExecutor_ && factory)
+    currentExecutor_ = factory->createDefault();
+  if (!executionLaunchThread_)
+    start();
+}
+
+void ExecutionQueueManager::start()
+{
+  executionLaunchThread_.reset(new boost::thread([this]() { executeTopContext(); }));
+}
+
+void ExecutionQueueManager::enqueueContext(ExecutionContextHandle context)
+{
+  bool contextReady = false;
+  {
+    Guard g(executionMutex_.get());
+    contextReady = contexts_.push(context);
+  }
+  if (contextReady)
+  {
+    contextCount_.fetch_add(1);
+    //std::cout << "ctx queued" << std::endl;
+    somethingToExecute_.conditionBroadcast();
+  }
+  else
+  {
+    //std::cout << "ctx queue is full" << std::endl;
+  }
+}
+
+void ExecutionQueueManager::executeTopContext()
+{
+  while (true)
+  {
+    UniqueLock lock(executionMutex_.get());
+    while (0 == contextCount_)
+    {
+      somethingToExecute_.wait(lock);
+    }
+    contexts_.consume_one([&](ExecutionContextHandle ctx) { if (currentExecutor_) currentExecutor_->execute(*ctx); });
+    contextCount_.fetch_sub(1);
+  }
+}
+
+void ExecutionQueueManager::stop()
+{
+  executionLaunchThread_->interrupt();
+  executionLaunchThread_.reset();
+}

src/Dataflow/Engine/Scheduler/ExecutionStrategy.h

@@ -72,15 +72,19 @@ namespace Engine {
   class SCISHARE ExecutionQueueManager
   {
   public:
-    explicit ExecutionQueueManager(ExecutionStrategyHandle& currentExecutor);
+    ExecutionQueueManager();
+    void initExecutor(ExecutionStrategyFactoryHandle factory);
+    void setExecutionStrategy(ExecutionStrategyHandle exec);
     void enqueueContext(ExecutionContextHandle context);
+    void start();
+    void stop();
   private:
     typedef DynamicExecutor::WorkQueue<ExecutionContextHandle>::Impl ExecutionContextQueue;
     ExecutionContextQueue contexts_;
 
-    ExecutionStrategyHandle& currentExecutor_;
+    ExecutionStrategyHandle currentExecutor_;
 
-    boost::thread executionLaunchThread_;
+    boost::shared_ptr<boost::thread> executionLaunchThread_;
     Core::Thread::Mutex executionMutex_;
     Core::Thread::ConditionVariable somethingToExecute_;
     boost::atomic<int> contextCount_; // need certain member function on spsc_queue, need to check boost version...