X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b92fdaa931223de8404c999f3381b09ceabb8b74..5e7d79b763a5f55d1afb579d2b5a8d30ccfe869c:/src/plugins/vm/VirtualMachineImpl.cpp diff --git a/src/plugins/vm/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp index a5d3272ed3..da17d4a188 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/simix/ActorImpl.hpp" -#include "src/simix/smx_host_private.h" +#include "src/simix/smx_host_private.hpp" + +#include // xbt_log_no_loc XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_vm, surf, "Logging specific to the SURF VM module"); @@ -20,17 +21,17 @@ 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 simgrid::vm::VirtualMachineImpl::onVmCreation; +simgrid::xbt::signal simgrid::vm::VirtualMachineImpl::onVmDestruction; +simgrid::xbt::signal simgrid::vm::VirtualMachineImpl::onVmStateChange; +namespace simgrid { +namespace vm { /********* * Model * *********/ @@ -38,9 +39,27 @@ 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.isOff()) { // just turned off. + std::vector trash; + /* Find all VMs living on that host */ + for (s4u::VirtualMachine* const& vm : VirtualMachineImpl::allVms_) + if (vm->getPm() == &host) + trash.push_back(vm); + for (s4u::VirtualMachine* vm : trash) + vm->shutdown(); + } +} +VMModel::VMModel() +{ + s4u::Host::onStateChange.connect(hostStateChange); +} double VMModel::nextOccuringEvent(double now) { @@ -65,28 +84,27 @@ 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->getImpl()->action_->getVariable()->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->getCname(), ws_vm->getPm()->getCname()); - // 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); + kernel::lmm::System* vcpu_system = cpu->model()->getMaxminSystem(); + vcpu_system->update_constraint_bound(cpu->constraint(), virt_overhead * solved_value); } /* 2. Calculate resource share at the virtual machine layer. */ - adjustWeightOfDummyCpuActions(); + ignoreEmptyVmInPmLMM(); - /* 3. Ready. Get the next occuring event */ + /* 3. Ready. Get the next occurring event */ return surf_cpu_model_vm->nextOccuringEvent(now); } @@ -94,24 +112,21 @@ double VMModel::nextOccuringEvent(double 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 coreAmount, size_t ramsize) + : HostImpl(piface), hostPM_(host_PM), coreAmount_(coreAmount), 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); + action_ = host_PM->pimpl_cpu->execution_start(0, coreAmount); - /* Initialize the VM parameters */ - params_.ramsize = 0; - - XBT_VERB("Create VM(%s)@PM(%s)", piface->cname(), hostPM_->cname()); + XBT_VERB("Create VM(%s)@PM(%s)", piface->getCname(), hostPM_->getCname()); + onVmCreation(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() { @@ -121,23 +136,6 @@ VirtualMachineImpl::~VirtualMachineImpl() 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"); @@ -152,25 +150,22 @@ 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()); + THROWF(vm_error, 0, "Cannot suspend VM %s: it is not running.", piface_->getCname()); if (issuer->host == piface_) - THROWF(vm_error, 0, "Actor %s cannot suspend the VM %s in which it runs", issuer->cname(), piface_->cname()); + THROWF(vm_error, 0, "Actor %s cannot suspend the VM %s in which it runs", issuer->getCname(), piface_->getCname()); - 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)); + auto& process_list = piface_->extension()->process_list; + XBT_DEBUG("suspend VM(%s), where %zu processes exist", piface_->getCname(), 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.name.c_str()); + smx_process.suspend(issuer); } XBT_DEBUG("suspend all processes on the VM done done"); @@ -181,18 +176,16 @@ void VirtualMachineImpl::suspend(smx_actor_t issuer) void VirtualMachineImpl::resume() { if (getState() != SURF_VM_STATE_SUSPENDED) - THROWF(vm_error, 0, "Cannot resume VM %s: it was not suspended", piface_->cname()); + THROWF(vm_error, 0, "Cannot resume VM %s: it was not suspended", piface_->getCname()); - xbt_swag_t process_list = piface_->extension()->process_list; - XBT_DEBUG("Resume VM %s, containing %d processes.", piface_->cname(), xbt_swag_size(process_list)); + auto& process_list = piface_->extension()->process_list; + XBT_DEBUG("Resume VM %s, containing %zu processes.", piface_->getCname(), 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.getCname()); + smx_process.resume(); } vmState_ = SURF_VM_STATE_RUNNING; @@ -223,17 +216,16 @@ void VirtualMachineImpl::shutdown(smx_actor_t issuer) 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_->getCname(), 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)); + auto& process_list = piface_->extension()->process_list; + XBT_DEBUG("shutdown VM %s, that contains %zu processes", piface_->getCname(), 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.getCname(), + smx_process.host->getCname(), issuer->getCname()); + SIMIX_process_kill(&smx_process, issuer); } setState(SURF_VM_STATE_DESTROYED); @@ -253,9 +245,9 @@ s4u::Host* VirtualMachineImpl::getPm() */ void VirtualMachineImpl::setPm(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_->getCname(); + const char* pm_name_src = hostPM_->getCname(); + const char* pm_name_dst = destination->getCname(); /* update net_elm with that of the destination physical host */ piface_->pimpl_netpoint = destination->pimpl_netpoint; @@ -264,16 +256,17 @@ void VirtualMachineImpl::setPm(s4u::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->coreAmount_)); - 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(); @@ -284,25 +277,10 @@ void VirtualMachineImpl::setPm(s4u::Host* destination) XBT_DEBUG("migrate VM(%s): change PM (%s to %s)", vm_name, pm_name_src, pm_name_dst); } -sg_size_t VirtualMachineImpl::getRamsize() -{ - return params_.ramsize; -} - void VirtualMachineImpl::setBound(double bound) { - action_->setBound(bound); -} - -void VirtualMachineImpl::getParams(vm_params_t params) -{ - *params = params_; + action_->set_bound(bound); } -void VirtualMachineImpl::setParams(vm_params_t params) -{ - /* may check something here. */ - params_ = *params; -} } }