X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c8997e63383c66e43ffde29d356fdddb65d65d81..1398fa7c21c0d81f808108e0803d875c6fce9b8e:/src/simix/smx_host.cpp

diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp
index 3a2bd4671b..c3e5db0bc4 100644
--- a/src/simix/smx_host.cpp
+++ b/src/simix/smx_host.cpp
@@ -9,7 +9,7 @@
 #include "mc/mc.h"
 #include "src/mc/mc_replay.h"
 #include "src/surf/virtual_machine.hpp"
-#include "src/surf/HostImplem.hpp"
+#include "src/surf/HostImpl.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix,
                                 "SIMIX hosts");
@@ -43,7 +43,7 @@ void SIMIX_host_on(sg_host_t h)
   xbt_assert((host != NULL), "Invalid parameters");
 
   if (h->isOff()) {
-    simgrid::surf::HostImplem* surf_host = h->extension<simgrid::surf::HostImplem>();
+    simgrid::surf::HostImpl* surf_host = h->extension<simgrid::surf::HostImpl>();
     surf_host->turnOn();
 
     unsigned int cpt;
@@ -92,7 +92,7 @@ void SIMIX_host_off(sg_host_t h, smx_process_t issuer)
   xbt_assert((host != NULL), "Invalid parameters");
 
   if (h->isOn()) {
-    simgrid::surf::HostImplem* surf_host = h->extension<simgrid::surf::HostImplem>();
+    simgrid::surf::HostImpl* surf_host = h->extension<simgrid::surf::HostImpl>();
     surf_host->turnOff();
 
     /* Clean Simulator data */
@@ -199,19 +199,16 @@ void SIMIX_host_add_auto_restart_process(sg_host_t host,
 
   arg->argv = xbt_new(char*,argc + 1);
 
-  int i;
-  for (i = 0; i < argc; i++) {
+  for (int 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( ! sg_host_is_on(host)
-      && !xbt_dict_get_or_null(watched_hosts_lib,sg_host_get_name(host))){
+  if( host->isOff() && !xbt_dict_get_or_null(watched_hosts_lib,sg_host_get_name(host))){
     xbt_dict_set(watched_hosts_lib,sg_host_get_name(host),host,NULL);
-    XBT_DEBUG("Have pushed host %s to watched_hosts_lib because state == SURF_RESOURCE_OFF",sg_host_get_name(host));
+    XBT_DEBUG("Push host %s to watched_hosts_lib because state == SURF_RESOURCE_OFF",sg_host_get_name(host));
   }
   xbt_dynar_push_as(sg_host_simix(host)->auto_restart_processes,smx_process_arg_t,arg);
 }
@@ -322,10 +319,10 @@ smx_synchro_t SIMIX_execution_parallel_start(const char *name,
     host_list_cpy[i] = host_list[i];
 
   /* Check that we are not mixing VMs and PMs in the parallel task */
-  simgrid::surf::HostImplem *host = host_list[0]->extension<simgrid::surf::HostImplem>();
+  simgrid::surf::HostImpl *host = host_list[0]->extension<simgrid::surf::HostImpl>();
   bool is_a_vm = (nullptr != dynamic_cast<simgrid::surf::VirtualMachine*>(host));
   for (i = 1; i < host_nb; i++) {
-    bool tmp_is_a_vm = (nullptr != dynamic_cast<simgrid::surf::VirtualMachine*>(host_list[i]->extension<simgrid::surf::HostImplem>()));
+    bool tmp_is_a_vm = (nullptr != dynamic_cast<simgrid::surf::VirtualMachine*>(host_list[i]->extension<simgrid::surf::HostImpl>()));
     xbt_assert(is_a_vm == tmp_is_a_vm, "parallel_execute: mixing VMs and PMs is not supported (yet).");
   }
 
@@ -396,8 +393,7 @@ void SIMIX_execution_set_affinity(smx_synchro_t synchro, sg_host_t host, unsigne
   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);
-    static_cast<simgrid::surf::CpuAction*>(synchro->execution.surf_exec)
-      ->setAffinity(host->pimpl_cpu, mask);
+    static_cast<simgrid::surf::CpuAction*>(synchro->execution.surf_exec)->setAffinity(host->pimpl_cpu, mask);
   }
 }
 
@@ -486,7 +482,7 @@ void SIMIX_post_host_execute(smx_synchro_t synchro)
     /* 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 (synchro->execution.surf_exec->getState() == SURF_ACTION_FAILED) {
+  } else if (synchro->execution.surf_exec->getState() == simgrid::surf::Action::State::failed) {
     /* If the host running the synchro didn't fail, then the synchro was
      * canceled */
     synchro->state = SIMIX_CANCELED;