Move MSG_parallel_task_create() in msg_task.c.

[simgrid.git] / src / simix / smx_host.c

diff --git a/src/simix/smx_host.c b/src/simix/smx_host.c
index 8a708bf..6e6a93f 100644 (file)
--- a/src/simix/smx_host.c
+++ b/src/simix/smx_host.c
@@ -90,7 +90,7 @@ xbt_dict_t SIMIX_host_get_dict(void)
   void **host = NULL;
 
   xbt_lib_foreach(host_lib, cursor, name, host){
-         if(host[SIMIX_HOST_LEVEL])
+    if(host[SIMIX_HOST_LEVEL])
             xbt_dict_set(host_dict,name,host[SIMIX_HOST_LEVEL], NULL);
   }
   return host_dict;
@@ -204,7 +204,7 @@ smx_action_t SIMIX_host_execute(const char *name, smx_host_t host,
   if (!MC_IS_ENABLED) {
     action->execution.surf_exec =
       surf_workstation_model->extension.workstation.execute(host->host,
-         computation_amount);
+    computation_amount);
     surf_workstation_model->action_data_set(action->execution.surf_exec, action);
     surf_workstation_model->set_priority(action->execution.surf_exec, priority);
   }
@@ -243,7 +243,7 @@ smx_action_t SIMIX_host_parallel_execute( const char *name,
     action->execution.surf_exec =
       surf_workstation_model->extension.workstation.
       execute_parallel_task(host_nb, workstation_list, computation_amount,
-                           communication_amount, rate);
+                      communication_amount, rate);
 
     surf_workstation_model->action_data_set(action->execution.surf_exec, action);
   }
@@ -343,18 +343,13 @@ void SIMIX_execution_finish(smx_action_t action)
 
       case SIMIX_DONE:
         /* do nothing, action done */
-       XBT_DEBUG("SIMIX_execution_finished: execution successful");
+  XBT_DEBUG("SIMIX_execution_finished: execution successful");
         break;
 
       case SIMIX_FAILED:
         XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", simcall->issuer->smx_host->name);
-        if (simcall->issuer->smx_host == action->execution.host) {
-          // add a reference to the action that will be destroyed when the killed process is cleaned up, and by the end of the current function
-          surf_action_ref(action->execution.surf_exec);
-          SIMIX_process_kill(simcall->issuer);
-        } else {
-          SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed");
-        }
+        simcall->issuer->context->iwannadie = 1;
+        //SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed");
         break;
 
       case SIMIX_CANCELED:
@@ -366,7 +361,13 @@ void SIMIX_execution_finish(smx_action_t action)
         xbt_die("Internal error in SIMIX_execution_finish: unexpected action state %d",
             (int)action->state);
     }
-    simcall->issuer->waiting_action = NULL;
+    /* check if the host is down */
+    if (surf_workstation_model->extension.
+        workstation.get_state(simcall->issuer->smx_host->host) != SURF_RESOURCE_ON) {
+      simcall->issuer->context->iwannadie = 1;
+    }
+
+    simcall->issuer->waiting_action =    NULL;
     simcall->host_execution_wait.result = action->state;
     SIMIX_simcall_answer(simcall);
   }