X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b88233071eaaef45c854e84a8c7b460ab5793b7d..32dfd65da61704d4f0f7c5e5c91978489c046f33:/src/plugins/vm/VirtualMachineImpl.cpp diff --git a/src/plugins/vm/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp index 3f32d02a9c..3ba0c8d363 100644 --- a/src/plugins/vm/VirtualMachineImpl.cpp +++ b/src/plugins/vm/VirtualMachineImpl.cpp @@ -1,32 +1,53 @@ -/* Copyright (c) 2013-2018. 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. */ #include "src/plugins/vm/VirtualMachineImpl.hpp" +#include "simgrid/Exception.hpp" +#include "simgrid/kernel/routing/NetZoneImpl.hpp" +#include "simgrid/s4u/Engine.hpp" +#include "simgrid/s4u/Exec.hpp" +#include "simgrid/sg_config.hpp" #include "src/include/surf/surf.hpp" -#include "src/simix/ActorImpl.hpp" -#include "src/simix/smx_host_private.hpp" -#include "xbt/asserts.h" // xbt_log_no_loc +#include "src/kernel/EngineImpl.hpp" +#include "src/kernel/activity/ExecImpl.hpp" +#include "src/surf/cpu_cas01.hpp" +#include "src/surf/cpu_ti.hpp" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_vm, surf, "Logging specific to the SURF VM module"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_vm, ker_resource, "Virtual Machines, containing actors and mobile accross hosts"); -simgrid::vm::VMModel* surf_vm_model = nullptr; - -void surf_vm_model_init_HL13() +void surf_vm_model_init_HL13(simgrid::kernel::resource::CpuModel* cpu_pm_model) { - if (surf_cpu_model_vm != nullptr) - surf_vm_model = new simgrid::vm::VMModel(); + auto vm_model = std::make_shared(); + vm_model->set_name("VM_HL13"); + + simgrid::kernel::EngineImpl::get_instance()->add_model(vm_model, {cpu_pm_model}); + std::shared_ptr cpu_model_vm; + + auto cpu_optim = simgrid::config::get_value("cpu/optim"); + if (cpu_optim == "TI") { + cpu_model_vm = std::make_shared(); + cpu_model_vm->set_name("VmCpu_TI"); + } else { + cpu_model_vm = std::make_shared(); + cpu_model_vm->set_name("VmCpu_Cas01"); + } + simgrid::kernel::EngineImpl::get_instance()->add_model(cpu_model_vm, {cpu_pm_model, vm_model.get()}); + simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_cpu_vm_model(cpu_model_vm); } namespace simgrid { + +template class xbt::Extendable; + namespace vm { /************* * Callbacks * *************/ -simgrid::xbt::signal VirtualMachineImpl::on_creation; -simgrid::xbt::signal VirtualMachineImpl::on_destruction; -simgrid::xbt::signal VirtualMachineImpl::on_state_change; +xbt::signal VirtualMachineImpl::on_creation; +xbt::signal VirtualMachineImpl::on_destruction; + /********* * Model * *********/ @@ -39,9 +60,9 @@ std::deque VirtualMachineImpl::allVms_; */ const double virt_overhead = 1; // 0.95 -static void hostStateChange(s4u::Host& host) +static void host_state_change(s4u::Host const& host) { - if (host.is_off()) { // just turned off. + if (not host.is_on()) { // just turned off. std::vector trash; /* Find all VMs living on that host */ for (s4u::VirtualMachine* const& vm : VirtualMachineImpl::allVms_) @@ -52,13 +73,62 @@ static void hostStateChange(s4u::Host& host) } } +static void add_active_exec(s4u::Exec const& task) +{ + const s4u::VirtualMachine* vm = dynamic_cast(task.get_host()); + if (vm != nullptr) { + VirtualMachineImpl* vm_impl = vm->get_impl(); + vm_impl->add_active_exec(); + vm_impl->update_action_weight(); + } +} + +static void remove_active_exec(s4u::Exec const& task) +{ + const s4u::VirtualMachine* vm = dynamic_cast(task.get_host()); + if (vm != nullptr) { + VirtualMachineImpl* vm_impl = vm->get_impl(); + vm_impl->remove_active_exec(); + vm_impl->update_action_weight(); + } +} + +static s4u::VirtualMachine* get_vm_from_activity(kernel::activity::ActivityImpl const& act) +{ + auto* exec = dynamic_cast(&act); + return exec != nullptr ? dynamic_cast(exec->get_host()) : nullptr; +} + +static void add_active_activity(kernel::activity::ActivityImpl const& act) +{ + const s4u::VirtualMachine* vm = get_vm_from_activity(act); + if (vm != nullptr) { + 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) +{ + const s4u::VirtualMachine* vm = get_vm_from_activity(act); + if (vm != nullptr) { + 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(hostStateChange); + 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); + kernel::activity::ActivityImpl::on_resumed.connect(add_active_activity); + 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. */ @@ -86,23 +156,20 @@ double VMModel::next_occuring_event(double now) /* iterate for all virtual machines */ for (s4u::VirtualMachine* const& ws_vm : VirtualMachineImpl::allVms_) { - surf::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. Calculate resource share at the virtual machine layer. */ - ignore_empty_vm_in_pm_LMM(); - - /* 3. 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; } /************ @@ -117,17 +184,23 @@ VirtualMachineImpl::VirtualMachineImpl(simgrid::s4u::VirtualMachine* piface, sim allVms_.push_back(piface); /* We create cpu_action corresponding to a VM process on the host operating system. */ - /* TODO: we have to periodically input GUESTOS_NOISE to the system? how ? */ - action_ = host_PM->pimpl_cpu->execution_start(0, core_amount); + /* TODO: we have to periodically input GUESTOS_NOISE to the system? how ? + * 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_ = 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(); XBT_VERB("Create VM(%s)@PM(%s)", piface->get_cname(), physical_host_->get_cname()); - on_creation(this); + on_creation(*this); } /** @brief A physical host does not disappear in the current SimGrid code, but a VM may disappear during a simulation */ VirtualMachineImpl::~VirtualMachineImpl() { - on_destruction(this); + on_destruction(*this); /* I was already removed from the allVms set if the VM was destroyed cleanly */ auto iter = find(allVms_.begin(), allVms_.end(), piface_); if (iter != allVms_.end()) @@ -141,21 +214,22 @@ VirtualMachineImpl::~VirtualMachineImpl() void VirtualMachineImpl::suspend(smx_actor_t issuer) { if (get_state() != s4u::VirtualMachine::state::RUNNING) - THROWF(vm_error, 0, "Cannot suspend VM %s: it is not running.", piface_->get_cname()); - if (issuer->host_ == piface_) - THROWF(vm_error, 0, "Actor %s cannot suspend the VM %s in which it runs", issuer->get_cname(), - piface_->get_cname()); + throw VmFailureException(XBT_THROW_POINT, + xbt::string_printf("Cannot suspend VM %s: it is not running.", piface_->get_cname())); + if (issuer->get_host() == piface_) + 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(issuer); - } + 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; } @@ -163,16 +237,17 @@ void VirtualMachineImpl::suspend(smx_actor_t issuer) void VirtualMachineImpl::resume() { if (get_state() != s4u::VirtualMachine::state::SUSPENDED) - THROWF(vm_error, 0, "Cannot resume VM %s: it was not suspended", piface_->get_cname()); + 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; } @@ -187,7 +262,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"; @@ -200,18 +275,17 @@ void VirtualMachineImpl::shutdown(smx_actor_t issuer) break; default: /* SURF_VM_STATE_RUNNING or unexpected values */ THROW_IMPOSSIBLE; - break; } 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.host_->get_cname(), issuer->get_cname()); - SIMIX_process_kill(&smx_process, issuer); - } + 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); @@ -224,19 +298,21 @@ void VirtualMachineImpl::shutdown(smx_actor_t issuer) */ void VirtualMachineImpl::set_physical_host(s4u::Host* destination) { - const char* vm_name = piface_->get_cname(); - const char* pm_name_src = physical_host_->get_cname(); - const char* pm_name_dst = destination->get_cname(); + std::string vm_name = piface_->get_name(); + std::string pm_name_src = physical_host_->get_name(); + 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. */ - surf::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()); @@ -244,7 +320,7 @@ void VirtualMachineImpl::set_physical_host(s4u::Host* destination) /* keep the bound value of the cpu action of the VM. */ double old_bound = action_->get_bound(); if (old_bound > 0) { - XBT_DEBUG("migrate VM(%s): set bound (%f) at %s", vm_name, old_bound, pm_name_dst); + XBT_DEBUG("migrate VM(%s): set bound (%f) at %s", vm_name.c_str(), old_bound, pm_name_dst.c_str()); new_cpu_action->set_bound(old_bound); } @@ -253,13 +329,30 @@ void VirtualMachineImpl::set_physical_host(s4u::Host* destination) action_ = new_cpu_action; - XBT_DEBUG("migrate VM(%s): change PM (%s to %s)", vm_name, pm_name_src, pm_name_dst); + XBT_DEBUG("migrate VM(%s): change PM (%s to %s)", vm_name.c_str(), pm_name_src.c_str(), pm_name_dst.c_str()); } void VirtualMachineImpl::set_bound(double bound) { - action_->set_bound(bound); + user_bound_ = bound; + action_->set_user_bound(user_bound_); + 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_execs_, get_core_amount()); + + 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); + else + action_->set_sharing_penalty(0.); + + action_->set_bound(std::min(impact * physical_host_->get_speed(), user_bound_)); } -} + +} // namespace vm +} // namespace simgrid