X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6443d4868c5974225d792156daf319775234b087..ae8140f19db6cb86f753e32499eab49190846d1f:/src/simix/smx_context_base.c

diff --git a/src/simix/smx_context_base.c b/src/simix/smx_context_base.c
index 85b24fe2c7..dc1fe2d194 100644
--- a/src/simix/smx_context_base.c
+++ b/src/simix/smx_context_base.c
@@ -10,7 +10,7 @@
 #include "xbt/function_types.h"
 #include "simix/simix.h"
 #include "simix/context.h"
-#include "simix/private.h"
+#include "smx_private.h"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(bindings);
 
@@ -27,7 +27,6 @@ void smx_ctx_base_factory_init(smx_context_factory_t *factory)
   (*factory)->runall = NULL;
   (*factory)->self = smx_ctx_base_self;
   (*factory)->get_data = smx_ctx_base_get_data;
-  (*factory)->get_thread_id = smx_ctx_base_get_thread_id;
 
   (*factory)->name = "base context factory";
 }
@@ -73,8 +72,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);
     }
@@ -87,9 +85,10 @@ void smx_ctx_base_free(smx_context_t context)
 void smx_ctx_base_stop(smx_context_t context)
 {
   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)
@@ -101,8 +100,3 @@ void *smx_ctx_base_get_data(smx_context_t context)
 {
   return context->data;
 }
-
-int smx_ctx_base_get_thread_id()
-{
-  return 0;
-}