X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/22e6546d2c6f14864cc93c4ed1470d8e8c1e2d95..c1581952362f8720ca84e7f5fb5500fdeb3878b9:/src/surf/HostImpl.cpp?ds=sidebyside diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp index 18bf4bcc7e..36bff707f3 100644 --- a/src/surf/HostImpl.cpp +++ b/src/surf/HostImpl.cpp @@ -4,7 +4,6 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "src/plugins/vm/VirtualMachineImpl.hpp" -#include "src/surf/FileImpl.hpp" #include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_host, surf, "Logging specific to the SURF host module"); @@ -22,25 +21,24 @@ namespace surf { * Model * *********/ -/* Each VM has a dummy CPU action on the PM layer. This CPU action works as the - * constraint (capacity) of the VM in the PM layer. If the VM does not have any - * active task, the dummy CPU action must be deactivated, so that the VM does - * not get any CPU share in the PM layer. */ +/* Each VM has a dummy CPU action on the PM layer. This CPU action works as the constraint (capacity) of the VM in the + * PM layer. If the VM does not have any active task, the dummy CPU action must be deactivated, so that the VM does not + * get any CPU share in the PM layer. */ void HostModel::ignoreEmptyVmInPmLMM() { /* iterate for all virtual machines */ for (s4u::VirtualMachine* const& ws_vm : vm::VirtualMachineImpl::allVms_) { Cpu* cpu = ws_vm->pimpl_cpu; - int active_tasks = lmm_constraint_get_variable_amount(cpu->constraint()); + int active_tasks = cpu->constraint()->get_variable_amount(); /* 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, ws_vm->pimpl_vm_->coreAmount()); + int impact = std::min(active_tasks, ws_vm->getImpl()->coreAmount()); XBT_DEBUG("set the weight of the dummy CPU action of VM%p on PM to %d (#tasks: %d)", ws_vm, impact, active_tasks); if (impact > 0) - ws_vm->pimpl_vm_->action_->setSharingWeight(1. / impact); + ws_vm->getImpl()->action_->setSharingWeight(1. / impact); else - ws_vm->pimpl_vm_->action_->setSharingWeight(0.); + ws_vm->getImpl()->action_->setSharingWeight(0.); } }