X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6ea7c6220ef3aea972da1ce8fff827e0209f7052..0c43de62fbe4bfc243d6512296e09207e80bcd54:/src/simix/smx_context_base.c diff --git a/src/simix/smx_context_base.c b/src/simix/smx_context_base.c index 56efcf1403..7d386c9540 100644 --- a/src/simix/smx_context_base.c +++ b/src/simix/smx_context_base.c @@ -1,6 +1,6 @@ /* context_base - Code factorization across context switching implementations */ -/* Copyright (c) 2010. The SimGrid Team. +/* Copyright (c) 2010-2013. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -10,8 +10,9 @@ #include "xbt/function_types.h" #include "simgrid/simix.h" #include "smx_private.h" +#include "mc/mc.h" -XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(bindings); +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context); void smx_ctx_base_factory_init(smx_context_factory_t *factory) { @@ -46,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 */ @@ -65,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 */