X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/46c7981905414e7342d681be4f10709f8ef4009e..446516ef6cc8459883ad5b3a53cd724e24185c21:/src/simix/smx_context_base.c

diff --git a/src/simix/smx_context_base.c b/src/simix/smx_context_base.c
index 810ef6cb59..c1622752c4 100644
--- a/src/simix/smx_context_base.c
+++ b/src/simix/smx_context_base.c
@@ -8,9 +8,8 @@
 
 
 #include "xbt/function_types.h"
-#include "simix/simix.h"
-#include "simix/context.h"
-#include "simix/private.h"
+#include "simgrid/simix.h"
+#include "smx_private.h"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(bindings);
 
@@ -72,8 +71,7 @@ void smx_ctx_base_free(smx_context_t context)
     /* free argv */
     if (context->argv) {
       for (i = 0; i < context->argc; i++)
-        if (context->argv[i])
-          free(context->argv[i]);
+        free(context->argv[i]);
 
       free(context->argv);
     }
@@ -85,10 +83,12 @@ void smx_ctx_base_free(smx_context_t context)
 
 void smx_ctx_base_stop(smx_context_t context)
 {
+  SIMIX_process_on_exit(context->data);
   if (context->cleanup_func)
-    (*(context->cleanup_func)) (context->data);
+    context->cleanup_func(context->data);
   context->iwannadie = 0;
-  SIMIX_req_process_cleanup(context->data);
+  simcall_process_cleanup(context->data);
+  context->iwannadie = 1;
 }
 
 smx_context_t smx_ctx_base_self(void)