X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a2a013c0e4ca407feeb7b3d0e85abba7acae2532..322392d9d7d8ff2e78b6ae12998ca8693fa09b38:/src/s4u/s4u_host.cpp

diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp
index e4d3d6c06a..ce44cd7cdf 100644
--- a/src/s4u/s4u_host.cpp
+++ b/src/s4u/s4u_host.cpp
@@ -20,8 +20,9 @@
 #include "simgrid/s4u/host.hpp"
 #include "simgrid/s4u/storage.hpp"
 
+xbt_dict_t host_list = nullptr; // FIXME: move it to Engine
+
 int MSG_HOST_LEVEL = -1;
-int SIMIX_HOST_LEVEL = -1;
 int USER_HOST_LEVEL = -1;
 
 namespace simgrid {
@@ -39,6 +40,7 @@ simgrid::xbt::signal<void(Host&)> Host::onStateChange;
 Host::Host(const char* name)
   : name_(name)
 {
+  xbt_dict_set(host_list, name, this, nullptr);
 }
 
 Host::~Host() {
@@ -56,31 +58,43 @@ Host *Host::by_name(std::string name) {
 }
 Host* Host::by_name_or_null(const char* name)
 {
+  if (host_list == nullptr)
+    host_list = xbt_dict_new_homogeneous([](void*p) {
+      simgrid::s4u::Host* host = static_cast<simgrid::s4u::Host*>(p);
+      simgrid::s4u::Host::onDestruction(*host);
+      delete host;
+    });
   return (Host*) xbt_dict_get_or_null(host_list, name);
 }
 Host* Host::by_name_or_create(const char* name)
 {
   Host* host = by_name_or_null(name);
-  if (host == nullptr) {
+  if (host == nullptr)
     host = new Host(name);
-    xbt_dict_set(host_list, name, host, nullptr);
-  }
+
   return host;
 }
 
 Host *Host::current(){
-  smx_process_t smx_proc = SIMIX_process_self();
+  smx_actor_t smx_proc = SIMIX_process_self();
   if (smx_proc == nullptr)
     xbt_die("Cannot call Host::current() from the maestro context");
   return smx_proc->host;
 }
 
 void Host::turnOn() {
-  simgrid::simix::kernelImmediate(std::bind(SIMIX_host_on, this));
+  if (isOff()) {
+    simgrid::simix::kernelImmediate([&]{
+      this->extension<simgrid::simix::Host>()->turnOn();
+      this->extension<simgrid::surf::HostImpl>()->turnOn();
+    });
+  }
 }
 
 void Host::turnOff() {
-  simgrid::simix::kernelImmediate(std::bind(SIMIX_host_off, this, SIMIX_process_self()));
+  if (isOn()) {
+    simgrid::simix::kernelImmediate(std::bind(SIMIX_host_off, this, SIMIX_process_self()));
+  }
 }
 
 bool Host::isOn() {
@@ -133,7 +147,7 @@ void Host::setProperty(const char*key, const char *value){
 xbt_swag_t Host::processes()
 {
   return simgrid::simix::kernelImmediate([&]() {
-    return ((smx_host_priv_t)this->extension(SIMIX_HOST_LEVEL))->process_list;
+    return this->extension<simgrid::simix::Host>()->process_list;
   });
 }
 
@@ -158,8 +172,8 @@ double Host::speed() {
   return pimpl_cpu->getSpeed(1.0);
 }
 /** @brief Returns the number of core of the processor. */
-int Host::coresCount() {
-  return pimpl_cpu->getCore();
+int Host::coreCount() {
+  return pimpl_cpu->coreCount();
 }
 
 /** @brief Set the pstate at which the host should run */