#include "simgrid/sg_config.h"
#include "internal_config.h"
+#ifdef HAVE_VALGRIND_VALGRIND_H
+# include <valgrind/valgrind.h>
+#endif
+
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_context, simix,
"Context switching mechanism");
smx_ctx_factory_initializer_t smx_factory_initializer_to_use = NULL;
int smx_context_stack_size;
int smx_context_stack_size_was_set = 0;
+int smx_context_guard_size;
+int smx_context_guard_size_was_set = 0;
#ifdef HAVE_THREAD_LOCAL_STORAGE
static __thread smx_context_t smx_current_context_parallel;
#else
void *SIMIX_context_stack_new(void)
{
- return xbt_malloc0(smx_context_stack_size);
+ void *stack = xbt_malloc0(smx_context_stack_size);
+
+#ifdef HAVE_VALGRIND_VALGRIND_H
+ unsigned int valgrind_stack_id =
+ VALGRIND_STACK_REGISTER(stack, (char *)stack + smx_context_stack_size);
+ memcpy((char *)stack + smx_context_usable_stack_size, &valgrind_stack_id,
+ sizeof valgrind_stack_id);
+#endif
+
+ return stack;
}
void SIMIX_context_stack_delete(void *stack)
{
+ if (!stack)
+ return;
+
+#ifdef HAVE_VALGRIND_VALGRIND_H
+ unsigned int valgrind_stack_id;
+ memcpy(&valgrind_stack_id, (char *)stack + smx_context_usable_stack_size,
+ sizeof valgrind_stack_id);
+ VALGRIND_STACK_DEREGISTER(valgrind_stack_id);
+#endif
+
xbt_free(stack);
}