X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/10ceac5fd14fb0426b5c93bda85676a79b02d0be..72ed1b38e46ffbcc62803e699d9094a0d69252af:/src/simix/smx_host.cpp

diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp
index 6f932c5bfa..a835e87bd2 100644
--- a/src/simix/smx_host.cpp
+++ b/src/simix/smx_host.cpp
@@ -17,56 +17,62 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix, "SIMIX hosts");
 
-/** @brief Internal function to create a SIMIX host. */
-void SIMIX_host_create(sg_host_t host) // FIXME: braindead prototype. Take sg_host as parameter
-{
-  smx_host_priv_t smx_host = xbt_new0(s_smx_host_priv_t, 1);
-
-  /* Host structure */
-  simgrid::simix::ActorImpl proc;
-  smx_host->process_list = xbt_swag_new(xbt_swag_offset(proc, host_proc_hookup));
+namespace simgrid {
+  namespace simix {
+    simgrid::xbt::Extension<simgrid::s4u::Host, Host> Host::EXTENSION_ID;
 
-  /* Update global variables */
-  sg_host_simix_set(host, smx_host);
-}
+    Host::Host()
+    {
+      if (!EXTENSION_ID.valid())
+        EXTENSION_ID = simgrid::s4u::Host::extension_create<simgrid::simix::Host>();
 
-/** @brief Start the host if it is off */
-void SIMIX_host_on(sg_host_t h)
-{
-  smx_host_priv_t host = sg_host_simix(h);
+      simgrid::simix::ActorImpl act;
+      process_list = xbt_swag_new(xbt_swag_offset(act, host_proc_hookup));
+    }
 
-  xbt_assert((host != nullptr), "Invalid parameters");
+    Host::~Host()
+    {
+      /* Clean Simulator data */
+      if (xbt_swag_size(process_list) != 0) {
+        char *msg = xbt_strdup("Shutting down host, but it's not empty:");
+        char *tmp;
+        smx_actor_t process = nullptr;
+
+        xbt_swag_foreach(process, process_list) {
+          tmp = bprintf("%s\n\t%s", msg, process->name.c_str());
+          free(msg);
+          msg = tmp;
+        }
+        SIMIX_display_process_status();
+        THROWF(arg_error, 0, "%s", msg);
+      }
+      xbt_dynar_free(&auto_restart_processes);
+      xbt_dynar_free(&boot_processes);
+      xbt_swag_free(process_list);
+    }
 
-  if (h->isOff()) {
-    simgrid::surf::HostImpl* surf_host = h->extension<simgrid::surf::HostImpl>();
-    surf_host->turnOn();
-
-    unsigned int cpt;
-    smx_process_arg_t arg;
-    xbt_dynar_foreach(host->boot_processes,cpt,arg) {
-      XBT_DEBUG("Booting Process %s(%s) right now",
-        arg->name.c_str(), arg->hostname);
-      if (simix_global->create_process_function) {
+    /** Re-starts all the actors that are marked as restartable.
+     *
+     * Weird things will happen if you turn on an host that is already on. S4U is fool-proof, not this.
+     */
+    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);
         simix_global->create_process_function(arg->name.c_str(),
-                                              arg->code,
-                                              nullptr,
-                                              arg->hostname,
-                                              arg->kill_time,
-                                              arg->properties,
-                                              arg->auto_restart,
-                                              nullptr);
-      } else {
-        simcall_process_create(arg->name.c_str(),
-                               arg->code,
-                               nullptr,
-                               arg->hostname,
-                               arg->kill_time,
-                               arg->properties,
-                               arg->auto_restart);
+            arg->code,
+            nullptr,
+            arg->hostname,
+            arg->kill_time,
+            arg->properties,
+            arg->auto_restart,
+            nullptr);
       }
     }
-  }
-}
+
+}} // namespaces
 
 /** @brief Stop the host if it is on */
 void SIMIX_host_off(sg_host_t h, smx_actor_t issuer)
@@ -94,40 +100,6 @@ void SIMIX_host_off(sg_host_t h, smx_actor_t issuer)
   }
 }
 
-/**
- * \brief Internal function to destroy a SIMIX host.
- *
- * \param h the host to destroy (a sg_host_t)
- */
-void SIMIX_host_destroy(void *h)
-{
-  smx_host_priv_t host = static_cast<smx_host_priv_t>(h);
-
-  xbt_assert((host != nullptr), "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_actor_t process = nullptr;
-
-    xbt_swag_foreach(process, host->process_list) {
-      tmp = bprintf("%s\n\t%s", msg, process->name.c_str());
-      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);
-
-  /* Clean host structure */
-  free(host);
-  return;
-}
-
 sg_host_t SIMIX_host_self()
 {
   smx_actor_t process = SIMIX_process_self();
@@ -191,13 +163,8 @@ void SIMIX_host_autorestart(sg_host_t host)
   xbt_dynar_foreach (process_list, cpt, arg) {
 
     XBT_DEBUG("Restarting Process %s(%s) right now", arg->name.c_str(), arg->hostname);
-    if (simix_global->create_process_function) {
-      simix_global->create_process_function(arg->name.c_str(), arg->code, nullptr, arg->hostname, arg->kill_time,
-                                            arg->properties, arg->auto_restart, nullptr);
-    } else {
-      simcall_process_create(arg->name.c_str(), arg->code, nullptr, arg->hostname, arg->kill_time, arg->properties,
-                             arg->auto_restart);
-    }
+    simix_global->create_process_function(arg->name.c_str(), arg->code, nullptr, arg->hostname, arg->kill_time,
+        arg->properties, arg->auto_restart, nullptr);
   }
   xbt_dynar_reset(process_list);
 }