X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2be0e4648c5b7055580df1c265b7c43ee6763a46..6139ac45b7aebbc5c54f8a644843f78e88d5e2be:/src/simix/smx_context_base.c diff --git a/src/simix/smx_context_base.c b/src/simix/smx_context_base.c index 95b1c8b32f..97cbb0ca6f 100644 --- a/src/simix/smx_context_base.c +++ b/src/simix/smx_context_base.c @@ -8,9 +8,9 @@ #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" +#include "mc/mc.h" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(bindings); @@ -47,6 +47,10 @@ smx_ctx_base_factory_create_context_sized(size_t size, { smx_context_t context = xbt_malloc0(size); + /* Store the address of the stack in heap to compare it apart of heap comparison */ + if(MC_is_active()) + MC_ignore_heap(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 */ @@ -66,7 +70,6 @@ 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 */ @@ -87,7 +90,7 @@ void smx_ctx_base_stop(smx_context_t context) if (context->cleanup_func) context->cleanup_func(context->data); context->iwannadie = 0; - SIMIX_req_process_cleanup(context->data); + simcall_process_cleanup(context->data); context->iwannadie = 1; }