Kill HostImpl::cpu_. Use the one of the s4u::Host

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

diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp
index cbd28f1..79cc9fc 100644 (file)
--- a/src/s4u/s4u_host.cpp
+++ b/src/s4u/s4u_host.cpp
@@ -48,6 +48,7 @@ Host::~Host()
 {
   xbt_assert(currentlyDestroying_, "Please call h->destroy() instead of manually deleting it.");
 
+  delete pimpl_;
   delete pimpl_cpu;
   delete pimpl_netcard;
   delete mounts;
@@ -57,7 +58,7 @@ Host::~Host()
  *
  * Don't delete directly an Host, call h->destroy() instead.
  *
- * This is cumbersome but there is the simplest solution to ensure that the
+ * 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).
  */
@@ -97,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_cpu->turnOn();
     });
   }
 }
@@ -136,22 +137,15 @@ 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 simgrid::simix::kernelImmediate([&] { 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);
-  });
+  simgrid::simix::kernelImmediate([&] { this->pimpl_->setProperty(key, value); });
 }
 
 /** Get the processes attached to the host */
@@ -202,16 +196,12 @@ int Host::pstate()
 
 void Host::parameters(vm_params_t params)
 {
-  simgrid::simix::kernelImmediate([&]() {
-    this->extension<simgrid::surf::HostImpl>()->getParams(params);
-  });
+  simgrid::simix::kernelImmediate([&]() { this->pimpl_->getParams(params); });
 }
 
 void Host::setParameters(vm_params_t params)
 {
-  simgrid::simix::kernelImmediate([&]() {
-    this->extension<simgrid::surf::HostImpl>()->setParams(params);
-  });
+  simgrid::simix::kernelImmediate([&]() { this->pimpl_->setParams(params); });
 }
 
 /**
@@ -221,9 +211,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 simgrid::simix::kernelImmediate([&] { return this->pimpl_->getMountedStorageList(); });
 }
 
 /**
@@ -233,9 +221,7 @@ xbt_dict_t Host::mountedStoragesAsDict()
  */
 xbt_dynar_t Host::attachedStorages()
 {
-  return simgrid::simix::kernelImmediate([&] {
-    return this->extension<simgrid::surf::HostImpl>()->getAttachedStorageList();
-  });
+  return simgrid::simix::kernelImmediate([&] { return this->pimpl_->getAttachedStorageList(); });
 }
 
 } // namespace simgrid