X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/96b18f4b65694f66c8aea2d702b6f087fdcf9cb7..6ae07464eeacbd09ee8b4ff9630c78d62bfe699e:/src/s4u/s4u_host.cpp?ds=sidebyside

diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp
index 3181507957..56229fed33 100644
--- a/src/s4u/s4u_host.cpp
+++ b/src/s4u/s4u_host.cpp
@@ -44,27 +44,46 @@ Host::Host(const char* 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_;
   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 this 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);
 }
 
@@ -79,7 +98,7 @@ void Host::turnOn() {
   if (isOff()) {
     simgrid::simix::kernelImmediate([&]{
       this->extension<simgrid::simix::Host>()->turnOn();
-      this->extension<simgrid::surf::HostImpl>()->turnOn();
+      this->pimpl_->turnOn();
     });
   }
 }
@@ -119,20 +138,17 @@ boost::unordered_map<std::string, Storage*> const& Host::mountedStorages() {
 /** Get the properties assigned to a host */
 xbt_dict_t Host::properties() {
   return simgrid::simix::kernelImmediate([&] {
-    simgrid::surf::HostImpl* surf_host = this->extension<simgrid::surf::HostImpl>();
-    return surf_host->getProperties();
+    return this->pimpl_->getProperties();
   });
 }
 
 /** Retrieve the property value (or nullptr if not set) */
 const char*Host::property(const char*key) {
-  simgrid::surf::HostImpl* surf_host = this->extension<simgrid::surf::HostImpl>();
-  return surf_host->getProperty(key);
+  return this->pimpl_->getProperty(key);
 }
 void Host::setProperty(const char*key, const char *value){
   simgrid::simix::kernelImmediate([&] {
-    simgrid::surf::HostImpl* surf_host = this->extension<simgrid::surf::HostImpl>();
-    surf_host->setProperty(key,value);
+    this->pimpl_->setProperty(key,value);
   });
 }
 
@@ -185,14 +201,14 @@ int Host::pstate()
 void Host::parameters(vm_params_t params)
 {
   simgrid::simix::kernelImmediate([&]() {
-    this->extension<simgrid::surf::HostImpl>()->getParams(params);
+    this->pimpl_->getParams(params);
   });
 }
 
 void Host::setParameters(vm_params_t params)
 {
   simgrid::simix::kernelImmediate([&]() {
-    this->extension<simgrid::surf::HostImpl>()->setParams(params);
+    this->pimpl_->setParams(params);
   });
 }
 
@@ -204,7 +220,7 @@ void Host::setParameters(vm_params_t params)
 xbt_dict_t Host::mountedStoragesAsDict()
 {
   return simgrid::simix::kernelImmediate([&] {
-    return this->extension<simgrid::surf::HostImpl>()->getMountedStorageList();
+    return this->pimpl_->getMountedStorageList();
   });
 }
 
@@ -216,7 +232,7 @@ xbt_dict_t Host::mountedStoragesAsDict()
 xbt_dynar_t Host::attachedStorages()
 {
   return simgrid::simix::kernelImmediate([&] {
-    return this->extension<simgrid::surf::HostImpl>()->getAttachedStorageList();
+    return this->pimpl_->getAttachedStorageList();
   });
 }