X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c6bbeb1829c36ff45b43ab25f9d8d3f53f554d98..91954c5dec0ca32d2b45587f0b6e805d3d6e55d9:/src/plugins/vm/VirtualMachineImpl.cpp

diff --git a/src/plugins/vm/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp
index ee173f3370..80f1689d51 100644
--- a/src/plugins/vm/VirtualMachineImpl.cpp
+++ b/src/plugins/vm/VirtualMachineImpl.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2020. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -20,6 +20,9 @@ void surf_vm_model_init_HL13()
 }
 
 namespace simgrid {
+
+template class xbt::Extendable<vm::VirtualMachineImpl>;
+
 namespace vm {
 /*************
  * Callbacks *
@@ -54,20 +57,20 @@ static void host_state_change(s4u::Host const& host)
 
 static void add_active_exec(s4u::Actor const&, s4u::Exec const& task)
 {
-  s4u::VirtualMachine* vm = dynamic_cast<s4u::VirtualMachine*>(task.get_host());
+  const s4u::VirtualMachine* vm = dynamic_cast<s4u::VirtualMachine*>(task.get_host());
   if (vm != nullptr) {
     VirtualMachineImpl* vm_impl = vm->get_impl();
-    vm_impl->active_tasks_      = vm_impl->active_tasks_ + 1;
+    vm_impl->add_active_exec();
     vm_impl->update_action_weight();
   }
 }
 
 static void remove_active_exec(s4u::Actor const&, s4u::Exec const& task)
 {
-  s4u::VirtualMachine* vm = dynamic_cast<s4u::VirtualMachine*>(task.get_host());
+  const s4u::VirtualMachine* vm = dynamic_cast<s4u::VirtualMachine*>(task.get_host());
   if (vm != nullptr) {
     VirtualMachineImpl* vm_impl = vm->get_impl();
-    vm_impl->active_tasks_      = vm_impl->active_tasks_ - 1;
+    vm_impl->remove_active_exec();
     vm_impl->update_action_weight();
   }
 }
@@ -80,20 +83,20 @@ static s4u::VirtualMachine* get_vm_from_activity(kernel::activity::ActivityImpl
 
 static void add_active_activity(kernel::activity::ActivityImpl const& act)
 {
-  s4u::VirtualMachine* vm = get_vm_from_activity(act);
+  const s4u::VirtualMachine* vm = get_vm_from_activity(act);
   if (vm != nullptr) {
     VirtualMachineImpl *vm_impl = vm->get_impl();
-    vm_impl->active_tasks_ = vm_impl->active_tasks_ + 1;
+    vm_impl->add_active_exec();
     vm_impl->update_action_weight();
   }
 }
 
 static void remove_active_activity(kernel::activity::ActivityImpl const& act)
 {
-  s4u::VirtualMachine* vm = get_vm_from_activity(act);
+  const s4u::VirtualMachine* vm = get_vm_from_activity(act);
   if (vm != nullptr) {
     VirtualMachineImpl *vm_impl = vm->get_impl();
-    vm_impl->active_tasks_ = vm_impl->active_tasks_ - 1;
+    vm_impl->remove_active_exec();
     vm_impl->update_action_weight();
   }
 }
@@ -136,11 +139,13 @@ double VMModel::next_occurring_event(double now)
 
   /* iterate for all virtual machines */
   for (s4u::VirtualMachine* const& ws_vm : VirtualMachineImpl::allVms_) {
-    kernel::resource::Cpu* cpu = ws_vm->pimpl_cpu;
+    if (ws_vm->get_state() == s4u::VirtualMachine::state::SUSPENDED) // Ignore suspended VMs
+      continue;
+
+    const kernel::resource::Cpu* cpu = ws_vm->pimpl_cpu;
 
-    double solved_value =
-        ws_vm->get_impl()->action_->get_variable()->get_value(); // this is X1 in comment above, what
-                                                                 // this VM got in the sharing on the PM
+    // solved_value below is X1 in comment above: what this VM got in the sharing on the PM
+    double solved_value = ws_vm->get_impl()->get_action()->get_variable()->get_value();
     XBT_DEBUG("assign %f to vm %s @ pm %s", solved_value, ws_vm->get_cname(), ws_vm->get_pm()->get_cname());
 
     xbt_assert(cpu->get_model() == surf_cpu_model_vm);
@@ -289,8 +294,7 @@ void VirtualMachineImpl::set_physical_host(s4u::Host* destination)
 
   /* Update vcpu's action for the new pm */
   /* create a cpu action bound to the pm model at the destination. */
-  kernel::resource::CpuAction* new_cpu_action =
-      static_cast<kernel::resource::CpuAction*>(destination->pimpl_cpu->execution_start(0, this->core_amount_));
+  kernel::resource::CpuAction* new_cpu_action = destination->pimpl_cpu->execution_start(0, this->core_amount_);
 
   if (action_->get_remains_no_update() > 0)
     XBT_CRITICAL("FIXME: need copy the state(?), %f", action_->get_remains_no_update());
@@ -318,9 +322,9 @@ void VirtualMachineImpl::set_bound(double bound)
 
 void VirtualMachineImpl::update_action_weight(){
   /* The impact of the VM over its PM is the min between its vCPU amount and the amount of tasks it contains */
-  int impact = std::min(active_tasks_, get_core_amount());
+  int impact = std::min(active_execs_, get_core_amount());
 
-  XBT_DEBUG("set the weight of the dummy CPU action of VM%p on PM to %d (#tasks: %d)", this, impact, active_tasks_);
+  XBT_DEBUG("set the weight of the dummy CPU action of VM%p on PM to %d (#tasks: %u)", this, impact, active_execs_);
 
   if (impact > 0)
     action_->set_sharing_penalty(1. / impact);