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
Merge branch 'master' into hypervisor
[simgrid.git]
/
src
/
simix
/
smx_process.c
diff --git
a/src/simix/smx_process.c
b/src/simix/smx_process.c
index
5b02190
..
aa7434a
100644
(file)
--- a/
src/simix/smx_process.c
+++ b/
src/simix/smx_process.c
@@
-275,6
+275,10
@@
void SIMIX_process_create(smx_process_t *process,
(*process)->running_ctx = xbt_new(xbt_running_ctx_t, 1);
XBT_RUNNING_CTX_INITIALIZE((*process)->running_ctx);
(*process)->running_ctx = xbt_new(xbt_running_ctx_t, 1);
XBT_RUNNING_CTX_INITIALIZE((*process)->running_ctx);
+ if(MC_is_active()){
+ MC_ignore_heap((*process)->running_ctx, sizeof(*(*process)->running_ctx));
+ }
+
/* Add properties */
(*process)->properties = properties;
/* Add properties */
(*process)->properties = properties;
@@
-483,7
+487,8
@@
smx_action_t SIMIX_process_suspend(smx_process_t process, smx_process_t issuer)
return NULL;
}
} else {
return NULL;
}
} else {
- return SIMIX_host_execute("suspend", process->smx_host, 0.0, 1.0);
+ /* FIXME: computation size is zero. Is it okay that bound is zero ? */
+ return SIMIX_host_execute("suspend", process->smx_host, 0.0, 1.0, 0.0);
}
}
}
}
@@
-753,8
+758,6
@@
void SIMIX_process_sleep_destroy(smx_action_t action)
{
XBT_DEBUG("Destroy action %p", action);
xbt_assert(action->type == SIMIX_ACTION_SLEEP);
{
XBT_DEBUG("Destroy action %p", action);
xbt_assert(action->type == SIMIX_ACTION_SLEEP);
- smx_host_t host = action->sleep.host;
- surf_model_t ws_model = surf_resource_model(host, SURF_WKS_LEVEL);
if (action->sleep.surf_sleep)
action->sleep.surf_sleep->model_obj->action_unref(action->sleep.surf_sleep);
if (action->sleep.surf_sleep)
action->sleep.surf_sleep->model_obj->action_unref(action->sleep.surf_sleep);