X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dd3cea7977c08211bae909e128388329d6d568cb..d185bae25f7b17fd34cdea9b4f038a021b6f526d:/src/kernel/context/ContextThread.cpp

diff --git a/src/kernel/context/ContextThread.cpp b/src/kernel/context/ContextThread.cpp
index 991e60a6af..8e9ee722d6 100644
--- a/src/kernel/context/ContextThread.cpp
+++ b/src/kernel/context/ContextThread.cpp
@@ -151,9 +151,22 @@ void *ThreadContext::wrapper(void *param)
   if (smx_ctx_thread_sem)       /* parallel run */
     xbt_os_sem_acquire(smx_ctx_thread_sem);
 
-  (*context)();
-  context->stop();
+  try {
+    (*context)();
+    context->Context::stop();
+  } catch (StopRequest const&) {
+    XBT_DEBUG("Caught a StopRequest");
+  }
 
+  if (smx_ctx_thread_sem)
+    xbt_os_sem_release(smx_ctx_thread_sem);
+  // Signal to the maestro that it has finished:
+  xbt_os_sem_release(context->end_);
+
+#ifndef WIN32
+  stack.ss_flags = SS_DISABLE;
+  sigaltstack(&stack, nullptr);
+#endif
   return nullptr;
 }
 
@@ -196,18 +209,7 @@ void ThreadContext::start()
 void ThreadContext::stop()
 {
   Context::stop();
-  if (smx_ctx_thread_sem)
-    xbt_os_sem_release(smx_ctx_thread_sem);
-
-  // Signal to the maestro that it has finished:
-  xbt_os_sem_release(this->end_);
-
-#ifndef WIN32
-  stack_t stack  = {0};
-  stack.ss_flags = SS_DISABLE;
-  sigaltstack(&stack, nullptr);
-#endif
-  xbt_os_thread_exit(nullptr);
+  throw StopRequest();
 }
 
 void ThreadContext::suspend()