cosmetics in the creation of NS3 clusters

[simgrid.git] / src / s4u / s4u_host.cpp

diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp
index d38b8e0..ce44cd7 100644 (file)
--- a/src/s4u/s4u_host.cpp
+++ b/src/s4u/s4u_host.cpp
@@ -20,6 +20,8 @@
 #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 USER_HOST_LEVEL = -1;
 
@@ -38,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() {
@@ -55,15 +58,20 @@ 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;
 }
 
@@ -164,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 */