From: cristianrosa Date: Mon, 20 Dec 2010 09:45:32 +0000 (+0000) Subject: Protect some host execute functions in the case that simix actions don't have a surf... X-Git-Tag: v3.6_beta2~628 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/8d0922724a3108d9535ea82a1cceab9782eb60f4?ds=sidebyside Protect some host execute functions in the case that simix actions don't have a surf action associated to it. This is the case when running the MC git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9297 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/src/simix/smx_host.c b/src/simix/smx_host.c index aadb21b306..afc406c6d2 100644 --- 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) { - 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) @@ -319,12 +320,14 @@ void SIMIX_pre_host_execution_wait(smx_req_t req) 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) { - 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)