X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5a1c4c690d9181a576844f90b6a50c75caf5f3c1..856f8fd502384979b5029aa67d026df79e5c6d70:/src/plugins/vm/VirtualMachineImpl.cpp diff --git a/src/plugins/vm/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp index a678568321..9e7fa1e32f 100644 --- a/src/plugins/vm/VirtualMachineImpl.cpp +++ b/src/plugins/vm/VirtualMachineImpl.cpp @@ -1,12 +1,13 @@ -/* Copyright (c) 2013-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2013-2018. 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 "src/include/surf/surf.hpp" #include "src/simix/ActorImpl.hpp" -#include "src/simix/smx_host_private.h" +#include "src/simix/smx_host_private.hpp" +#include "xbt/asserts.h" // xbt_log_no_loc XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_vm, surf, "Logging specific to the SURF VM module"); @@ -22,15 +23,12 @@ void surf_vm_model_init_HL13() namespace simgrid { namespace vm { - /************* * Callbacks * *************/ - -simgrid::xbt::signal onVmCreation; -simgrid::xbt::signal onVmDestruction; -simgrid::xbt::signal onVmStateChange; - +simgrid::xbt::signal VirtualMachineImpl::on_creation; +simgrid::xbt::signal VirtualMachineImpl::on_destruction; +simgrid::xbt::signal VirtualMachineImpl::on_state_change; /********* * Model * *********/ @@ -38,11 +36,30 @@ simgrid::xbt::signal onVmStateChange; std::deque VirtualMachineImpl::allVms_; /* In the real world, processes on the guest operating system will be somewhat degraded due to virtualization overhead. - * The total CPU share these processes get is smaller than that of the VM process gets on a host operating system. */ -// const double virt_overhead = 0.95; -const double virt_overhead = 1; + * The total CPU share these processes get is smaller than that of the VM process gets on a host operating system. + * FIXME: add a configuration flag for this + */ +const double virt_overhead = 1; // 0.95 + +static void hostStateChange(s4u::Host& host) +{ + if (host.is_off()) { // just turned off. + std::vector trash; + /* Find all VMs living on that host */ + for (s4u::VirtualMachine* const& vm : VirtualMachineImpl::allVms_) + if (vm->get_pm() == &host) + trash.push_back(vm); + for (s4u::VirtualMachine* vm : trash) + vm->shutdown(); + } +} -double VMModel::nextOccuringEvent(double now) +VMModel::VMModel() +{ + s4u::Host::on_state_change.connect(hostStateChange); +} + +double VMModel::next_occuring_event(double now) { /* TODO: update action's cost with the total cost of processes on the VM. */ @@ -65,137 +82,100 @@ double VMModel::nextOccuringEvent(double now) * * Equation 1 was solved in the physical machine layer. * Equation 2 is solved in the virtual machine layer (here). - * X1 must be passed to the virtual machine laye as a constraint value. + * X1 must be passed to the virtual machine layer as a constraint value. **/ /* iterate for all virtual machines */ - for (s4u::VirtualMachine* ws_vm : VirtualMachineImpl::allVms_) { + for (s4u::VirtualMachine* const& ws_vm : VirtualMachineImpl::allVms_) { surf::Cpu* cpu = ws_vm->pimpl_cpu; - xbt_assert(cpu, "cpu-less host"); - double solved_value = ws_vm->pimpl_vm_->action_->getVariable()->value; - XBT_DEBUG("assign %f to vm %s @ pm %s", solved_value, ws_vm->cname(), ws_vm->pimpl_vm_->getPm()->cname()); + 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 + XBT_DEBUG("assign %f to vm %s @ pm %s", solved_value, ws_vm->get_cname(), ws_vm->get_pm()->get_cname()); - // TODO: check lmm_update_constraint_bound() works fine instead of the below manual substitution. - // cpu_cas01->constraint->bound = solved_value; - xbt_assert(cpu->model() == surf_cpu_model_vm); - lmm_system_t vcpu_system = cpu->model()->getMaxminSystem(); - lmm_update_constraint_bound(vcpu_system, cpu->constraint(), virt_overhead * solved_value); + 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. */ - adjustWeightOfDummyCpuActions(); + ignore_empty_vm_in_pm_LMM(); - /* 3. Ready. Get the next occuring event */ - return surf_cpu_model_vm->nextOccuringEvent(now); + /* 3. Ready. Get the next occurring event */ + return surf_cpu_model_vm->next_occuring_event(now); } /************ * Resource * ************/ -VirtualMachineImpl::VirtualMachineImpl(simgrid::s4u::VirtualMachine* piface, simgrid::s4u::Host* host_PM) - : HostImpl(piface), hostPM_(host_PM) +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), ramsize_(ramsize) { /* Register this VM to the list of all VMs */ 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); - - /* Initialize the VM parameters */ - params_.ramsize = 0; + action_ = host_PM->pimpl_cpu->execution_start(0, core_amount); - XBT_VERB("Create VM(%s)@PM(%s)", piface->cname(), hostPM_->cname()); + XBT_VERB("Create VM(%s)@PM(%s)", piface->get_cname(), physical_host_->get_cname()); + on_creation(this); } -extern "C" int - xbt_log_no_loc; /* ugly pimpl to ensure that the debug info in the known issue below don't break the test */ /** @brief A physical host does not disappear in the current SimGrid code, but a VM may disappear during a simulation */ VirtualMachineImpl::~VirtualMachineImpl() { - onVmDestruction(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()) allVms_.erase(iter); - /* dirty page tracking */ - unsigned int size = xbt_dict_size(dp_objs); - static bool already_warned = false; - if (size > 0 && not already_warned) { - xbt_dict_cursor_t cursor = nullptr; - xbt_dict_cursor_first(dp_objs, &cursor); - XBT_WARN("Dirty page tracking: %u pending task(s) on a destroyed VM (first one is %s).\n" - "If you don't understand why your task was not properly removed, please report that bug.\n" - "This is a known bug if you turned the host off during the VM execution.\n" - "Please remind us of that problem at some point: our code base is not ready to fix this harmless issue in " - "2016, sorry.", - size, (xbt_log_no_loc ? "(name hidden)" : xbt_dict_cursor_get_key(cursor))); - xbt_dict_cursor_free(&cursor); - already_warned = true; - } - xbt_dict_free(&dp_objs); - /* Free the cpu_action of the VM. */ - XBT_ATTRIB_UNUSED int ret = action_->unref(); - xbt_assert(ret == 1, "Bug: some resource still remains"); -} - -e_surf_vm_state_t VirtualMachineImpl::getState() -{ - return vmState_; + XBT_ATTRIB_UNUSED bool ret = action_->unref(); + xbt_assert(ret, "Bug: some resource still remains"); } -void VirtualMachineImpl::setState(e_surf_vm_state_t state) -{ - vmState_ = state; -} void VirtualMachineImpl::suspend(smx_actor_t issuer) { - if (isMigrating) - THROWF(vm_error, 0, "Cannot suspend VM '%s': it is migrating", piface_->cname()); - if (getState() != SURF_VM_STATE_RUNNING) - THROWF(vm_error, 0, "Cannot suspend VM %s: it is not running.", piface_->cname()); - if (issuer->host == piface_) - THROWF(vm_error, 0, "Actor %s cannot suspend the VM %s in which it runs", issuer->cname(), piface_->cname()); + 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()); - xbt_swag_t process_list = piface_->extension()->process_list; - XBT_DEBUG("suspend VM(%s), where %d processes exist", piface_->cname(), xbt_swag_size(process_list)); + XBT_DEBUG("suspend VM(%s), where %zu processes exist", piface_->get_cname(), process_list.size()); action_->suspend(); - smx_actor_t smx_process; - smx_actor_t smx_process_safe; - xbt_swag_foreach_safe(smx_process, smx_process_safe, process_list) { - XBT_DEBUG("suspend %s", smx_process->name.c_str()); - SIMIX_process_suspend(smx_process, issuer); + for (auto& smx_process : process_list) { + XBT_DEBUG("suspend %s", smx_process.get_cname()); + smx_process.suspend(issuer); } XBT_DEBUG("suspend all processes on the VM done done"); - vmState_ = SURF_VM_STATE_SUSPENDED; + vm_state_ = s4u::VirtualMachine::state::SUSPENDED; } void VirtualMachineImpl::resume() { - if (getState() != SURF_VM_STATE_SUSPENDED) - THROWF(vm_error, 0, "Cannot resume VM %s: it was not suspended", piface_->cname()); + if (get_state() != s4u::VirtualMachine::state::SUSPENDED) + THROWF(vm_error, 0, "Cannot resume VM %s: it was not suspended", piface_->get_cname()); - xbt_swag_t process_list = piface_->extension()->process_list; - XBT_DEBUG("Resume VM %s, containing %d processes.", piface_->cname(), xbt_swag_size(process_list)); + XBT_DEBUG("Resume VM %s, containing %zu processes.", piface_->get_cname(), process_list.size()); action_->resume(); - smx_actor_t smx_process; - smx_actor_t smx_process_safe; - xbt_swag_foreach_safe(smx_process, smx_process_safe, process_list) { - XBT_DEBUG("resume %s", smx_process->cname()); - SIMIX_process_resume(smx_process); + for (auto& smx_process : process_list) { + XBT_DEBUG("resume %s", smx_process.get_cname()); + smx_process.resume(); } - vmState_ = SURF_VM_STATE_RUNNING; + vm_state_ = s4u::VirtualMachine::state::RUNNING; } /** @brief Power off a VM. @@ -207,102 +187,80 @@ void VirtualMachineImpl::resume() */ void VirtualMachineImpl::shutdown(smx_actor_t issuer) { - if (getState() != SURF_VM_STATE_RUNNING) { + if (get_state() != s4u::VirtualMachine::state::RUNNING) { const char* stateName = "(unknown state)"; - switch (getState()) { - case SURF_VM_STATE_CREATED: + switch (get_state()) { + case s4u::VirtualMachine::state::CREATED: stateName = "created, but not yet started"; break; - case SURF_VM_STATE_SUSPENDED: + case s4u::VirtualMachine::state::SUSPENDED: stateName = "suspended"; break; - case SURF_VM_STATE_DESTROYED: + case s4u::VirtualMachine::state::DESTROYED: stateName = "destroyed"; break; - case SURF_VM_STATE_RUNNING: + default: /* SURF_VM_STATE_RUNNING or unexpected values */ THROW_IMPOSSIBLE; break; } - XBT_VERB("Shuting down the VM %s even if it's not running but %s", piface_->cname(), stateName); + XBT_VERB("Shutting down the VM %s even if it's not running but %s", piface_->get_cname(), stateName); } - xbt_swag_t process_list = piface_->extension()->process_list; - XBT_DEBUG("shutdown VM %s, that contains %d processes", piface_->cname(), xbt_swag_size(process_list)); + XBT_DEBUG("shutdown VM %s, that contains %zu processes", piface_->get_cname(), process_list.size()); - smx_actor_t smx_process; - smx_actor_t smx_process_safe; - xbt_swag_foreach_safe(smx_process, smx_process_safe, process_list) { - XBT_DEBUG("kill %s", smx_process->cname()); - SIMIX_process_kill(smx_process, issuer); + 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); } - setState(SURF_VM_STATE_DESTROYED); + set_state(s4u::VirtualMachine::state::DESTROYED); /* FIXME: we may have to do something at the surf layer, e.g., vcpu action */ } -/** @brief returns the physical machine on which the VM is running **/ -s4u::Host* VirtualMachineImpl::getPm() -{ - return hostPM_; -} - /** @brief Change the physical host on which the given VM is running * * This is an instantaneous migration. */ -void VirtualMachineImpl::setPm(s4u::Host* destination) +void VirtualMachineImpl::set_physical_host(s4u::Host* destination) { - const char* vm_name = piface_->cname(); - const char* pm_name_src = hostPM_->cname(); - const char* pm_name_dst = destination->cname(); + const char* vm_name = piface_->get_cname(); + const char* pm_name_src = physical_host_->get_cname(); + const char* pm_name_dst = destination->get_cname(); /* update net_elm with that of the destination physical host */ piface_->pimpl_netpoint = destination->pimpl_netpoint; - hostPM_ = destination; + 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)); + surf::CpuAction* new_cpu_action = + static_cast(destination->pimpl_cpu->execution_start(0, this->core_amount_)); - if (action_->getRemainsNoUpdate() > 0) - XBT_CRITICAL("FIXME: need copy the state(?), %f", action_->getRemainsNoUpdate()); + if (action_->get_remains_no_update() > 0) + XBT_CRITICAL("FIXME: need copy the state(?), %f", action_->get_remains_no_update()); /* keep the bound value of the cpu action of the VM. */ - double old_bound = action_->getBound(); + 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); - new_cpu_action->setBound(old_bound); + new_cpu_action->set_bound(old_bound); } - XBT_ATTRIB_UNUSED int ret = action_->unref(); - xbt_assert(ret == 1, "Bug: some resource still remains"); + XBT_ATTRIB_UNUSED bool ret = action_->unref(); + xbt_assert(ret, "Bug: some resource still remains"); action_ = new_cpu_action; XBT_DEBUG("migrate VM(%s): change PM (%s to %s)", vm_name, pm_name_src, pm_name_dst); } -sg_size_t VirtualMachineImpl::getRamsize() +void VirtualMachineImpl::set_bound(double bound) { - return params_.ramsize; + action_->set_bound(bound); } -void VirtualMachineImpl::setBound(double bound) -{ - action_->setBound(bound); -} - -void VirtualMachineImpl::getParams(vm_params_t params) -{ - *params = params_; -} - -void VirtualMachineImpl::setParams(vm_params_t params) -{ - /* may check something here. */ - params_ = *params; -} } }