X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cdf6a962eb4e88efbed3df9c41343adabcf09e6c..e22da6010c6499813ff88c76041cf499ffbf2b67:/src/plugins/vm/VirtualMachineImpl.cpp diff --git a/src/plugins/vm/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp index 2776c8dfef..371bff41de 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-2021. 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. */ @@ -7,19 +7,22 @@ #include "simgrid/Exception.hpp" #include "simgrid/s4u/Exec.hpp" #include "src/include/surf/surf.hpp" +#include "src/kernel/EngineImpl.hpp" #include "src/kernel/activity/ExecImpl.hpp" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_vm, surf, "Logging specific to the SURF VM module"); - -simgrid::vm::VMModel* surf_vm_model = nullptr; +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_vm, ker_resource, "Virtual Machines, containing actors and mobile accross hosts"); void surf_vm_model_init_HL13() { - if (surf_cpu_model_vm != nullptr) - surf_vm_model = new simgrid::vm::VMModel(); + auto vm_model = std::make_unique(); + simgrid::kernel::EngineImpl::get_instance()->add_model(simgrid::kernel::resource::Model::Type::VM, + std::move(vm_model), true); } namespace simgrid { + +template class xbt::Extendable; + namespace vm { /************* * Callbacks * @@ -52,22 +55,22 @@ static void host_state_change(s4u::Host const& host) } } -static void add_active_exec(s4u::Actor const&, s4u::Exec const& task) +static void add_active_exec(s4u::Exec const& task) { - s4u::VirtualMachine* vm = dynamic_cast(task.get_host()); + const s4u::VirtualMachine* vm = dynamic_cast(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) +static void remove_active_exec(s4u::Exec const& task) { - s4u::VirtualMachine* vm = dynamic_cast(task.get_host()); + const s4u::VirtualMachine* vm = dynamic_cast(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,27 +83,26 @@ 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; + VirtualMachineImpl* vm_impl = vm->get_impl(); + 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; + VirtualMachineImpl* vm_impl = vm->get_impl(); + vm_impl->remove_active_exec(); vm_impl->update_action_weight(); } } VMModel::VMModel() { - all_existing_models.push_back(this); s4u::Host::on_state_change.connect(host_state_change); s4u::Exec::on_start.connect(add_active_exec); s4u::Exec::on_completion.connect(remove_active_exec); @@ -108,7 +110,7 @@ VMModel::VMModel() kernel::activity::ActivityImpl::on_suspended.connect(remove_active_activity); } -double VMModel::next_occuring_event(double now) +double VMModel::next_occurring_event(double now) { /* TODO: update action's cost with the total cost of processes on the VM. */ @@ -136,20 +138,21 @@ double VMModel::next_occuring_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); kernel::lmm::System* vcpu_system = cpu->get_model()->get_maxmin_system(); vcpu_system->update_constraint_bound(cpu->get_constraint(), virt_overhead * solved_value); } - /* 2. Ready. Get the next occurring event */ - return surf_cpu_model_vm->next_occuring_event(now); + /* actual next occurring event is determined by VM CPU model at surf_solve */ + return -1.0; } /************ @@ -158,7 +161,7 @@ double VMModel::next_occuring_event(double now) VirtualMachineImpl::VirtualMachineImpl(simgrid::s4u::VirtualMachine* piface, simgrid::s4u::Host* host_PM, int core_amount, size_t ramsize) - : HostImpl(piface), physical_host_(host_PM), core_amount_(core_amount), user_bound_(std::numeric_limits::max()), ramsize_(ramsize) + : HostImpl(piface), physical_host_(host_PM), core_amount_(core_amount), ramsize_(ramsize) { /* Register this VM to the list of all VMs */ allVms_.push_back(piface); @@ -168,7 +171,7 @@ VirtualMachineImpl::VirtualMachineImpl(simgrid::s4u::VirtualMachine* piface, sim * The value for GUESTOS_NOISE corresponds to the cost of the global action associated to the VM. It corresponds to * the cost of a VM running no tasks. */ - action_ = host_PM->pimpl_cpu->execution_start(0, core_amount); + action_ = physical_host_->pimpl_cpu->execution_start(0, core_amount_); // It's empty for now, so it should not request resources in the PM update_action_weight(); @@ -200,16 +203,16 @@ void VirtualMachineImpl::suspend(smx_actor_t issuer) throw VmFailureException(XBT_THROW_POINT, xbt::string_printf("Actor %s cannot suspend the VM %s in which it runs", issuer->get_cname(), piface_->get_cname())); - XBT_DEBUG("suspend VM(%s), where %zu processes exist", piface_->get_cname(), process_list_.size()); + XBT_DEBUG("suspend VM(%s), where %zu actors exist", piface_->get_cname(), get_actor_count()); action_->suspend(); - for (auto& smx_process : process_list_) { - XBT_DEBUG("suspend %s", smx_process.get_cname()); - smx_process.suspend(); - } + foreach_actor([](auto& actor) { + XBT_DEBUG("suspend %s", actor.get_cname()); + actor.suspend(); + }); - XBT_DEBUG("suspend all processes on the VM done done"); + XBT_DEBUG("suspend all actors on the VM done done"); vm_state_ = s4u::VirtualMachine::state::SUSPENDED; } @@ -220,14 +223,14 @@ void VirtualMachineImpl::resume() throw VmFailureException(XBT_THROW_POINT, xbt::string_printf("Cannot resume VM %s: it was not suspended", piface_->get_cname())); - XBT_DEBUG("Resume VM %s, containing %zu processes.", piface_->get_cname(), process_list_.size()); + XBT_DEBUG("Resume VM %s, containing %zu actors.", piface_->get_cname(), get_actor_count()); action_->resume(); - for (auto& smx_process : process_list_) { - XBT_DEBUG("resume %s", smx_process.get_cname()); - smx_process.resume(); - } + foreach_actor([](auto& actor) { + XBT_DEBUG("resume %s", actor.get_cname()); + actor.resume(); + }); vm_state_ = s4u::VirtualMachine::state::RUNNING; } @@ -242,7 +245,7 @@ void VirtualMachineImpl::resume() void VirtualMachineImpl::shutdown(smx_actor_t issuer) { if (get_state() != s4u::VirtualMachine::state::RUNNING) { - const char* stateName = "(unknown state)"; + const char* stateName; switch (get_state()) { case s4u::VirtualMachine::state::CREATED: stateName = "created, but not yet started"; @@ -259,13 +262,13 @@ void VirtualMachineImpl::shutdown(smx_actor_t issuer) XBT_VERB("Shutting down the VM %s even if it's not running but %s", piface_->get_cname(), stateName); } - XBT_DEBUG("shutdown VM %s, that contains %zu processes", piface_->get_cname(), process_list_.size()); + XBT_DEBUG("shutdown VM %s, that contains %zu actors", piface_->get_cname(), get_actor_count()); - for (auto& smx_process : process_list_) { - XBT_DEBUG("kill %s@%s on behalf of %s which shutdown that VM.", smx_process.get_cname(), - smx_process.get_host()->get_cname(), issuer->get_cname()); - issuer->kill(&smx_process); - } + foreach_actor([issuer](auto& actor) { + XBT_DEBUG("kill %s@%s on behalf of %s which shutdown that VM.", actor.get_cname(), actor.get_host()->get_cname(), + issuer->get_cname()); + issuer->kill(&actor); + }); set_state(s4u::VirtualMachine::state::DESTROYED); @@ -283,14 +286,16 @@ void VirtualMachineImpl::set_physical_host(s4u::Host* destination) std::string pm_name_dst = destination->get_name(); /* update net_elm with that of the destination physical host */ - piface_->pimpl_netpoint = destination->pimpl_netpoint; + piface_->set_netpoint(destination->get_netpoint()); + + /* Adapt the speed, pstate and other physical characteristics to the one of our new physical CPU */ + piface_->pimpl_cpu->reset_vcpu(destination->pimpl_cpu); physical_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(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()); @@ -313,14 +318,16 @@ void VirtualMachineImpl::set_physical_host(s4u::Host* destination) void VirtualMachineImpl::set_bound(double bound) { user_bound_ = bound; + action_->set_user_bound(user_bound_); update_action_weight(); } -void VirtualMachineImpl::update_action_weight(){ +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); @@ -330,5 +337,5 @@ void VirtualMachineImpl::update_action_weight(){ action_->set_bound(std::min(impact * physical_host_->get_speed(), user_bound_)); } -} -} +} // namespace vm +} // namespace simgrid