cleanup handling of Fortran compiler in cmake (Patch from M. Volat)

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

diff --git a/src/surf/virtual_machine.cpp b/src/surf/virtual_machine.cpp
index 1e01169..aa27cf8 100644 (file)
--- a/src/surf/virtual_machine.cpp
+++ b/src/surf/virtual_machine.cpp
@@ -78,11 +78,12 @@ double VMModel::nextOccuringEvent(double now)
 
   /* iterate for all virtual machines */
   for (VirtualMachine *ws_vm : VirtualMachine::allVms_) {
-    Cpu *cpu = ws_vm->cpu_;
+    Cpu* cpu = ws_vm->piface_->pimpl_cpu;
     xbt_assert(cpu, "cpu-less host");
 
     double solved_value = ws_vm->action_->getVariable()->value;
-    XBT_DEBUG("assign %f to vm %s @ pm %s", solved_value, ws_vm->getName(), ws_vm->getPm()->name().c_str());
+    XBT_DEBUG("assign %f to vm %s @ pm %s", solved_value, ws_vm->piface_->name().c_str(),
+              ws_vm->getPm()->name().c_str());
 
     // TODO: check lmm_update_constraint_bound() works fine instead of the below manual substitution.
     // cpu_cas01->constraint->bound = solved_value;
@@ -104,7 +105,7 @@ double VMModel::nextOccuringEvent(double now)
  ************/
 
 VirtualMachine::VirtualMachine(HostModel* model, const char* name, simgrid::s4u::Host* host_PM)
-    : HostImpl(model, name, nullptr /*constraint*/, nullptr /*storage*/, nullptr /*cpu*/), hostPM_(host_PM)
+    : HostImpl(model, name, nullptr /*storage*/), hostPM_(host_PM)
 {
   /* Register this VM to the list of all VMs */
   allVms_.push_back(this);
@@ -124,9 +125,9 @@ VirtualMachine::VirtualMachine(HostModel* model, const char* name, simgrid::s4u:
   // Roughly, create a vcpu resource by using the values of the sub_cpu one.
   CpuCas01 *sub_cpu = dynamic_cast<CpuCas01*>(host_PM->pimpl_cpu);
 
-  cpu_ = surf_cpu_model_vm->createCpu(piface_, sub_cpu->getSpeedPeakList(), 1 /*cores*/);
+  piface_->pimpl_cpu = surf_cpu_model_vm->createCpu(piface_, sub_cpu->getSpeedPeakList(), 1 /*cores*/);
   if (sub_cpu->getPState() != 0)
-    cpu_->setPState(sub_cpu->getPState());
+    piface_->pimpl_cpu->setPState(sub_cpu->getPState());
 
   /* We create cpu_action corresponding to a VM process on the host operating system. */
   /* FIXME: TODO: we have to periodically input GUESTOS_NOISE to the system? how ? */
@@ -146,29 +147,16 @@ VirtualMachine::~VirtualMachine()
   /* Free the cpu_action of the VM. */
   XBT_ATTRIB_UNUSED int ret = action_->unref();
   xbt_assert(ret == 1, "Bug: some resource still remains");
-
-  delete cpu_;
 }
 
 e_surf_vm_state_t VirtualMachine::getState() {
   return vmState_;
 }
 
-void VirtualMachine::setState(e_surf_vm_state_t state) {
+void VirtualMachine::setState(e_surf_vm_state_t state)
+{
   vmState_ = state;
 }
-void VirtualMachine::turnOn() {
-  if (isOff()) {
-    Resource::turnOn();
-    onVmStateChange(this);
-  }
-}
-void VirtualMachine::turnOff() {
-  if (isOn()) {
-    Resource::turnOff();
-    onVmStateChange(this);
-  }
-}
 void VirtualMachine::suspend()
 {
   action_->suspend();
@@ -203,13 +191,12 @@ sg_host_t VirtualMachine::getPm() {
 /* Update the physical host of the given VM */
 void VirtualMachine::migrate(sg_host_t host_dest)
 {
-  HostImpl* surfHost_dst  = host_dest->pimpl_;
-  const char* vm_name     = getName();
+  const char* vm_name     = piface_->name().c_str();
   const char* pm_name_src = hostPM_->name().c_str();
-  const char* pm_name_dst = surfHost_dst->getName();
+  const char* pm_name_dst = host_dest->name().c_str();
 
   /* update net_elm with that of the destination physical host */
-  sg_host_by_name(vm_name)->pimpl_netcard = sg_host_by_name(pm_name_dst)->pimpl_netcard;
+  piface_->pimpl_netcard = host_dest->pimpl_netcard;
 
   hostPM_ = host_dest;