X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9161dd12dbb9c069f5e100d30f56bf7b6f1362f5..3cdd0ac83adfa4f28b05b4c1961555e5203bc6a8:/src/simix/smx_context_base.c

diff --git a/src/simix/smx_context_base.c b/src/simix/smx_context_base.c
index bf79ab236b..1f3161b08f 100644
--- a/src/simix/smx_context_base.c
+++ b/src/simix/smx_context_base.c
@@ -1,4 +1,4 @@
-/* context_base - Code factorization accross context switching implementations */
+/* context_base - Code factorization across context switching implementations */
 
 /* Copyright (c) 2010. The SimGrid Team.
  * All rights reserved.                                                     */
@@ -8,11 +8,13 @@
 
 
 #include "xbt/function_types.h"
-#include "smx_context_private.h"
+#include "simgrid/simix.h"
+#include "smx_private.h"
+#include "mc/mc.h"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(bindings);
 
-void smx_ctx_base_factory_init(smx_context_factory_t * factory)
+void smx_ctx_base_factory_init(smx_context_factory_t *factory)
 {
   /* instantiate the context factory */
   *factory = xbt_new0(s_smx_context_factory_t, 1);
@@ -45,16 +47,20 @@ 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
+  /* Store the address of the stack in heap to compare it apart of heap comparison */
+  if(MC_is_active())
+    MC_ignore(context, size);
+
+  /* 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;
     context->argc = argc;
     context->argv = argv;
     context->code = code;
-  }else{
-    smx_current_context = context;
+  } else {
+    SIMIX_context_set_current(context);
   }
   context->data = data;
 
@@ -64,14 +70,12 @@ smx_ctx_base_factory_create_context_sized(size_t size,
 void smx_ctx_base_free(smx_context_t context)
 {
   int i;
-
   if (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);
     }
@@ -84,15 +88,18 @@ 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;
+  simcall_process_cleanup(context->data);
+  context->iwannadie = 1;
 }
 
 smx_context_t smx_ctx_base_self(void)
 {
-  return smx_current_context;
+  return SIMIX_context_get_current();
 }
 
 void *smx_ctx_base_get_data(smx_context_t context)
 {
   return context->data;
-}
\ No newline at end of file
+}