X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2c69087d11c54eee924f6870373883d6aa9ff228..8d545185124c10e9c58d954d12103d6620e201d2:/src/simix/smx_host.c

diff --git a/src/simix/smx_host.c b/src/simix/smx_host.c
index 42704314fb..8c7fc7f15a 100644
--- a/src/simix/smx_host.c
+++ b/src/simix/smx_host.c
@@ -9,6 +9,7 @@
 #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,
                                 "SIMIX hosts");
@@ -18,12 +19,11 @@ static void SIMIX_execution_finish(smx_synchro_t synchro);
 /**
  * \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)
+sg_host_t SIMIX_host_create(const char *name, void *killme) // FIXME: braindead prototype. Take sg_host as first arg
 {
+  sg_host_t host = xbt_lib_get_elm_or_null(host_lib, name);
   smx_host_priv_t smx_host = xbt_new0(s_smx_host_priv_t, 1);
   s_smx_process_t proc;
 
@@ -32,23 +32,23 @@ smx_host_t SIMIX_host_create(const char *name,
       xbt_swag_new(xbt_swag_offset(proc, host_proc_hookup));
 
   /* Update global variables */
-  xbt_lib_set(host_lib,name,SIMIX_HOST_LEVEL,smx_host);
+  sg_host_simix_set(host, smx_host);
 
-  return xbt_lib_get_elm_or_null(host_lib, name);
+  return host;
 }
 
 /**
  * \brief Start the host if it is off
  *
  */
-void SIMIX_host_on(smx_host_t h)
+void SIMIX_host_on(sg_host_t h)
 {
-  smx_host_priv_t host = SIMIX_host_priv(h);
+  smx_host_priv_t host = sg_host_simix(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);
+  if (surf_host_get_state(surf_host_resource_priv(h))==SURF_RESOURCE_OFF) {
+    surf_host_set_state(surf_host_resource_priv(h), SURF_RESOURCE_ON);
 
     unsigned int cpt;
     smx_process_arg_t arg;
@@ -88,7 +88,7 @@ void SIMIX_host_on(smx_host_t h)
   }
 }
 
-void simcall_HANDLER_host_off(smx_simcall_t simcall, smx_host_t h)
+void simcall_HANDLER_host_off(smx_simcall_t simcall, sg_host_t h)
 {
  SIMIX_host_off(h, simcall->issuer);
 }
@@ -97,21 +97,21 @@ void simcall_HANDLER_host_off(smx_simcall_t simcall, smx_host_t h)
  * \brief Stop the host if it is on
  *
  */
-void SIMIX_host_off(smx_host_t h, smx_process_t issuer)
+void SIMIX_host_off(sg_host_t h, smx_process_t issuer)
 {
-  smx_host_priv_t host = SIMIX_host_priv(h);
+  smx_host_priv_t host = sg_host_simix(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);
+  if (surf_host_get_state(surf_host_resource_priv(h))==SURF_RESOURCE_ON) {
+	surf_host_set_state(surf_host_resource_priv(h), SURF_RESOURCE_OFF);
 
     /* 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);
+        XBT_DEBUG("Killing %s on %s by %s", process->name,  sg_host_name(process->host), issuer->name);
       }
     }
   }
@@ -120,7 +120,7 @@ void SIMIX_host_off(smx_host_t h, smx_process_t issuer)
 /**
  * \brief Internal function to destroy a SIMIX host.
  *
- * \param h the host to destroy (a smx_host_t)
+ * \param h the host to destroy (a sg_host_t)
  */
 void SIMIX_host_destroy(void *h)
 {
@@ -151,7 +151,7 @@ void SIMIX_host_destroy(void *h)
   return;
 }
 
-smx_host_t SIMIX_host_get_by_name(const char *name){
+sg_host_t SIMIX_host_get_by_name(const char *name){
   xbt_assert(((simix_global != NULL)
                && (host_lib != NULL)),
               "Environment not set yet");
@@ -159,7 +159,7 @@ smx_host_t SIMIX_host_get_by_name(const char *name){
   return xbt_lib_get_elm_or_null(host_lib, name);
 }
 
-smx_host_t SIMIX_host_self(void)
+sg_host_t SIMIX_host_self(void)
 {
   smx_process_t process = SIMIX_process_self();
   return (process == NULL) ? NULL : SIMIX_process_get_host(process);
@@ -169,83 +169,68 @@ smx_host_t SIMIX_host_self(void)
    by exceptions and logging events */
 const char* SIMIX_host_self_get_name(void)
 {
-  smx_host_t host = SIMIX_host_self();
+  sg_host_t host = SIMIX_host_self();
   if (host == NULL || SIMIX_process_self() == simix_global->maestro_process)
     return "";
 
   return SIMIX_host_get_name(host);
 }
 
-const char* SIMIX_host_get_name(smx_host_t host){
-  xbt_assert((host != NULL), "Invalid parameters");
-
-  return sg_host_name(host);
-}
-
-xbt_dict_t SIMIX_host_get_properties(smx_host_t host){
-  xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
-
-  return surf_resource_get_properties(surf_workstation_resource_priv(host));
+xbt_dict_t SIMIX_host_get_properties(sg_host_t host){
+  return surf_host_get_properties(surf_host_resource_priv(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);
+double SIMIX_host_get_speed(sg_host_t host){
+  return surf_host_get_speed(host, 1.0);
 }
 
-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);
+int SIMIX_host_get_core(sg_host_t host){
+  return surf_host_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);
+xbt_swag_t SIMIX_host_get_process_list(sg_host_t host){
+  smx_host_priv_t host_priv = sg_host_simix(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_available_speed(sg_host_t host){
+  return surf_host_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_current_power_peak(sg_host_t host) {
+	  return surf_host_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);
+double SIMIX_host_get_power_peak_at(sg_host_t host, int pstate_index) {
+	  return surf_host_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);
+int SIMIX_host_get_nb_pstates(sg_host_t host) {
+	  return surf_host_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);
+void SIMIX_host_set_pstate(sg_host_t host, int pstate_index) {
+	  surf_host_set_pstate(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_pstate(sg_host_t host) {
+	  return surf_host_get_pstate(host);
 }
 
-int SIMIX_host_get_state(smx_host_t host){
-  xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
+double SIMIX_host_get_consumed_energy(sg_host_t host) {
+	  return surf_host_get_consumed_energy(host);
+}
+double SIMIX_host_get_wattmin_at(sg_host_t host,int pstate) {
+	  return surf_host_get_wattmin_at(host,pstate);
+}
+double SIMIX_host_get_wattmax_at(sg_host_t host,int pstate) {
+	  return surf_host_get_wattmax_at(host,pstate);
+}
 
-  return surf_resource_get_state(surf_workstation_resource_priv(host));
+int SIMIX_host_get_state(sg_host_t host){
+  return surf_host_get_state(surf_host_resource_priv(host));
 }
 
 void _SIMIX_host_free_process_arg(void *data)
@@ -265,7 +250,7 @@ void _SIMIX_host_free_process_arg(void *data)
  * The processes will only be restarted once, meaning that you will have to register the process
  * again to restart the process again.
  */
-void SIMIX_host_add_auto_restart_process(smx_host_t host,
+void SIMIX_host_add_auto_restart_process(sg_host_t host,
                                          const char *name,
                                          xbt_main_func_t code,
                                          void *data,
@@ -275,8 +260,8 @@ void SIMIX_host_add_auto_restart_process(smx_host_t host,
                                          xbt_dict_t properties,
                                          int auto_restart)
 {
-  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);
+  if (!sg_host_simix(host)->auto_restart_processes) {
+    sg_host_simix(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);
@@ -302,16 +287,16 @@ void SIMIX_host_add_auto_restart_process(smx_host_t 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);
+  xbt_dynar_push_as(sg_host_simix(host)->auto_restart_processes,smx_process_arg_t,arg);
 }
 /**
  * \brief Restart the list of processes that have been registered to the host
  */
-void SIMIX_host_restart_processes(smx_host_t host)
+void SIMIX_host_restart_processes(sg_host_t host)
 {
   unsigned int cpt;
   smx_process_arg_t arg;
-  xbt_dynar_t process_list = SIMIX_host_priv(host)->auto_restart_processes;
+  xbt_dynar_t process_list = sg_host_simix(host)->auto_restart_processes;
   if (!process_list)
     return;
 
@@ -354,7 +339,7 @@ void SIMIX_host_restart_processes(smx_host_t host)
   xbt_dynar_reset(process_list);
 }
 
-void SIMIX_host_autorestart(smx_host_t host)
+void SIMIX_host_autorestart(sg_host_t host)
 {
   if(simix_global->autorestart)
     simix_global->autorestart(host);
@@ -363,7 +348,7 @@ void SIMIX_host_autorestart(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){
+    sg_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);
@@ -371,15 +356,12 @@ smx_synchro_t SIMIX_host_execute(const char *name,
   synchro->name = xbt_strdup(name);
   synchro->state = SIMIX_RUNNING;
   synchro->execution.host = host;
-
-#ifdef HAVE_TRACING
   synchro->category = NULL;
-#endif
 
   /* set surf's action */
   if (!MC_is_active() && !MC_record_replay_is_active()) {
 
-    synchro->execution.surf_exec = surf_workstation_execute(host, flops_amount);
+    synchro->execution.surf_exec = surf_host_execute(host, flops_amount);
     surf_action_set_data(synchro->execution.surf_exec, synchro);
     surf_action_set_priority(synchro->execution.surf_exec, priority);
 
@@ -404,11 +386,11 @@ smx_synchro_t SIMIX_host_execute(const char *name,
 }
 
 smx_synchro_t SIMIX_host_parallel_execute(const char *name,
-    int host_nb, smx_host_t *host_list,
+    int host_nb, sg_host_t *host_list,
     double *flops_amount, double *bytes_amount,
     double amount, double rate){
 
-  void **workstation_list = NULL;
+  void **surf_host_list = NULL;
   int i;
 
   /* alloc structures and initialize */
@@ -417,23 +399,20 @@ smx_synchro_t SIMIX_host_parallel_execute(const char *name,
   synchro->name = xbt_strdup(name);
   synchro->state = SIMIX_RUNNING;
   synchro->execution.host = NULL; /* FIXME: do we need the list of hosts? */
-
-#ifdef HAVE_TRACING
   synchro->category = NULL;
-#endif
 
   /* set surf's synchro */
-  workstation_list = xbt_new0(void *, host_nb);
+  surf_host_list = xbt_new0(void *, host_nb);
   for (i = 0; i < host_nb; i++)
-    workstation_list[i] = surf_workstation_resource_priv(host_list[i]);
+    surf_host_list[i] = surf_host_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);
+  surf_model_t ws_model = surf_resource_model(host_list[0], SURF_HOST_LEVEL);
   for (i = 1; i < host_nb; i++) {
-    surf_model_t ws_model_tmp = surf_resource_model(host_list[i], SURF_WKS_LEVEL);
+    surf_model_t ws_model_tmp = surf_resource_model(host_list[i], SURF_HOST_LEVEL);
     if (ws_model_tmp != ws_model) {
       XBT_CRITICAL("mixing VMs and PMs is not supported");
       DIE_IMPOSSIBLE;
@@ -443,8 +422,8 @@ smx_synchro_t SIMIX_host_parallel_execute(const char *name,
   /* 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_host_model_execute_parallel_task((surf_host_model_t)surf_host_model,
+    		  host_nb, surf_host_list, flops_amount, bytes_amount, rate);
 
     surf_action_set_data(synchro->execution.surf_exec, synchro);
   }
@@ -496,7 +475,7 @@ void SIMIX_host_execution_set_bound(smx_synchro_t synchro, double bound){
 	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){
+void SIMIX_host_execution_set_affinity(smx_synchro_t synchro, sg_host_t host, unsigned long mask){
   xbt_assert(synchro->type == SIMIX_SYNC_EXECUTE);
 
   if (synchro->execution.surf_exec) {
@@ -553,7 +532,7 @@ void SIMIX_execution_finish(smx_synchro_t synchro)
         break;
 
       case SIMIX_FAILED:
-        XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", sg_host_name(simcall->issuer->smx_host));
+        XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", sg_host_name(simcall->issuer->host));
         simcall->issuer->context->iwannadie = 1;
         SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed");
         break;
@@ -568,7 +547,7 @@ void SIMIX_execution_finish(smx_synchro_t synchro)
             (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) {
+    if (surf_host_get_state(surf_host_resource_priv(simcall->issuer->host)) != SURF_RESOURCE_ON) {
       simcall->issuer->context->iwannadie = 1;
     }
 
@@ -586,7 +565,7 @@ void SIMIX_post_host_execute(smx_synchro_t synchro)
 {
   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) {
+      surf_host_get_state(surf_host_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;
@@ -610,7 +589,6 @@ void SIMIX_post_host_execute(smx_synchro_t synchro)
 }
 
 
-#ifdef HAVE_TRACING
 void SIMIX_set_category(smx_synchro_t synchro, const char *category)
 {
   if (synchro->state != SIMIX_RUNNING) return;
@@ -620,34 +598,33 @@ void SIMIX_set_category(smx_synchro_t synchro, const char *category)
     surf_action_set_category(synchro->comm.surf_comm, category);
   }
 }
-#endif
 
 /**
  * \brief Function to get the parameters of the given the SIMIX host.
  *
- * \param host the host to get_phys_host (a smx_host_t)
+ * \param host the host to get_phys_host (a sg_host_t)
  * \param param the parameter object space to be overwritten (a ws_params_t)
  */
-void SIMIX_host_get_params(smx_host_t ind_vm, ws_params_t params)
+void SIMIX_host_get_params(sg_host_t ind_vm, ws_params_t params)
 {
   /* jump to ws_get_params(). */
-  surf_workstation_get_params(ind_vm, params);
+  surf_host_get_params(ind_vm, params);
 }
 
-void SIMIX_host_set_params(smx_host_t ind_vm, ws_params_t params)
+void SIMIX_host_set_params(sg_host_t ind_vm, ws_params_t params)
 {
   /* jump to ws_set_params(). */
-  surf_workstation_set_params(ind_vm, params);
+  surf_host_set_params(ind_vm, params);
 }
 
-xbt_dict_t SIMIX_host_get_mounted_storage_list(smx_host_t host){
+xbt_dict_t SIMIX_host_get_mounted_storage_list(sg_host_t host){
   xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
 
-  return surf_workstation_get_mounted_storage_list(host);
+  return surf_host_get_mounted_storage_list(host);
 }
 
-xbt_dynar_t SIMIX_host_get_attached_storage_list(smx_host_t host){
+xbt_dynar_t SIMIX_host_get_attached_storage_list(sg_host_t host){
   xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
 
-  return surf_workstation_get_attached_storage_list(host);
+  return surf_host_get_attached_storage_list(host);
 }