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 'hypervisor' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into hypervisor
[simgrid.git]
/
src
/
simix
/
smx_process.c
diff --git
a/src/simix/smx_process.c
b/src/simix/smx_process.c
index
2e2e5de
..
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);
}
}
}
}
@@
-685,9
+690,10
@@
smx_action_t SIMIX_process_sleep(smx_process_t process, double duration)
{
smx_action_t action;
smx_host_t host = process->smx_host;
{
smx_action_t action;
smx_host_t host = process->smx_host;
+ surf_model_t ws_model = surf_resource_model(host, SURF_WKS_LEVEL);
/* check if the host is active */
/* check if the host is active */
- if (
surf_workstation
_model->extension.
+ if (
ws
_model->extension.
workstation.get_state(host) != SURF_RESOURCE_ON) {
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
sg_host_name(host));
workstation.get_state(host) != SURF_RESOURCE_ON) {
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
sg_host_name(host));
@@
-702,9
+708,9
@@
smx_action_t SIMIX_process_sleep(smx_process_t process, double duration)
action->sleep.host = host;
action->sleep.surf_sleep =
action->sleep.host = host;
action->sleep.surf_sleep =
-
surf_workstation
_model->extension.workstation.sleep(host, duration);
+
ws
_model->extension.workstation.sleep(host, duration);
-
surf_workstation
_model->action_data_set(action->sleep.surf_sleep, action);
+
ws
_model->action_data_set(action->sleep.surf_sleep, action);
XBT_DEBUG("Create sleep action %p", action);
return action;
XBT_DEBUG("Create sleep action %p", action);
return action;
@@
-715,9
+721,13
@@
void SIMIX_post_process_sleep(smx_action_t action)
smx_simcall_t simcall;
e_smx_state_t state;
smx_simcall_t simcall;
e_smx_state_t state;
+ 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);
+
while ((simcall = xbt_fifo_shift(action->simcalls))) {
while ((simcall = xbt_fifo_shift(action->simcalls))) {
- switch(
surf_workstation
_model->action_state_get(action->sleep.surf_sleep)){
+ switch(
ws
_model->action_state_get(action->sleep.surf_sleep)){
case SURF_ACTION_FAILED:
simcall->issuer->context->iwannadie = 1;
//SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed");
case SURF_ACTION_FAILED:
simcall->issuer->context->iwannadie = 1;
//SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed");
@@
-732,7
+742,7
@@
void SIMIX_post_process_sleep(smx_action_t action)
THROW_IMPOSSIBLE;
break;
}
THROW_IMPOSSIBLE;
break;
}
- if (
surf_workstation
_model->extension.
+ if (
ws
_model->extension.
workstation.get_state(simcall->issuer->smx_host) != SURF_RESOURCE_ON) {
simcall->issuer->context->iwannadie = 1;
}
workstation.get_state(simcall->issuer->smx_host) != SURF_RESOURCE_ON) {
simcall->issuer->context->iwannadie = 1;
}
@@
-747,6
+757,8
@@
void SIMIX_post_process_sleep(smx_action_t action)
void SIMIX_process_sleep_destroy(smx_action_t action)
{
XBT_DEBUG("Destroy action %p", action);
void SIMIX_process_sleep_destroy(smx_action_t action)
{
XBT_DEBUG("Destroy action %p", action);
+ xbt_assert(action->type == SIMIX_ACTION_SLEEP);
+
if (action->sleep.surf_sleep)
action->sleep.surf_sleep->model_obj->action_unref(action->sleep.surf_sleep);
xbt_mallocator_release(simix_global->action_mallocator, action);
if (action->sleep.surf_sleep)
action->sleep.surf_sleep->model_obj->action_unref(action->sleep.surf_sleep);
xbt_mallocator_release(simix_global->action_mallocator, action);
@@
-754,12
+766,21
@@
void SIMIX_process_sleep_destroy(smx_action_t action)
void SIMIX_process_sleep_suspend(smx_action_t action)
{
void SIMIX_process_sleep_suspend(smx_action_t action)
{
- surf_workstation_model->suspend(action->sleep.surf_sleep);
+ 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);
+
+ ws_model->suspend(action->sleep.surf_sleep);
}
void SIMIX_process_sleep_resume(smx_action_t action)
{
}
void SIMIX_process_sleep_resume(smx_action_t action)
{
- surf_workstation_model->resume(action->sleep.surf_sleep);
+ 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);
+ XBT_DEBUG("%p ws_model", ws_model);
+
+ ws_model->resume(action->sleep.surf_sleep);
}
/**
}
/**