A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor corrections.
[simgrid.git]
/
src
/
simix
/
smx_context_base.c
diff --git
a/src/simix/smx_context_base.c
b/src/simix/smx_context_base.c
index
1a5d140
..
73bf557
100644
(file)
--- a/
src/simix/smx_context_base.c
+++ b/
src/simix/smx_context_base.c
@@
-8,11
+8,11
@@
#include "xbt/function_types.h"
#include "xbt/function_types.h"
-#include "sim
ix
/simix.h"
-#include "s
imix/context
.h"
-#include "
simix/private
.h"
+#include "sim
grid
/simix.h"
+#include "s
mx_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)
{
void smx_ctx_base_factory_init(smx_context_factory_t *factory)
{
@@
-47,6
+47,10
@@
smx_ctx_base_factory_create_context_sized(size_t size,
{
smx_context_t context = xbt_malloc0(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 */
/* 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;
void smx_ctx_base_free(smx_context_t context)
{
int i;
-
if (context) {
/* free argv */
if (context) {
/* free argv */
@@
-85,9
+88,10
@@
void smx_ctx_base_free(smx_context_t context)
void smx_ctx_base_stop(smx_context_t context)
{
if (context->cleanup_func)
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;
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)
}
smx_context_t smx_ctx_base_self(void)