do standard C++

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

diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp
index a6022e6e0fe7f10ea4c246a829439aee38dbc8d8..cbd28f1cfa7d83a00a0d88cec233f8be3b6e2911 100644 (file)
--- a/src/s4u/s4u_host.cpp
+++ b/src/s4u/s4u_host.cpp
@@ -20,7 +20,7 @@
 #include "simgrid/s4u/host.hpp"
 #include "simgrid/s4u/storage.hpp"
 
-xbt_dict_t host_list = nullptr; // FIXME: make it a static field of Host
+xbt_dict_t host_list = nullptr; // FIXME: move it to Engine
 
 int MSG_HOST_LEVEL = -1;
 int USER_HOST_LEVEL = -1;
@@ -40,40 +40,51 @@ simgrid::xbt::signal<void(Host&)> Host::onStateChange;
 Host::Host(const char* name)
   : name_(name)
 {
+  xbt_assert(sg_host_by_name(name) == nullptr, "Refusing to create a second host named '%s'.", name);
   xbt_dict_set(host_list, name, this, nullptr);
 }
 
-Host::~Host() {
+Host::~Host()
+{
+  xbt_assert(currentlyDestroying_, "Please call h->destroy() instead of manually deleting it.");
+
   delete pimpl_cpu;
   delete pimpl_netcard;
   delete mounts;
 }
 
-Host *Host::by_name(std::string name) {
+/** @brief Fire the required callbacks and destroy the object
+ *
+ * Don't delete directly an Host, call h->destroy() instead.
+ *
+ * This is cumbersome but there is the simplest solution to ensure that the
+ * onDestruction() callback receives a valid object (because of the destructor
+ * order in a class hierarchy).
+ */
+void Host::destroy()
+{
+  if (!currentlyDestroying_) {
+    currentlyDestroying_ = true;
+    xbt_dict_remove(host_list, name().c_str());
+    onDestruction(*this);
+    delete this;
+  }
+}
+
+Host* Host::by_name(std::string name)
+{
   Host* host = Host::by_name_or_null(name.c_str());
   // TODO, raise an exception instead?
   if (host == nullptr)
-    xbt_die("No such host: %s", name.c_str());
+    xbt_die("No such host: '%s'", name.c_str());
   return host;
 }
 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;
-    });
+    host_list = xbt_dict_new_homogeneous(nullptr);
   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)
-    host = new Host(name);
-
-  return host;
-}
 
 Host *Host::current(){
   smx_actor_t smx_proc = SIMIX_process_self();