From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Thu, 28 Jun 2012 09:28:19 +0000 (+0200)
Subject: Test for failed host is wrong for parallel tasks.
X-Git-Tag: v3_8~428
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/9d7e857328377861f81e95fbc3138032b51b7da9?ds=inline

Test for failed host is wrong for parallel tasks.
---

diff --git a/src/simix/smx_host.c b/src/simix/smx_host.c
index c54c9fbb1e..f663ea260a 100644
--- a/src/simix/smx_host.c
+++ b/src/simix/smx_host.c
@@ -422,14 +422,18 @@ void SIMIX_execution_finish(smx_action_t action)
 
 void SIMIX_post_host_execute(smx_action_t action)
 {
-  if (surf_workstation_model->extension.workstation.get_state(action->execution.host->host)==SURF_RESOURCE_OFF) {
-    /* if the host running the action failed, notice it so that the asking process can be killed if it runs on that host itself */
+  if (action->type == SIMIX_ACTION_EXECUTE && /* FIMXE: handle resource failure
+                                               * for parallel tasks too */
+      surf_workstation_model->extension.workstation.get_state(action->execution.host->host) == SURF_RESOURCE_OFF) {
+    /* If the host running the action failed, notice it so that the asking
+     * process can be killed if it runs on that host itself */
     action->state = SIMIX_FAILED;
   } else if (surf_workstation_model->action_state_get(action->execution.surf_exec) == SURF_ACTION_FAILED) {
-    /* If the host running the action didn't fail, then the action was canceled */
-     action->state = SIMIX_CANCELED;
+    /* If the host running the action didn't fail, then the action was
+     * canceled */
+    action->state = SIMIX_CANCELED;
   } else {
-     action->state = SIMIX_DONE;
+    action->state = SIMIX_DONE;
   }
 
   if (action->execution.surf_exec) {