Improve context termination.

[simgrid.git] / src / kernel / context / ContextBoost.cpp

diff --git a/src/kernel/context/ContextBoost.cpp b/src/kernel/context/ContextBoost.cpp
index 237de08..a4c78b3 100644 (file)
--- a/src/kernel/context/ContextBoost.cpp
+++ b/src/kernel/context/ContextBoost.cpp
@@ -63,10 +63,9 @@ BoostContextFactory::BoostContextFactory()
   BoostContext::parallel_ = SIMIX_context_is_parallel();
   if (BoostContext::parallel_) {
 #if HAVE_THREAD_CONTEXTS
-    int nthreads = SIMIX_context_get_nthreads();
-    BoostContext::parmap_ = new simgrid::xbt::Parmap<smx_actor_t>(nthreads, SIMIX_context_get_parallel_mode());
+    BoostContext::parmap_ = nullptr;
     BoostContext::workers_context_.clear();
-    BoostContext::workers_context_.resize(nthreads, nullptr);
+    BoostContext::workers_context_.resize(SIMIX_context_get_nthreads(), nullptr);
     BoostContext::maestro_context_ = nullptr;
     xbt_os_thread_key_create(&BoostContext::worker_id_key_);
 #else
@@ -78,10 +77,8 @@ BoostContextFactory::BoostContextFactory()
 BoostContextFactory::~BoostContextFactory()
 {
 #if HAVE_THREAD_CONTEXTS
-  if (BoostContext::parmap_) {
-    delete BoostContext::parmap_;
-    BoostContext::parmap_ = nullptr;
-  }
+  delete BoostContext::parmap_;
+  BoostContext::parmap_ = nullptr;
   BoostContext::workers_context_.clear();
 #endif
 }
@@ -106,6 +103,9 @@ void BoostContextFactory::run_all()
 #if HAVE_THREAD_CONTEXTS
   if (BoostContext::parallel_) {
     BoostContext::threads_working_ = 0;
+    if (not BoostContext::parmap_)
+      BoostContext::parmap_ =
+          new simgrid::xbt::Parmap<smx_actor_t>(SIMIX_context_get_nthreads(), SIMIX_context_get_parallel_mode());
     BoostContext::parmap_->apply(
         [](smx_actor_t process) {
           BoostContext* context = static_cast<BoostContext*>(process->context);
@@ -135,8 +135,13 @@ void BoostContext::smx_ctx_boost_wrapper(BoostContext::ctx_arg_type arg)
   static_cast<BoostContext**>(arg.data)[0]->fc_ = arg.fctx;
   BoostContext* context                         = static_cast<BoostContext**>(arg.data)[1];
 #endif
-  (*context)();
-  context->stop();
+  try {
+    (*context)();
+    context->stop();
+  } catch (StopRequest) {
+    XBT_DEBUG("Caught a StopRequest");
+  }
+  context->suspend();
 }
 
 inline void BoostContext::smx_ctx_boost_jump_fcontext(BoostContext* from, BoostContext* to)
@@ -223,7 +228,7 @@ void BoostSerialContext::suspend()
 void BoostSerialContext::stop()
 {
   BoostContext::stop();
-  this->suspend();
+  throw StopRequest();
 }
 
 // BoostParallelContext
@@ -250,7 +255,7 @@ void BoostParallelContext::suspend()
 void BoostParallelContext::stop()
 {
   BoostContext::stop();
-  this->suspend();
+  throw StopRequest();
 }
 
 void BoostParallelContext::resume()