X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eadbe829389f23151f79257824f3164d7801bbc7..131ea969cf91c332bd533b7e9d67c729149e9b4d:/src/plugins/vm/VirtualMachineImpl.cpp diff --git a/src/plugins/vm/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp index 912c575dc7..2d79dcbbb6 100644 --- a/src/plugins/vm/VirtualMachineImpl.cpp +++ b/src/plugins/vm/VirtualMachineImpl.cpp @@ -1,12 +1,13 @@ -/* 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. */ #include "src/plugins/vm/VirtualMachineImpl.hpp" +#include "simgrid/Exception.hpp" +#include "simgrid/s4u/Exec.hpp" #include "src/include/surf/surf.hpp" #include "src/kernel/activity/ExecImpl.hpp" -#include "xbt/asserts.h" // xbt_log_no_loc XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_vm, surf, "Logging specific to the SURF VM module"); @@ -19,12 +20,15 @@ void surf_vm_model_init_HL13() } namespace simgrid { + +template class xbt::Extendable; + namespace vm { /************* * Callbacks * *************/ -simgrid::xbt::signal VirtualMachineImpl::on_creation; -simgrid::xbt::signal VirtualMachineImpl::on_destruction; +xbt::signal VirtualMachineImpl::on_creation; +xbt::signal VirtualMachineImpl::on_destruction; /********* * Model * @@ -51,28 +55,48 @@ static void host_state_change(s4u::Host const& host) } } -static s4u::VirtualMachine* get_vm_from_task(kernel::activity::ActivityImpl const& task) +static void add_active_exec(s4u::Actor const&, s4u::Exec const& task) { - auto* exec = dynamic_cast(&task); - return exec != nullptr ? dynamic_cast(exec->host_) : nullptr; + 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 add_active_task(kernel::activity::ActivityImpl const& task) +static void remove_active_exec(s4u::Actor const&, s4u::Exec const& task) { - s4u::VirtualMachine* vm = get_vm_from_task(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->active_tasks_ = vm_impl->active_tasks_ + 1; - vm_impl->update_action_weight(); + vm_impl->add_active_exec(); + vm_impl->update_action_weight(); } } -static void remove_active_task(kernel::activity::ActivityImpl const& task) +static void remove_active_activity(kernel::activity::ActivityImpl const& act) { - s4u::VirtualMachine* vm = get_vm_from_task(task); + 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(); } } @@ -81,13 +105,13 @@ VMModel::VMModel() { all_existing_models.push_back(this); s4u::Host::on_state_change.connect(host_state_change); - kernel::activity::ExecImpl::on_creation.connect(add_active_task); - kernel::activity::ExecImpl::on_completion.connect(remove_active_task); - kernel::activity::ActivityImpl::on_resumed.connect(add_active_task); - kernel::activity::ActivityImpl::on_suspended.connect(remove_active_task); + 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. */ @@ -115,11 +139,10 @@ 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; + 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); @@ -128,7 +151,7 @@ double VMModel::next_occuring_event(double now) } /* 2. Ready. Get the next occurring event */ - return surf_cpu_model_vm->next_occuring_event(now); + return surf_cpu_model_vm->next_occurring_event(now); } /************ @@ -137,7 +160,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); @@ -173,21 +196,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()); + throw VmFailureException(XBT_THROW_POINT, + xbt::string_printf("Cannot suspend VM %s: it is not running.", piface_->get_cname())); if (issuer->get_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("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); + for (auto& actor : actor_list_) { + 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; } @@ -195,15 +219,16 @@ 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(); + for (auto& actor : actor_list_) { + XBT_DEBUG("resume %s", actor.get_cname()); + actor.resume(); } vm_state_ = s4u::VirtualMachine::state::RUNNING; @@ -236,12 +261,12 @@ 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); + for (auto& actor : actor_list_) { + 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); @@ -260,14 +285,14 @@ 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()); 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 = + static_cast(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()); @@ -295,14 +320,14 @@ 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_priority(1. / impact); + action_->set_sharing_penalty(1. / impact); else - action_->set_priority(0.); + action_->set_sharing_penalty(0.); action_->set_bound(std::min(impact * physical_host_->get_speed(), user_bound_)); }