cosmetics

[simgrid.git] / src / simix / smx_host.cpp

diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp
index 7eaf2bb..0f0878a 100644 (file)
--- a/src/simix/smx_host.cpp
+++ b/src/simix/smx_host.cpp
@@ -23,8 +23,8 @@ namespace simgrid {
 
     Host::Host()
     {
-      if (!EXTENSION_ID.valid())
-        EXTENSION_ID = simgrid::s4u::Host::extension_create<simgrid::simix::Host>();
+      if (!Host::EXTENSION_ID.valid())
+        Host::EXTENSION_ID = s4u::Host::extension_create<simix::Host>();
 
       simgrid::simix::ActorImpl act;
       process_list = xbt_swag_new(xbt_swag_offset(act, host_proc_hookup));
@@ -49,7 +49,9 @@ namespace simgrid {
       for (auto arg : auto_restart_processes)
         delete arg;
       auto_restart_processes.clear();
-      xbt_dynar_free(&boot_processes);
+      for (auto arg : boot_processes)
+        delete arg;
+      boot_processes.clear();
       xbt_swag_free(process_list);
     }
 
@@ -59,14 +61,12 @@ namespace simgrid {
      */
     void Host::turnOn()
     {
-      unsigned int cpt;
-      smx_process_arg_t arg;
-      xbt_dynar_foreach(boot_processes,cpt,arg) {
-        XBT_DEBUG("Booting Process %s(%s) right now", arg->name.c_str(), arg->hostname);
+      for (auto arg : boot_processes) {
+        XBT_DEBUG("Booting Process %s(%s) right now", arg->name.c_str(), arg->host->name().c_str());
         simix_global->create_process_function(arg->name.c_str(),
             arg->code,
             nullptr,
-            arg->hostname,
+            arg->host,
             arg->kill_time,
             arg->properties,
             arg->auto_restart,
@@ -84,8 +84,7 @@ void SIMIX_host_off(sg_host_t h, smx_actor_t issuer)
   xbt_assert((host != nullptr), "Invalid parameters");
 
   if (h->isOn()) {
-    simgrid::surf::HostImpl* surf_host = h->extension<simgrid::surf::HostImpl>();
-    surf_host->turnOff();
+    h->pimpl_cpu->turnOff();
 
     /* Clean Simulator data */
     if (xbt_swag_size(host->process_list) != 0) {
@@ -132,14 +131,13 @@ void _SIMIX_host_free_process_arg(void *data)
  */
 void SIMIX_host_add_auto_restart_process(
   sg_host_t host, const char *name, std::function<void()> code,
-  void* data, const char *hostname, double kill_time,
-  xbt_dict_t properties, int auto_restart)
+  void* data, double kill_time, xbt_dict_t properties, int auto_restart)
 {
   smx_process_arg_t arg = new simgrid::simix::ProcessArg();
   arg->name = name;
   arg->code = std::move(code);
   arg->data = data;
-  arg->hostname = hostname;
+  arg->host = host;
   arg->kill_time = kill_time;
   arg->properties = properties;
   arg->auto_restart = auto_restart;
@@ -159,8 +157,8 @@ void SIMIX_host_autorestart(sg_host_t host)
 
   for (auto arg : process_list) {
 
-    XBT_DEBUG("Restarting Process %s(%s) right now", arg->name.c_str(), arg->hostname);
-    simix_global->create_process_function(arg->name.c_str(), arg->code, nullptr, arg->hostname, arg->kill_time,
+    XBT_DEBUG("Restarting Process %s@%s right now", arg->name.c_str(), arg->host->name().c_str());
+    simix_global->create_process_function(arg->name.c_str(), arg->code, nullptr, arg->host, arg->kill_time,
         arg->properties, arg->auto_restart, nullptr);
   }
   process_list.clear();
@@ -205,10 +203,9 @@ smx_activity_t SIMIX_execution_parallel_start(const char *name, int host_nb, sg_
     host_list_cpy[i] = host_list[i];
 
   /* Check that we are not mixing VMs and PMs in the parallel task */
-  simgrid::surf::HostImpl *host = host_list[0]->extension<simgrid::surf::HostImpl>();
-  bool is_a_vm = (nullptr != dynamic_cast<simgrid::surf::VirtualMachine*>(host));
+  bool is_a_vm = (nullptr != dynamic_cast<simgrid::surf::VirtualMachine*>(host_list[0]->pimpl_));
   for (int i = 1; i < host_nb; i++) {
-    bool tmp_is_a_vm = (nullptr != dynamic_cast<simgrid::surf::VirtualMachine*>(host_list[i]->extension<simgrid::surf::HostImpl>()));
+    bool tmp_is_a_vm = (nullptr != dynamic_cast<simgrid::surf::VirtualMachine*>(host_list[i]->pimpl_));
     xbt_assert(is_a_vm == tmp_is_a_vm, "parallel_execute: mixing VMs and PMs is not supported (yet).");
   }