cosmetics

[simgrid.git] / src / surf / HostImpl.cpp

diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp
index 877fce9..2408c68 100644 (file)
--- a/src/surf/HostImpl.cpp
+++ b/src/surf/HostImpl.cpp
@@ -37,7 +37,7 @@ void HostModel::adjustWeightOfDummyCpuActions()
   /* iterate for all virtual machines */
   for (VirtualMachine *ws_vm : VirtualMachine::allVms_) {
 
-    Cpu *cpu = ws_vm->cpu_;
+    Cpu* cpu = ws_vm->piface_->pimpl_cpu;
 
     int is_active = lmm_constraint_used(cpu->getModel()->getMaxminSystem(), cpu->getConstraint());
 
@@ -98,19 +98,8 @@ Action* HostModel::executeParallelTask(int host_nb, simgrid::s4u::Host** host_li
 /************
  * Resource *
  ************/
-HostImpl::HostImpl(simgrid::surf::HostModel *model, const char *name, xbt_dynar_t storage, Cpu *cpu)
- : Resource(model, name)
- , PropertyHolder(nullptr)
- , storage_(storage), cpu_(cpu)
-{
-  params_.ramsize = 0;
-}
-
-HostImpl::HostImpl(simgrid::surf::HostModel *model, const char *name, lmm_constraint_t constraint,
-                 xbt_dynar_t storage, Cpu *cpu)
- : Resource(model, name, constraint)
- , PropertyHolder(nullptr)
- , storage_(storage), cpu_(cpu)
+HostImpl::HostImpl(simgrid::surf::HostModel* model, const char* name, xbt_dynar_t storage)
+    : PropertyHolder(nullptr), storage_(storage)
 {
   params_.ramsize = 0;
 }
@@ -126,32 +115,13 @@ void HostImpl::attach(simgrid::s4u::Host* host)
   piface_ = host;
 }
 
-bool HostImpl::isOn() const {
-  return cpu_->isOn();
-}
-bool HostImpl::isOff() const {
-  return cpu_->isOff();
-}
-void HostImpl::turnOn(){
-  if (isOff()) {
-    cpu_->turnOn();
-    simgrid::s4u::Host::onStateChange(*this->piface_);
-  }
-}
-void HostImpl::turnOff(){
-  if (isOn()) {
-    cpu_->turnOff();
-    simgrid::s4u::Host::onStateChange(*this->piface_);
-  }
-}
-
 simgrid::surf::Storage *HostImpl::findStorageOnMountList(const char* mount)
 {
   simgrid::surf::Storage *st = nullptr;
   s_mount_t mnt;
   unsigned int cursor;
 
-  XBT_DEBUG("Search for storage name '%s' on '%s'", mount, getName());
+  XBT_DEBUG("Search for storage name '%s' on '%s'", mount, piface_->name().c_str());
   xbt_dynar_foreach(storage_,cursor,mnt){
     XBT_DEBUG("See '%s'",mnt.name);
     if(!strcmp(mount,mnt.name)){
@@ -160,7 +130,7 @@ simgrid::surf::Storage *HostImpl::findStorageOnMountList(const char* mount)
     }
   }
   if(!st)
-    xbt_die("Can't find mount '%s' for '%s'", mount, getName());
+    xbt_die("Can't find mount '%s' for '%s'", mount, piface_->name().c_str());
   return st;
 }
 
@@ -185,11 +155,12 @@ xbt_dynar_t HostImpl::getAttachedStorageList()
   void **data;
   xbt_dynar_t result = xbt_dynar_new(sizeof(void*), nullptr);
   xbt_lib_foreach(storage_lib, cursor, key, data) {
-    if(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL) != nullptr) {
-    simgrid::surf::Storage *storage = static_cast<simgrid::surf::Storage*>(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL));
-    if(!strcmp((const char*)storage->attach_,this->getName())){
-      xbt_dynar_push_as(result, void *, (void*)storage->getName());
-    }
+    if (xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL) != nullptr) {
+      simgrid::surf::Storage* storage = static_cast<simgrid::surf::Storage*>(
+          xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL));
+      if (!strcmp((const char*)storage->attach_, piface_->name().c_str())) {
+        xbt_dynar_push_as(result, void*, (void*)storage->getName());
+      }
   }
   }
   return result;
@@ -205,7 +176,7 @@ Action *HostImpl::open(const char* fullpath) {
   char *file_mount_name = nullptr;
   char *mount_name = nullptr;
 
-  XBT_DEBUG("Search for storage name for '%s' on '%s'", fullpath, getName());
+  XBT_DEBUG("Search for storage name for '%s' on '%s'", fullpath, piface_->name().c_str());
   xbt_dynar_foreach(storage_,cursor,mnt)
   {
     XBT_DEBUG("See '%s'",mnt.name);
@@ -230,7 +201,7 @@ Action *HostImpl::open(const char* fullpath) {
   mount_name[longest_prefix_length] = '\0';
   }
   else
-    xbt_die("Can't find mount point for '%s' on '%s'", fullpath, getName());
+    xbt_die("Can't find mount point for '%s' on '%s'", fullpath, piface_->name().c_str());
 
   XBT_DEBUG("OPEN %s on disk '%s'",path, st->getName());
   Action *action = st->open((const char*)mount_name, (const char*)path);