X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4ba3f02277f53f9d332c7eccc5a902bb59bb4690..638d55dcb8d944f7c74127725f1acb7b8e1449de:/src/simix/smx_host.c

diff --git a/src/simix/smx_host.c b/src/simix/smx_host.c
index b260c3d791..20e7abbbc7 100644
--- a/src/simix/smx_host.c
+++ b/src/simix/smx_host.c
@@ -1,225 +1,646 @@
-/* 	$Id$	 */
-
-/* Copyright (c) 2007 Arnaud Legrand, Bruno Donassolo.
-   All rights reserved.                                          */
+/* Copyright (c) 2007-2014. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "private.h"
+#include "smx_private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
+#include "xbt/dict.h"
+#include "mc/mc.h"
+#include "mc/mc_replay.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix,
-				"Logging specific to SIMIX (hosts)");
+                                "SIMIX hosts");
+
+static void SIMIX_execution_finish(smx_synchro_t synchro);
 
-/********************************* Host **************************************/
-smx_host_t __SIMIX_host_create(const char *name,
-			 void *workstation,
-			 void *data)
+/**
+ * \brief Internal function to create a SIMIX host.
+ * \param name name of the host to create
+ * \param workstation the SURF workstation to encapsulate
+ * \param data some user data (may be NULL)
+ */
+smx_host_t SIMIX_host_create(const char *name,
+                               void *workstation, void *data)
 {
-  smx_simdata_host_t simdata = xbt_new0(s_smx_simdata_host_t,1);
-  smx_host_t host = xbt_new0(s_smx_host_t,1);
+  smx_host_priv_t smx_host = xbt_new0(s_smx_host_priv_t, 1);
   s_smx_process_t proc;
 
   /* Host structure */
-  host->name = xbt_strdup(name);
-  host->simdata = simdata;
-  host->data = data;
-
-  simdata->host = workstation;
+  smx_host->process_list =
+      xbt_swag_new(xbt_swag_offset(proc, host_proc_hookup));
 
-  simdata->process_list = xbt_swag_new(xbt_swag_offset(proc, host_proc_hookup));
   /* Update global variables */
+  xbt_lib_set(host_lib,name,SIMIX_HOST_LEVEL,smx_host);
 
-  xbt_fifo_unshift(simix_global->host, host);
-
-  return host;
+  return xbt_lib_get_elm_or_null(host_lib, name);
 }
 
-/** 
- * \brief Set the user data of a #smx_host_t.
- *
- * This functions checks whether some data has already been associated to \a host or not and attach \a data to \a host if it is possible.
- *	\param host SIMIX host
- *	\param data User data
+/**
+ * \brief Start the host if it is off
  *
  */
-void SIMIX_host_set_data(smx_host_t host, void *data)
+void SIMIX_host_on(smx_host_t h)
 {
-  xbt_assert0((host!=NULL), "Invalid parameters");
-  xbt_assert0((host->data == NULL), "Data already set");
-
-  /* Assign data */
-  host->data = data;
+  smx_host_priv_t host = SIMIX_host_priv(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);
+
+    unsigned int cpt;
+    smx_process_arg_t arg;
+    xbt_dynar_foreach(host->boot_processes,cpt,arg) {
+      smx_process_t process;
+
+      char** argv = xbt_new(char*, arg->argc);
+      for (int i=0; i<arg->argc; i++)
+        argv[i] = xbt_strdup(arg->argv[i]);
+
+      XBT_DEBUG("Booting Process %s(%s) right now", arg->argv[0], arg->hostname);
+      if (simix_global->create_process_function) {
+        simix_global->create_process_function(&process,
+                                              argv[0],
+                                              arg->code,
+                                              NULL,
+                                              arg->hostname,
+                                              arg->kill_time,
+                                              arg->argc,
+                                              argv,
+                                              arg->properties,
+                                              arg->auto_restart,
+                                              NULL);
+      } else {
+        simcall_process_create(&process,
+                               arg->argv[0],
+                               arg->code,
+                               NULL,
+                               arg->hostname,
+                               arg->kill_time,
+                               arg->argc,
+                               argv,
+                               arg->properties,
+                               arg->auto_restart);
+      }
+    }
+  }
+}
 
-  return ;
+void simcall_HANDLER_host_off(smx_simcall_t simcall, smx_host_t h)
+{
+ SIMIX_host_off(h, simcall->issuer);
 }
 
 /**
- * \brief Return the user data of a #smx_host_t.
+ * \brief Stop the host if it is on
  *
- * This functions checks whether \a host is a valid pointer or not and return the user data associated to \a host if it is possible.
- * \param host SIMIX host
  */
-void *SIMIX_host_get_data(smx_host_t host)
+void SIMIX_host_off(smx_host_t h, smx_process_t issuer)
 {
-  xbt_assert0((host != NULL), "Invalid parameters");
+  smx_host_priv_t host = SIMIX_host_priv(h);
+
+  xbt_assert((host != NULL), "Invalid parameters");
+
+  if (surf_resource_get_state(surf_workstation_resource_priv(h))==SURF_RESOURCE_ON) {
+	surf_resource_set_state(surf_workstation_resource_priv(h), SURF_RESOURCE_OFF);
 
-  /* Return data */
-  return (host->data);
+    /* Clean Simulator data */
+    if (xbt_swag_size(host->process_list) != 0) {
+      smx_process_t process = NULL;
+      xbt_swag_foreach(process, host->process_list) {
+        SIMIX_process_kill(process, issuer);
+        XBT_DEBUG("Killing %s on %s by %s", process->name,  sg_host_name(process->smx_host), issuer->name);
+      }
+    }
+  }
 }
 
-/** 
- * \brief Return the name of the #smx_host_t.
+/**
+ * \brief Internal function to destroy a SIMIX host.
  *
- * This functions checks whether \a host is a valid pointer or not and return its name.
- * \param host SIMIX host
+ * \param h the host to destroy (a smx_host_t)
  */
-const char *SIMIX_host_get_name(smx_host_t host)
+void SIMIX_host_destroy(void *h)
 {
+  smx_host_priv_t host = (smx_host_priv_t) h;
+
+  xbt_assert((host != NULL), "Invalid parameters");
+
+  /* Clean Simulator data */
+  if (xbt_swag_size(host->process_list) != 0) {
+    char *msg = xbt_strdup("Shutting down host, but it's not empty:");
+    char *tmp;
+    smx_process_t process = NULL;
+
+    xbt_swag_foreach(process, host->process_list) {
+      tmp = bprintf("%s\n\t%s", msg, process->name);
+      free(msg);
+      msg = tmp;
+    }
+    SIMIX_display_process_status();
+    THROWF(arg_error, 0, "%s", msg);
+  }
+  xbt_dynar_free(&host->auto_restart_processes);
+  xbt_dynar_free(&host->boot_processes);
+  xbt_swag_free(host->process_list);
 
-  xbt_assert0((host != NULL) && (host->simdata != NULL), "Invalid parameters");
+  /* Clean host structure */
+  free(host);
+  return;
+}
+
+smx_host_t SIMIX_host_get_by_name(const char *name){
+  xbt_assert(((simix_global != NULL)
+               && (host_lib != NULL)),
+              "Environment not set yet");
 
-  /* Return data */
-  return (host->name);
+  return xbt_lib_get_elm_or_null(host_lib, name);
 }
 
-/** 
- * \brief Return the location on which the current process is executed.
- *
- * Return the host,  more details in #SIMIX_process_get_host
- * \return SIMIX host
- */
 smx_host_t SIMIX_host_self(void)
 {
-  return SIMIX_process_get_host(SIMIX_process_self());
+  smx_process_t process = SIMIX_process_self();
+  return (process == NULL) ? NULL : SIMIX_process_get_host(process);
 }
 
-/*
- * Real function for destroy a host.
- * MSG_host_destroy is just  a front_end that also removes it from 
- * msg_global->host
- */
-void __SIMIX_host_destroy(smx_host_t host)
+/* needs to be public and without simcall because it is called
+   by exceptions and logging events */
+const char* SIMIX_host_self_get_name(void)
 {
-  smx_simdata_host_t simdata = NULL;
+  smx_host_t host = SIMIX_host_self();
+  if (host == NULL || SIMIX_process_self() == simix_global->maestro_process)
+    return "";
 
-  xbt_assert0((host != NULL), "Invalid parameters");
+  return SIMIX_host_get_name(host);
+}
 
- 
-  /* Clean Simulator data */
-  simdata = host->simdata;
+const char* SIMIX_host_get_name(smx_host_t host){
+  xbt_assert((host != NULL), "Invalid parameters");
 
-  if (xbt_swag_size(simdata->process_list) != 0) {
-     char *msg=bprintf("Shutting down host %s, but it's not empty:", host->name);
-     char *tmp;
-     smx_process_t process = NULL;
+  return sg_host_name(host);
+}
 
-     xbt_swag_foreach(process, simdata->process_list) {
-	tmp = bprintf("%s\n\t%s",msg,process->name);
-	free(msg);
-	msg=tmp;
-     }
-     THROW1(arg_error,0,"%s",msg);
-  }
-      
-  xbt_swag_free(simdata->process_list);
+xbt_dict_t SIMIX_host_get_properties(smx_host_t host){
+  xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
 
-  free(simdata);
+  return surf_resource_get_properties(surf_workstation_resource_priv(host));
+}
 
-  /* Clean host structure */
-  free(host->name);
-  free(host);
+double SIMIX_host_get_speed(smx_host_t host){
+  xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
+  return surf_workstation_get_speed(host, 1.0);
+}
 
-  return;
+int SIMIX_host_get_core(smx_host_t host){
+  xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
+
+  return surf_workstation_get_core(host);
+}
+
+xbt_swag_t SIMIX_host_get_process_list(smx_host_t host){
+  xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
+  smx_host_priv_t host_priv = SIMIX_host_priv(host);
+
+  return host_priv->process_list;
+}
+
+
+double SIMIX_host_get_available_speed(smx_host_t host){
+  xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
+
+  return surf_workstation_get_available_speed(host);
 }
 
+double SIMIX_host_get_current_power_peak(smx_host_t host) {
+	  xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
+	  return surf_workstation_get_current_power_peak(host);
+}
+
+double SIMIX_host_get_power_peak_at(smx_host_t host, int pstate_index) {
+	  xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
+
+	  return surf_workstation_get_power_peak_at(host, pstate_index);
+}
+
+int SIMIX_host_get_nb_pstates(smx_host_t host) {
+	  xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
+
+	  return surf_workstation_get_nb_pstates(host);
+}
+
+
+void SIMIX_host_set_power_peak_at(smx_host_t host, int pstate_index) {
+	  xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
+
+	  surf_workstation_set_power_peak_at(host, pstate_index);
+}
+
+double SIMIX_host_get_consumed_energy(smx_host_t host) {
+	  xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
+	  return surf_workstation_get_consumed_energy(host);
+}
+
+int SIMIX_host_get_state(smx_host_t host){
+  xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
+
+  return surf_resource_get_state(surf_workstation_resource_priv(host));
+}
+
+void _SIMIX_host_free_process_arg(void *data)
+{
+  smx_process_arg_t arg = *(void**)data;
+  int i;
+  for (i = 0; i < arg->argc; i++)
+    xbt_free(arg->argv[i]);
+  xbt_free(arg->argv);
+  xbt_free(arg->name);
+  xbt_free(arg);
+}
 /**
- * \brief Return the current number of #smx_host_t.
- *
- * \return Number of hosts
+ * \brief Add a process to the list of the processes that the host will restart when it comes back
+ * This function add a process to the list of the processes that will be restarted when the host comes
+ * back. It is expected that this function is called when the host is down.
+ * The processes will only be restarted once, meaning that you will have to register the process
+ * again to restart the process again.
  */
-int SIMIX_host_get_number(void)
+void SIMIX_host_add_auto_restart_process(smx_host_t host,
+                                         const char *name,
+                                         xbt_main_func_t code,
+                                         void *data,
+                                         const char *hostname,
+                                         double kill_time,
+                                         int argc, char **argv,
+                                         xbt_dict_t properties,
+                                         int auto_restart)
 {
-  return (xbt_fifo_size(simix_global->host));
-}
+  if (!SIMIX_host_priv(host)->auto_restart_processes) {
+    SIMIX_host_priv(host)->auto_restart_processes = xbt_dynar_new(sizeof(smx_process_arg_t),_SIMIX_host_free_process_arg);
+  }
+  smx_process_arg_t arg = xbt_new(s_smx_process_arg_t,1);
+  arg->name = xbt_strdup(name);
+  arg->code = code;
+  arg->data = data;
+  arg->hostname = hostname;
+  arg->kill_time = kill_time;
+  arg->argc = argc;
+
+  arg->argv = xbt_new(char*,argc + 1);
+
+  int i;
+  for (i = 0; i < argc; i++) {
+    arg->argv[i] = xbt_strdup(argv[i]);
+  }
+  arg->argv[argc] = NULL;
+
+  arg->properties = properties;
+  arg->auto_restart = auto_restart;
 
+  if( SIMIX_host_get_state(host) == SURF_RESOURCE_OFF
+      && !xbt_dict_get_or_null(watched_hosts_lib,sg_host_name(host))){
+    xbt_dict_set(watched_hosts_lib,sg_host_name(host),host,NULL);
+    XBT_DEBUG("Have pushed host %s to watched_hosts_lib because state == SURF_RESOURCE_OFF",sg_host_name(host));
+  }
+  xbt_dynar_push_as(SIMIX_host_priv(host)->auto_restart_processes,smx_process_arg_t,arg);
+}
 /**
- * \brief Return a array of all the #smx_host_t.
- *
- * \return List of all hosts
+ * \brief Restart the list of processes that have been registered to the host
  */
-smx_host_t *SIMIX_host_get_table(void)
+void SIMIX_host_restart_processes(smx_host_t host)
 {
-  return ((smx_host_t *)xbt_fifo_to_array(simix_global->host));
+  unsigned int cpt;
+  smx_process_arg_t arg;
+  xbt_dynar_t process_list = SIMIX_host_priv(host)->auto_restart_processes;
+  if (!process_list)
+    return;
+
+  xbt_dynar_foreach (process_list, cpt, arg) {
+
+    smx_process_t process;
+
+    XBT_DEBUG("Restarting Process %s(%s) right now", arg->argv[0], arg->hostname);
+    if (simix_global->create_process_function) {
+      simix_global->create_process_function(&process,
+                                            arg->argv[0],
+                                            arg->code,
+                                            NULL,
+                                            arg->hostname,
+                                            arg->kill_time,
+                                            arg->argc,
+                                            arg->argv,
+                                            arg->properties,
+                                            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 is used by the process created above.  Hide it to
+     * _SIMIX_host_free_process_arg() which is called by xbt_dynar_reset()
+     * below. */
+    arg->argc = 0;
+    arg->argv = NULL;
+  }
+  xbt_dynar_reset(process_list);
 }
 
+void SIMIX_host_autorestart(smx_host_t host)
+{
+  if(simix_global->autorestart)
+    simix_global->autorestart(host);
+  else
+    xbt_die("No function for simix_global->autorestart");
+}
 
-/**
- * \brief Return the speed of the processor.
- *
- * Return the speed (in Mflop/s), regardless of the current load on the machine.
- * \param host SIMIX host
- * \return Speed
- */
-double SIMIX_host_get_speed(smx_host_t host)
+smx_synchro_t SIMIX_host_execute(const char *name,
+    smx_host_t host, double flops_amount, double priority, double bound, unsigned long affinity_mask){
+
+  /* alloc structures and initialize */
+  smx_synchro_t synchro = xbt_mallocator_get(simix_global->synchro_mallocator);
+  synchro->type = SIMIX_SYNC_EXECUTE;
+  synchro->name = xbt_strdup(name);
+  synchro->state = SIMIX_RUNNING;
+  synchro->execution.host = host;
+  synchro->category = NULL;
+
+  /* set surf's action */
+  if (!MC_is_active() && !MC_record_replay_is_active()) {
+
+    synchro->execution.surf_exec = surf_workstation_execute(host, flops_amount);
+    surf_action_set_data(synchro->execution.surf_exec, synchro);
+    surf_action_set_priority(synchro->execution.surf_exec, priority);
+
+    /* Note (hypervisor): for multicore, the bound value being passed to the
+     * surf layer should not be zero (i.e., unlimited). It should be the
+     * capacity of a CPU core. */
+    if (bound == 0)
+      surf_cpu_action_set_bound(synchro->execution.surf_exec, SIMIX_host_get_speed(host));
+    else
+      surf_cpu_action_set_bound(synchro->execution.surf_exec, bound);
+
+    if (affinity_mask != 0) {
+      /* just a double check to confirm that this host is the host where this task is running. */
+      xbt_assert(synchro->execution.host == host);
+      surf_cpu_action_set_affinity(synchro->execution.surf_exec, host, affinity_mask);
+    }
+  }
+
+  XBT_DEBUG("Create execute synchro %p: %s", synchro, synchro->name);
+
+  return synchro;
+}
+
+smx_synchro_t SIMIX_host_parallel_execute(const char *name,
+    int host_nb, smx_host_t *host_list,
+    double *flops_amount, double *bytes_amount,
+    double amount, double rate){
+
+  void **workstation_list = NULL;
+  int i;
+
+  /* alloc structures and initialize */
+  smx_synchro_t synchro = xbt_mallocator_get(simix_global->synchro_mallocator);
+  synchro->type = SIMIX_SYNC_PARALLEL_EXECUTE;
+  synchro->name = xbt_strdup(name);
+  synchro->state = SIMIX_RUNNING;
+  synchro->execution.host = NULL; /* FIXME: do we need the list of hosts? */
+  synchro->category = NULL;
+
+  /* set surf's synchro */
+  workstation_list = xbt_new0(void *, host_nb);
+  for (i = 0; i < host_nb; i++)
+    workstation_list[i] = surf_workstation_resource_priv(host_list[i]);
+
+
+  /* FIXME: what happens if host_list contains VMs and PMs. If
+   * execute_parallel_task() does not change the state of the model, we can mix
+   * them. */
+  surf_model_t ws_model = surf_resource_model(host_list[0], SURF_WKS_LEVEL);
+  for (i = 1; i < host_nb; i++) {
+    surf_model_t ws_model_tmp = surf_resource_model(host_list[i], SURF_WKS_LEVEL);
+    if (ws_model_tmp != ws_model) {
+      XBT_CRITICAL("mixing VMs and PMs is not supported");
+      DIE_IMPOSSIBLE;
+    }
+  }
+
+  /* set surf's synchro */
+  if (!MC_is_active() && !MC_record_replay_is_active()) {
+    synchro->execution.surf_exec =
+      surf_workstation_model_execute_parallel_task((surf_workstation_model_t)surf_workstation_model,
+    		  host_nb, workstation_list, flops_amount, bytes_amount, rate);
+
+    surf_action_set_data(synchro->execution.surf_exec, synchro);
+  }
+  XBT_DEBUG("Create parallel execute synchro %p", synchro);
+
+  return synchro;
+}
+
+void SIMIX_host_execution_destroy(smx_synchro_t synchro){
+  XBT_DEBUG("Destroy synchro %p", synchro);
+
+  if (synchro->execution.surf_exec) {
+    surf_action_unref(synchro->execution.surf_exec);
+    synchro->execution.surf_exec = NULL;
+  }
+  xbt_free(synchro->name);
+  xbt_mallocator_release(simix_global->synchro_mallocator, synchro);
+}
+
+void SIMIX_host_execution_cancel(smx_synchro_t synchro){
+  XBT_DEBUG("Cancel synchro %p", synchro);
+
+  if (synchro->execution.surf_exec)
+    surf_action_cancel(synchro->execution.surf_exec);
+}
+
+double SIMIX_host_execution_get_remains(smx_synchro_t synchro){
+  double result = 0.0;
+
+  if (synchro->state == SIMIX_RUNNING)
+    result = surf_action_get_remains(synchro->execution.surf_exec);
+
+  return result;
+}
+
+e_smx_state_t SIMIX_host_execution_get_state(smx_synchro_t synchro){
+  return synchro->state;
+}
+
+void SIMIX_host_execution_set_priority(smx_synchro_t synchro, double priority){
+
+  if(synchro->execution.surf_exec)
+	surf_action_set_priority(synchro->execution.surf_exec, priority);
+}
+
+void SIMIX_host_execution_set_bound(smx_synchro_t synchro, double bound){
+
+  if(synchro->execution.surf_exec)
+	surf_cpu_action_set_bound(synchro->execution.surf_exec, bound);
+}
+
+void SIMIX_host_execution_set_affinity(smx_synchro_t synchro, smx_host_t host, unsigned long mask){
+  xbt_assert(synchro->type == SIMIX_SYNC_EXECUTE);
+
+  if (synchro->execution.surf_exec) {
+    /* just a double check to confirm that this host is the host where this task is running. */
+    xbt_assert(synchro->execution.host == host);
+    surf_cpu_action_set_affinity(synchro->execution.surf_exec, host, mask);
+  }
+}
+
+void simcall_HANDLER_host_execution_wait(smx_simcall_t simcall, smx_synchro_t synchro){
+
+  XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro, (int)synchro->state);
+
+  /* Associate this simcall to the synchro */
+  xbt_fifo_push(synchro->simcalls, simcall);
+  simcall->issuer->waiting_synchro = synchro;
+
+  /* set surf's synchro */
+  if (MC_is_active() || MC_record_replay_is_active()) {
+    synchro->state = SIMIX_DONE;
+    SIMIX_execution_finish(synchro);
+    return;
+  }
+
+  /* If the synchro is already finished then perform the error handling */
+  if (synchro->state != SIMIX_RUNNING)
+    SIMIX_execution_finish(synchro);
+}
+
+void SIMIX_host_execution_suspend(smx_synchro_t synchro)
 {
-  xbt_assert0((host!= NULL), "Invalid parameters");
+  if(synchro->execution.surf_exec)
+    surf_action_suspend(synchro->execution.surf_exec);
+}
 
-  return(surf_workstation_resource->
-	 extension_public->get_speed(host->simdata->host,1.0));
+void SIMIX_host_execution_resume(smx_synchro_t synchro)
+{
+  if(synchro->execution.surf_exec)
+    surf_action_resume(synchro->execution.surf_exec);
 }
 
-/**
- * \brief Return the available speed of the processor.
- *
- * Return the available speed (in Mflop/s).
- * \return Speed
- */
-double SIMIX_host_get_available_speed(smx_host_t host)
+void SIMIX_execution_finish(smx_synchro_t synchro)
 {
-  xbt_assert0((host!= NULL), "Invalid parameters");
+  xbt_fifo_item_t item;
+  smx_simcall_t simcall;
+
+  xbt_fifo_foreach(synchro->simcalls, item, simcall, smx_simcall_t) {
+
+    switch (synchro->state) {
+
+      case SIMIX_DONE:
+        /* do nothing, synchro done */
+        XBT_DEBUG("SIMIX_execution_finished: execution successful");
+        break;
+
+      case SIMIX_FAILED:
+        XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", sg_host_name(simcall->issuer->smx_host));
+        simcall->issuer->context->iwannadie = 1;
+        SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed");
+        break;
+
+      case SIMIX_CANCELED:
+        XBT_DEBUG("SIMIX_execution_finished: execution canceled");
+        SMX_EXCEPTION(simcall->issuer, cancel_error, 0, "Canceled");
+        break;
+
+      default:
+        xbt_die("Internal error in SIMIX_execution_finish: unexpected synchro state %d",
+            (int)synchro->state);
+    }
+    /* check if the host is down */
+    if (surf_resource_get_state(surf_workstation_resource_priv(simcall->issuer->smx_host)) != SURF_RESOURCE_ON) {
+      simcall->issuer->context->iwannadie = 1;
+    }
+
+    simcall->issuer->waiting_synchro =    NULL;
+    simcall_host_execution_wait__set__result(simcall, synchro->state);
+    SIMIX_simcall_answer(simcall);
+  }
 
-  return(surf_workstation_resource->
-	 extension_public->get_available_speed(host->simdata->host));
+  /* We no longer need it */
+  SIMIX_host_execution_destroy(synchro);
 }
 
-/**
- * \brief Return the host by its name
- *
- * Finds a smx_host_t using its name.
- * \param name The name of an host.
- * \return The corresponding host
- */
-smx_host_t SIMIX_host_get_by_name(const char *name)
+
+void SIMIX_post_host_execute(smx_synchro_t synchro)
 {
-  xbt_fifo_item_t i = NULL;
-  smx_host_t host = NULL;
+  if (synchro->type == SIMIX_SYNC_EXECUTE && /* FIMXE: handle resource failure
+                                               * for parallel tasks too */
+      surf_resource_get_state(surf_workstation_resource_priv(synchro->execution.host)) == SURF_RESOURCE_OFF) {
+    /* If the host running the synchro failed, notice it so that the asking
+     * process can be killed if it runs on that host itself */
+    synchro->state = SIMIX_FAILED;
+  } else if (surf_action_get_state(synchro->execution.surf_exec) == SURF_ACTION_FAILED) {
+    /* If the host running the synchro didn't fail, then the synchro was
+     * canceled */
+    synchro->state = SIMIX_CANCELED;
+  } else {
+    synchro->state = SIMIX_DONE;
+  }
 
-  xbt_assert0(((simix_global != NULL)
-	  && (simix_global->host != NULL)), "Environment not set yet");
+  if (synchro->execution.surf_exec) {
+    surf_action_unref(synchro->execution.surf_exec);
+    synchro->execution.surf_exec = NULL;
+  }
 
-  xbt_fifo_foreach(simix_global->host,i,host,smx_host_t) {
-    if(strcmp(host->name, name) == 0) return host;
+  /* If there are simcalls associated with the synchro, then answer them */
+  if (xbt_fifo_size(synchro->simcalls)) {
+    SIMIX_execution_finish(synchro);
+  }
+}
+
+
+void SIMIX_set_category(smx_synchro_t synchro, const char *category)
+{
+  if (synchro->state != SIMIX_RUNNING) return;
+  if (synchro->type == SIMIX_SYNC_EXECUTE){
+    surf_action_set_category(synchro->execution.surf_exec, category);
+  }else if (synchro->type == SIMIX_SYNC_COMMUNICATE){
+    surf_action_set_category(synchro->comm.surf_comm, category);
   }
-  return NULL;
 }
 
 /**
- * \brief Return the state of a workstation
+ * \brief Function to get the parameters of the given the SIMIX host.
  *
- * Return the state of a workstation. Two states are possible, 1 if the host is active or 0 if it has crashed.
- * \param host The SIMIX host
- * \return 1 if host is available or 0 if not.
+ * \param host the host to get_phys_host (a smx_host_t)
+ * \param param the parameter object space to be overwritten (a ws_params_t)
  */
-int SIMIX_host_get_state(smx_host_t host)
+void SIMIX_host_get_params(smx_host_t ind_vm, ws_params_t params)
+{
+  /* jump to ws_get_params(). */
+  surf_workstation_get_params(ind_vm, params);
+}
+
+void SIMIX_host_set_params(smx_host_t ind_vm, ws_params_t params)
 {
-  xbt_assert0((host!= NULL), "Invalid parameters");
+  /* jump to ws_set_params(). */
+  surf_workstation_set_params(ind_vm, params);
+}
 
-  return(surf_workstation_resource->
-	 extension_public->get_state(host->simdata->host));
+xbt_dict_t SIMIX_host_get_mounted_storage_list(smx_host_t host){
+  xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
 
+  return surf_workstation_get_mounted_storage_list(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);
+}