Simix: fix an infinite recursion when calling xbt_thread_cancel()

[simgrid.git] / src / simix / smx_context_base.c

diff --git a/src/simix/smx_context_base.c b/src/simix/smx_context_base.c
index 27443d5..cdaa87a 100644 (file)
--- a/src/simix/smx_context_base.c
+++ b/src/simix/smx_context_base.c
@@ -8,8 +8,8 @@
 
 
 #include "xbt/function_types.h"
+#include "simix/simix.h"
 #include "simix/context.h"
-#include "simix/process_private.h"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(bindings);
 
@@ -47,8 +47,8 @@ smx_ctx_base_factory_create_context_sized(size_t size,
 {
   smx_context_t context = xbt_malloc0(size);
 
-  /* If the user provided a function for the process then use it
-     otherwise is the context for maestro and we should set it as the
+  /* If the user provided a function for the process then use it.
+     Otherwise, it is the context for maestro and we should set it as the
      current context */
   if (code) {
     context->cleanup_func = cleanup_func;
@@ -87,7 +87,8 @@ void smx_ctx_base_stop(smx_context_t context)
 {
   if (context->cleanup_func)
     (*(context->cleanup_func)) (context->data);
-  SIMIX_process_cleanup(context->data);
+  context->iwannadie = 0;
+  SIMIX_req_process_cleanup(context->data);
 }
 
 smx_context_t smx_ctx_base_self(void)