X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9b757886241c3fc8c055842b3cf7fef7494031d7..9e6224ecd95ff7b6452fe9b2c088138877797542:/src/simix/smx_host.c

diff --git a/src/simix/smx_host.c b/src/simix/smx_host.c
index b1fc9ae2ed..1882fcba97 100644
--- a/src/simix/smx_host.c
+++ b/src/simix/smx_host.c
@@ -1,240 +1,625 @@
-/* 	$Id$	 */
-
-/* Copyright (c) 2007 Arnaud Legrand, Bruno Donassolo.
-   All rights reserved.                                          */
+/* Copyright (c) 2007-2012. 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"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix,
                                 "Logging specific to SIMIX (hosts)");
 
-/********************************* Host **************************************/
-smx_host_t __SIMIX_host_create(const char *name,
+static void SIMIX_execution_finish(smx_action_t action);
+
+/**
+ * \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_host_t smx_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 */
-  smx_host->name = xbt_strdup(name);
   smx_host->data = data;
-  smx_host->host = workstation;
-  smx_host->process_list = xbt_swag_new(xbt_swag_offset(proc, host_proc_hookup));
+  smx_host->process_list =
+      xbt_swag_new(xbt_swag_offset(proc, host_proc_hookup));
 
   /* Update global variables */
-  xbt_dict_set(simix_global->host, smx_host->name, smx_host, &__SIMIX_host_destroy);
-
-  return smx_host;
+  xbt_lib_set(host_lib,name,SIMIX_HOST_LEVEL,smx_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 Internal function to destroy a SIMIX host.
  *
+ * \param h the host to destroy (a smx_host_t)
  */
-XBT_INLINE void SIMIX_host_set_data(smx_host_t host, void *data)
+void SIMIX_host_destroy(void *h)
 {
-  xbt_assert0((host != NULL), "Invalid parameters");
-  xbt_assert0((host->data == NULL), "Data already set");
+  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;
 
-  /* Assign data */
-  host->data = data;
+    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_swag_free(host->process_list);
 
+  /* Clean host structure */
+  free(host); 
   return;
 }
 
-/**
- * \brief Return the user data of a #smx_host_t.
- *
- * 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
- */
-XBT_INLINE void *SIMIX_host_get_data(smx_host_t host)
-{
-  xbt_assert0((host != NULL), "Invalid parameters");
+///**
+// * \brief Returns a dict of all hosts.
+// *
+// * \return List of all hosts (as a #xbt_dict_t)
+// */
+//xbt_dict_t SIMIX_host_get_dict(void)
+//{
+//  xbt_dict_t host_dict = xbt_dict_new_homogeneous(NULL);
+//  xbt_lib_cursor_t cursor = NULL;
+//  char *name = NULL;
+//  void **host = NULL;
+//
+//  xbt_lib_foreach(host_lib, cursor, name, host){
+//    if(host[SIMIX_HOST_LEVEL])
+//            xbt_dict_set(host_dict,name,host[SIMIX_HOST_LEVEL], NULL);
+//  }
+//  return host_dict;
+//}
+smx_host_t SIMIX_pre_host_get_by_name(smx_simcall_t simcall, const char *name){
+   return SIMIX_host_get_by_name(name);
+}
+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->data;
+  return xbt_lib_get_elm_or_null(host_lib, name);
 }
 
-/**
- * \brief Return the name of the #smx_host_t.
- *
- * This functions checks whether \a host is a valid pointer or not and return its name.
- * \param host SIMIX host
- */
-XBT_INLINE const char *SIMIX_host_get_name(smx_host_t host)
+smx_host_t SIMIX_host_self(void)
 {
+  smx_process_t process = SIMIX_process_self();
+  return (process == NULL) ? NULL : SIMIX_process_get_host(process);
+}
 
-  xbt_assert0((host != NULL), "Invalid parameters");
+const char* SIMIX_pre_host_self_get_name(smx_simcall_t simcall){
+   return SIMIX_host_self_get_name();
+}
+/* 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_host_t host = SIMIX_host_self();
+  if (host == NULL || SIMIX_process_self() == simix_global->maestro_process)
+    return "";
 
-  /* Return data */
-  return host->name;
+  return SIMIX_host_get_name(host);
 }
 
-/**
- * \brief Return the location on which the current process is executed.
- *
- * Return the host,  more details in #SIMIX_process_get_host
- * \return SIMIX host
- */
-XBT_INLINE smx_host_t SIMIX_host_self(void)
-{
-  return SIMIX_process_get_host(SIMIX_process_self());
+const char* SIMIX_pre_host_get_name(smx_simcall_t simcall, smx_host_t host){
+   return SIMIX_host_get_name(host);
 }
+const char* SIMIX_host_get_name(smx_host_t host){
+  xbt_assert((host != NULL), "Invalid parameters");
 
-/*
- * 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(void *h)
-{
-  smx_host_t host = (smx_host_t) h;
+  return sg_host_name(host);
+}
 
-  xbt_assert0((host != NULL), "Invalid parameters");
+xbt_dict_t SIMIX_pre_host_get_properties(smx_simcall_t simcall, smx_host_t host){
+  return SIMIX_host_get_properties(host);
+}
+xbt_dict_t SIMIX_host_get_properties(smx_host_t host){
+  xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
 
-  /* Clean Simulator data */
-  if (xbt_swag_size(host->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 surf_workstation_model->extension.workstation.get_properties(host);
+}
 
-    xbt_swag_foreach(process, host->process_list) {
-      tmp = bprintf("%s\n\t%s", msg, process->name);
-      free(msg);
-      msg = tmp;
-    }
-    THROW1(arg_error, 0, "%s", msg);
-  }
+double SIMIX_pre_host_get_speed(smx_simcall_t simcall, smx_host_t host){
+  return SIMIX_host_get_speed(host);
+}
+double SIMIX_host_get_speed(smx_host_t host){
+  xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
 
-  xbt_swag_free(host->process_list);
+  return surf_workstation_model->extension.workstation.
+      get_speed(host, 1.0);
+}
 
-  /* Clean host structure */
-  free(host->name);
-  free(host);
+int SIMIX_pre_host_get_core(smx_simcall_t simcall, smx_host_t host){
+  return SIMIX_host_get_core(host);
+}
+int SIMIX_host_get_core(smx_host_t host){
+  xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
 
-  return;
+  return surf_workstation_model->extension.workstation.
+      get_core(host);
 }
 
-/**
- * \brief Return the current number of #smx_host_t.
- *
- * \return Number of hosts
- */
-XBT_INLINE int SIMIX_host_get_number(void)
+xbt_swag_t SIMIX_pre_host_get_process_list(smx_simcall_t simcall, smx_host_t host){
+  return SIMIX_host_get_process_list(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_pre_host_get_available_speed(smx_simcall_t simcall, smx_host_t host){
+  return SIMIX_host_get_available_speed(host);
+}
+double SIMIX_host_get_available_speed(smx_host_t host){
+  xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
+
+  return surf_workstation_model->extension.workstation.
+      get_available_speed(host);
+}
+
+double SIMIX_pre_host_get_current_power_peak(smx_simcall_t simcall, smx_host_t host){
+  return SIMIX_host_get_current_power_peak(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_model->extension.workstation.
+		      get_current_power_peak(host);
+}
+
+double SIMIX_pre_host_get_power_peak_at(smx_simcall_t simcall, smx_host_t host, int pstate_index){
+  return SIMIX_host_get_power_peak_at(host, pstate_index);
+}
+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_model->extension.workstation.
+	      get_power_peak_at(host, pstate_index);
+}
+
+int SIMIX_pre_host_get_nb_pstates(smx_simcall_t simcall, smx_host_t host){
+  return SIMIX_host_get_nb_pstates(host);
+}
+int SIMIX_host_get_nb_pstates(smx_host_t host) {
+	  xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
+
+	  return surf_workstation_model->extension.workstation.
+	      get_nb_pstates(host);
+}
+
+
+void SIMIX_pre_host_set_power_peak_at(smx_simcall_t simcall, smx_host_t host, int pstate_index){
+  SIMIX_host_set_power_peak_at(host, pstate_index);
+}
+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_model->extension.workstation.
+	      set_power_peak_at(host, pstate_index);
+}
+
+double SIMIX_pre_host_get_consumed_energy(smx_simcall_t simcall, smx_host_t host){
+  return SIMIX_host_get_consumed_energy(host);
+}
+double SIMIX_host_get_consumed_energy(smx_host_t host) {
+	  xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
+	  return surf_workstation_model->extension.workstation.
+		      get_consumed_energy(host);
+}
+
+int SIMIX_pre_host_get_state(smx_simcall_t simcall, smx_host_t host){
+  return SIMIX_host_get_state(host);
+}
+int SIMIX_host_get_state(smx_host_t host){
+  xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
+
+  return surf_workstation_model->extension.workstation.
+      get_state(host);
+}
+
+void* SIMIX_pre_host_self_get_data(smx_simcall_t simcall){
+  return SIMIX_host_self_get_data();
+}
+void* SIMIX_host_self_get_data(void)
 {
-  return (xbt_dict_size(simix_global->host));
+  smx_host_t self = SIMIX_host_self();
+  return SIMIX_host_get_data(self);
 }
 
+void SIMIX_host_self_set_data(void *data)
+{
+  smx_host_t self = SIMIX_host_self();
+  SIMIX_host_set_data(self, data);
+}
+
+void* SIMIX_pre_host_get_data(smx_simcall_t simcall,smx_host_t host){
+  return SIMIX_host_get_data(host);
+}
+void* SIMIX_host_get_data(smx_host_t host){
+  xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
 
+  return SIMIX_host_priv(host)->data;
+}
+void _SIMIX_host_free_process_arg(void *);
+void _SIMIX_host_free_process_arg(void *data)
+{
+  smx_process_arg_t arg = *(void**)data;
+  xbt_free(arg->name);
+  xbt_free(arg);
+}
 /**
- * \brief Return an array of all the #smx_host_t.
- *
- * \return List of all hosts (in a newly allocated table)
+ * \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.
  */
-smx_host_t *SIMIX_host_get_table(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)
 {
-  smx_host_t *res = xbt_new(smx_host_t, xbt_dict_size(simix_global->host));
-  smx_host_t h;
-  xbt_dict_cursor_t c;
-  char *name;
-  int i = 0;
+  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;
 
-  xbt_dict_foreach(simix_global->host, c, name, h)
-    res[i++] = h;
+  arg->properties = properties;
+  arg->auto_restart = auto_restart;
 
-  return res;
+  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 push 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 dict of all the #smx_host_t.
- *
- * \return List of all hosts (as a #xbt_dict_t)
+ * \brief Restart the list of processes that have been registered to the host
  */
-XBT_INLINE xbt_dict_t SIMIX_host_get_dict(void)
+void SIMIX_host_restart_processes(smx_host_t host)
 {
-  return simix_global->host;
+  unsigned int cpt;
+  smx_process_arg_t arg;
+  xbt_dynar_foreach(SIMIX_host_priv(host)->auto_restart_processes,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);
+    }
+    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);
+
+    }
+  }
+  xbt_dynar_reset(SIMIX_host_priv(host)->auto_restart_processes);
 }
 
-/**
- * \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
- */
-XBT_INLINE double SIMIX_host_get_speed(smx_host_t host)
+void SIMIX_host_autorestart(smx_host_t host)
 {
-  xbt_assert0((host != NULL), "Invalid parameters");
+  if(simix_global->autorestart)
+    simix_global->autorestart(host);
+  else
+    xbt_die("No function for simix_global->autorestart");
+}
 
-  return (surf_workstation_model->extension.workstation.
-          get_speed(host->host, 1.0));
+void SIMIX_pre_host_set_data(smx_simcall_t simcall, smx_host_t host, void *data) {
+  SIMIX_host_set_data(host, data);
 }
+void SIMIX_host_set_data(smx_host_t host, void *data){
+  xbt_assert((host != NULL), "Invalid parameters");
+  xbt_assert((SIMIX_host_priv(host)->data == NULL), "Data already set");
 
-/**
- * \brief Return the available speed of the processor.
- *
- * Return the available speed (in Mflop/s).
- * \return Speed
- */
-XBT_INLINE double SIMIX_host_get_available_speed(smx_host_t host)
+  SIMIX_host_priv(host)->data = data;
+}
+
+smx_action_t SIMIX_pre_host_execute(smx_simcall_t simcall,const char *name,
+    smx_host_t host, double computation_amount, double priority){
+  return SIMIX_host_execute(name, host, computation_amount, priority);
+}
+smx_action_t SIMIX_host_execute(const char *name,
+    smx_host_t host, double computation_amount, double priority){
+
+  /* alloc structures and initialize */
+  smx_action_t action = xbt_mallocator_get(simix_global->action_mallocator);
+  action->type = SIMIX_ACTION_EXECUTE;
+  action->name = xbt_strdup(name);
+  action->state = SIMIX_RUNNING;
+  action->execution.host = host;
+
+#ifdef HAVE_TRACING
+  action->category = NULL;
+#endif
+
+  /* set surf's action */
+  if (!MC_is_active()) {
+    action->execution.surf_exec =
+      surf_workstation_model->extension.workstation.execute(host,
+    computation_amount);
+    surf_workstation_model->action_data_set(action->execution.surf_exec, action);
+    surf_workstation_model->set_priority(action->execution.surf_exec, priority);
+  }
+
+  XBT_DEBUG("Create execute action %p", action);
+
+  return action;
+}
+
+smx_action_t SIMIX_pre_host_parallel_execute(smx_simcall_t simcall, const char *name,
+    int host_nb, smx_host_t *host_list,
+    double *computation_amount, double *communication_amount,
+    double amount, double rate){
+  return SIMIX_host_parallel_execute(name, host_nb, host_list, computation_amount,
+		                     communication_amount, amount, rate);
+}
+smx_action_t SIMIX_host_parallel_execute(const char *name,
+    int host_nb, smx_host_t *host_list,
+    double *computation_amount, double *communication_amount,
+    double amount, double rate){
+
+  void **workstation_list = NULL;
+  int i;
+
+  /* alloc structures and initialize */
+  smx_action_t action = xbt_mallocator_get(simix_global->action_mallocator);
+  action->type = SIMIX_ACTION_PARALLEL_EXECUTE;
+  action->name = xbt_strdup(name);
+  action->state = SIMIX_RUNNING;
+  action->execution.host = NULL; /* FIXME: do we need the list of hosts? */
+
+#ifdef HAVE_TRACING
+  action->category = NULL;
+#endif
+
+  /* set surf's action */
+  workstation_list = xbt_new0(void *, host_nb);
+  for (i = 0; i < host_nb; i++)
+    workstation_list[i] = host_list[i];
+
+  /* set surf's action */
+  if (!MC_is_active()) {
+    action->execution.surf_exec =
+      surf_workstation_model->extension.workstation.
+      execute_parallel_task(host_nb, workstation_list, computation_amount,
+                      communication_amount, rate);
+
+    surf_workstation_model->action_data_set(action->execution.surf_exec, action);
+  }
+  XBT_DEBUG("Create parallel execute action %p", action);
+
+  return action;
+}
+
+void SIMIX_pre_host_execution_destroy(smx_simcall_t simcall, smx_action_t action){
+  SIMIX_host_execution_destroy(action);
+}
+void SIMIX_host_execution_destroy(smx_action_t action){
+  XBT_DEBUG("Destroy action %p", action);
+
+  if (action->execution.surf_exec) {
+    surf_workstation_model->action_unref(action->execution.surf_exec);
+    action->execution.surf_exec = NULL;
+  }
+  xbt_free(action->name);
+  xbt_mallocator_release(simix_global->action_mallocator, action);
+}
+
+void SIMIX_pre_host_execution_cancel(smx_simcall_t simcall, smx_action_t action){
+  SIMIX_host_execution_cancel(action);
+}
+void SIMIX_host_execution_cancel(smx_action_t action){
+  XBT_DEBUG("Cancel action %p", action);
+
+  if (action->execution.surf_exec)
+    surf_workstation_model->action_cancel(action->execution.surf_exec);
+}
+
+double SIMIX_pre_host_execution_get_remains(smx_simcall_t simcall, smx_action_t action){
+  return SIMIX_host_execution_get_remains(action);
+}
+double SIMIX_host_execution_get_remains(smx_action_t action){
+  double result = 0.0;
+
+  if (action->state == SIMIX_RUNNING)
+    result = surf_workstation_model->get_remains(action->execution.surf_exec);
+
+  return result;
+}
+
+e_smx_state_t SIMIX_pre_host_execution_get_state(smx_simcall_t simcall, smx_action_t action){
+  return SIMIX_host_execution_get_state(action);
+}
+e_smx_state_t SIMIX_host_execution_get_state(smx_action_t action){
+  return action->state;
+}
+
+void SIMIX_pre_host_execution_set_priority(smx_simcall_t simcall, smx_action_t action,
+		                        double priority){
+  return SIMIX_host_execution_set_priority(action, priority);
+}
+void SIMIX_host_execution_set_priority(smx_action_t action, double priority){
+  if(action->execution.surf_exec)
+    surf_workstation_model->set_priority(action->execution.surf_exec, priority);
+}
+
+void SIMIX_pre_host_execution_wait(smx_simcall_t simcall, smx_action_t action){
+
+  XBT_DEBUG("Wait for execution of action %p, state %d", action, (int)action->state);
+
+  /* Associate this simcall to the action */
+  xbt_fifo_push(action->simcalls, simcall);
+  simcall->issuer->waiting_action = action;
+
+  /* set surf's action */
+  if (MC_is_active()) {
+    action->state = SIMIX_DONE;
+    SIMIX_execution_finish(action);
+    return;
+  }
+
+  /* If the action is already finished then perform the error handling */
+  if (action->state != SIMIX_RUNNING)
+    SIMIX_execution_finish(action);
+}
+
+void SIMIX_host_execution_suspend(smx_action_t action)
 {
-  xbt_assert0((host != NULL), "Invalid parameters");
+  if(action->execution.surf_exec)
+    surf_workstation_model->suspend(action->execution.surf_exec);
+}
 
-  return (surf_workstation_model->extension.workstation.
-          get_available_speed(host->host));
+void SIMIX_host_execution_resume(smx_action_t action)
+{
+  if(action->execution.surf_exec)
+    surf_workstation_model->resume(action->execution.surf_exec);
 }
 
-/**
- * \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
- */
-XBT_INLINE smx_host_t SIMIX_host_get_by_name(const char *name)
+void SIMIX_execution_finish(smx_action_t action)
 {
-  xbt_assert0(((simix_global != NULL)
-               && (simix_global->host != NULL)), "Environment not set yet");
+  xbt_fifo_item_t item;
+  smx_simcall_t simcall;
+
+  xbt_fifo_foreach(action->simcalls, item, simcall, smx_simcall_t) {
 
-  return xbt_dict_get_or_null(simix_global->host, name);
+    switch (action->state) {
+
+      case SIMIX_DONE:
+        /* do nothing, action 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 action state %d",
+            (int)action->state);
+    }
+    /* check if the host is down */
+    if (surf_workstation_model->extension.
+        workstation.get_state(simcall->issuer->smx_host) != SURF_RESOURCE_ON) {
+      simcall->issuer->context->iwannadie = 1;
+    }
+
+    simcall->issuer->waiting_action =    NULL;
+    simcall_host_execution_wait__set__result(simcall, action->state);
+    SIMIX_simcall_answer(simcall);
+  }
+
+  /* We no longer need it */
+  SIMIX_host_execution_destroy(action);
 }
 
-/**
- * \brief Returns a xbt_dynar_t consisting of the list of properties assigned to this host
- *
- * \param host a host
- * \return the dynamic array consisting of property names
- */
-XBT_INLINE xbt_dict_t SIMIX_host_get_properties(smx_host_t host)
+void SIMIX_post_host_execute(smx_action_t action)
 {
-  xbt_assert0((host != NULL), "Invalid parameters");
+  if (action->type == SIMIX_ACTION_EXECUTE && /* FIMXE: handle resource failure
+                                               * for parallel tasks too */
+      surf_workstation_model->extension.workstation.get_state(action->execution.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;
+  } else {
+    action->state = SIMIX_DONE;
+  }
+
+  if (action->execution.surf_exec) {
+    surf_workstation_model->action_unref(action->execution.surf_exec);
+    action->execution.surf_exec = NULL;
+  }
 
-  return surf_workstation_model->extension.workstation.get_properties(host->host);
+  /* If there are simcalls associated with the action, then answer them */
+  if (xbt_fifo_size(action->simcalls)) {
+    SIMIX_execution_finish(action);
+  }
 }
 
 
-/**
- * \brief Return the state of a workstation
- *
- * 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.
- */
-XBT_INLINE int SIMIX_host_get_state(smx_host_t host)
+#ifdef HAVE_TRACING
+void SIMIX_pre_set_category(smx_simcall_t simcall, smx_action_t action,
+		            const char *category){
+  SIMIX_set_category(action, category);
+}
+void SIMIX_set_category(smx_action_t action, const char *category)
 {
-  xbt_assert0((host != NULL), "Invalid parameters");
-
-  return (surf_workstation_model->extension.workstation.
-          get_state(host->host));
+  if (action->state != SIMIX_RUNNING) return;
+  if (action->type == SIMIX_ACTION_EXECUTE){
+    surf_workstation_model->set_category(action->execution.surf_exec, category);
+  }else if (action->type == SIMIX_ACTION_COMMUNICATE){
+    surf_workstation_model->set_category(action->comm.surf_comm, category);
+  }
 }
+#endif
+