X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/917aef7fa18957ea33a3cd78ab61b5837b5e1663..f2df13795e01302813a6aef10825ec7e922ce530:/src/simix/smx_host.c

diff --git a/src/simix/smx_host.c b/src/simix/smx_host.c
index 4ceb16851d..83c4cf78f8 100644
--- a/src/simix/smx_host.c
+++ b/src/simix/smx_host.c
@@ -53,7 +53,7 @@ void SIMIX_host_on(smx_host_t h)
   xbt_assert((host != NULL), "Invalid parameters");
 
   if (surf_resource_get_state(surf_workstation_resource_priv(h))==SURF_RESOURCE_OFF) {
-	surf_resource_set_state(surf_workstation_resource_priv(h), SURF_RESOURCE_ON);
+    surf_resource_set_state(surf_workstation_resource_priv(h), SURF_RESOURCE_ON);
     unsigned int cpt;
     smx_process_arg_t arg;
     xbt_dynar_foreach(host->boot_processes,cpt,arg) {
@@ -70,19 +70,19 @@ void SIMIX_host_on(smx_host_t h)
                                               arg->argc,
                                               arg->argv,
                                               arg->properties,
-                                              arg->auto_restart);
-      }
-      else {
+                                              arg->auto_restart,
+                                              NULL);
+      } else {
         simcall_process_create(&process,
-                                              arg->argv[0],
-                                              arg->code,
-                                              NULL,
-                                              arg->hostname,
-                                              arg->kill_time,
-                                              arg->argc,
-                                              arg->argv,
-                                              arg->properties,
-                                              arg->auto_restart);
+                               arg->argv[0],
+                               arg->code,
+                               NULL,
+                               arg->hostname,
+                               arg->kill_time,
+                               arg->argc,
+                               arg->argv,
+                               arg->properties,
+                               arg->auto_restart);
       }
     }
   }
@@ -391,7 +391,8 @@ void SIMIX_host_restart_processes(smx_host_t host)
                                             arg->argc,
                                             arg->argv,
                                             arg->properties,
-                                            arg->auto_restart);
+                                            arg->auto_restart,
+                                            NULL);
     } else {
       simcall_process_create(&process,
                              arg->argv[0],
@@ -462,7 +463,7 @@ smx_action_t SIMIX_host_execute(const char *name,
     }
   }
 
-  XBT_DEBUG("Create execute action %p", action);
+  XBT_DEBUG("Create execute action %p: %s", action, action->name);
 
   return action;
 }
@@ -759,11 +760,11 @@ xbt_dict_t SIMIX_host_get_mounted_storage_list(smx_host_t host){
   return surf_workstation_get_mounted_storage_list(host);
 }
 
-xbt_dict_t SIMIX_pre_host_get_attached_storage_list(smx_simcall_t simcall, smx_host_t host){
+xbt_dynar_t SIMIX_pre_host_get_attached_storage_list(smx_simcall_t simcall, smx_host_t host){
   return SIMIX_host_get_attached_storage_list(host);
 }
 
-xbt_dict_t SIMIX_host_get_attached_storage_list(smx_host_t host){
+xbt_dynar_t SIMIX_host_get_attached_storage_list(smx_host_t host){
   xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
 
   return surf_workstation_get_attached_storage_list(host);