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
Bugfix: return after answering the request when running in MC mode.
[simgrid.git]
/
src
/
simix
/
smx_host.c
diff --git
a/src/simix/smx_host.c
b/src/simix/smx_host.c
index
aadb21b
..
205c46b
100644
(file)
--- a/
src/simix/smx_host.c
+++ b/
src/simix/smx_host.c
@@
-293,7
+293,8
@@
e_smx_state_t SIMIX_host_execution_get_state(smx_action_t action)
void SIMIX_host_execution_set_priority(smx_action_t action, double priority)
{
void SIMIX_host_execution_set_priority(smx_action_t action, double priority)
{
- surf_workstation_model->set_priority(action->execution.surf_exec, priority);
+ if(action->execution.surf_exec)
+ surf_workstation_model->set_priority(action->execution.surf_exec, priority);
}
void SIMIX_pre_host_execution_wait(smx_req_t req)
}
void SIMIX_pre_host_execution_wait(smx_req_t req)
@@
-310,6
+311,7
@@
void SIMIX_pre_host_execution_wait(smx_req_t req)
if (MC_IS_ENABLED){
action->state = SIMIX_DONE;
SIMIX_execution_finish(action);
if (MC_IS_ENABLED){
action->state = SIMIX_DONE;
SIMIX_execution_finish(action);
+ return;
}
/* If the action is already finished then perform the error handling */
}
/* If the action is already finished then perform the error handling */
@@
-319,12
+321,14
@@
void SIMIX_pre_host_execution_wait(smx_req_t req)
void SIMIX_host_execution_suspend(smx_action_t action)
{
void SIMIX_host_execution_suspend(smx_action_t action)
{
- surf_workstation_model->suspend(action->execution.surf_exec);
+ if(action->execution.surf_exec)
+ surf_workstation_model->suspend(action->execution.surf_exec);
}
void SIMIX_host_execution_resume(smx_action_t action)
{
}
void SIMIX_host_execution_resume(smx_action_t action)
{
- surf_workstation_model->suspend(action->execution.surf_exec);
+ if(action->execution.surf_exec)
+ surf_workstation_model->suspend(action->execution.surf_exec);
}
void SIMIX_execution_finish(smx_action_t action)
}
void SIMIX_execution_finish(smx_action_t action)