X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/13f164230f8da32094edbe9811a81221454d461b..f9436b840852218b39dce22d6057b6f223168daa:/src/plugins/vm/VirtualMachineImpl.cpp?ds=sidebyside diff --git a/src/plugins/vm/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp index 5c4345ab8c..6b27d8ce5d 100644 --- a/src/plugins/vm/VirtualMachineImpl.cpp +++ b/src/plugins/vm/VirtualMachineImpl.cpp @@ -5,14 +5,9 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "src/plugins/vm/VirtualMachineImpl.hpp" -#include "simgrid/s4u/VirtualMachine.hpp" #include "src/simix/ActorImpl.hpp" #include "src/simix/smx_host_private.h" -#include - -#include "src/surf/cpu_cas01.hpp" - XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_vm, surf, "Logging specific to the SURF VM module"); simgrid::vm::VMModel* surf_vm_model = nullptr; @@ -83,9 +78,9 @@ double VMModel::nextOccuringEvent(double now) // TODO: check lmm_update_constraint_bound() works fine instead of the below manual substitution. // cpu_cas01->constraint->bound = solved_value; - xbt_assert(cpu->getModel() == surf_cpu_model_vm); - lmm_system_t vcpu_system = cpu->getModel()->getMaxminSystem(); - lmm_update_constraint_bound(vcpu_system, cpu->getConstraint(), virt_overhead * 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); } /* 2. Calculate resource share at the virtual machine layer. */ @@ -100,13 +95,13 @@ double VMModel::nextOccuringEvent(double now) ************/ VirtualMachineImpl::VirtualMachineImpl(simgrid::s4u::VirtualMachine* piface, simgrid::s4u::Host* host_PM) - : HostImpl(piface, nullptr /*storage*/), hostPM_(host_PM) + : HostImpl(piface), hostPM_(host_PM) { /* 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. */ - /* FIXME: TODO: we have to periodically input GUESTOS_NOISE to the system? how ? */ + /* TODO: we have to periodically input GUESTOS_NOISE to the system? how ? */ action_ = host_PM->pimpl_cpu->execution_start(0); /* Initialize the VM parameters */ @@ -121,12 +116,15 @@ extern "C" int VirtualMachineImpl::~VirtualMachineImpl() { onVmDestruction(this); - allVms_.erase(find(allVms_.begin(), allVms_.end(), piface_)); + /* 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 && !already_warned) { + 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" @@ -154,65 +152,77 @@ void VirtualMachineImpl::setState(e_surf_vm_state_t state) { vmState_ = state; } -void VirtualMachineImpl::suspend() -{ - action_->suspend(); - vmState_ = SURF_VM_STATE_SUSPENDED; -} - -void VirtualMachineImpl::resume() -{ - action_->resume(); - vmState_ = SURF_VM_STATE_RUNNING; -} - -/** - * @brief Function to save a VM. - * This function is the same as vm_suspend, but the state of the VM is saved to the disk, and not preserved in memory. - * We can later restore it again. - * - * @param vm the vm host to save (a sg_host_t) - */ -void VirtualMachineImpl::save(smx_actor_t issuer) +void VirtualMachineImpl::suspend(smx_actor_t issuer) { if (isMigrating) - THROWF(vm_error, 0, "Cannot save VM %s: it is migrating.", piface_->cname()); - + THROWF(vm_error, 0, "Cannot suspend VM '%s': it is migrating", piface_->cname()); if (getState() != SURF_VM_STATE_RUNNING) - THROWF(vm_error, 0, "Cannot save VM %s: it is not running.", piface_->cname()); + 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()); 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("Save VM %s, where %d processes exist", piface_->cname(), xbt_swag_size(process_list)); - - vmState_ = SURF_VM_STATE_SAVING; action_->suspend(); - vmState_ = SURF_VM_STATE_SAVED; - smx_actor_t smx_process, smx_process_safe; + 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->cname()); + XBT_DEBUG("suspend %s", smx_process->name.c_str()); SIMIX_process_suspend(smx_process, issuer); } + + XBT_DEBUG("suspend all processes on the VM done done"); + + vmState_ = SURF_VM_STATE_SUSPENDED; } -void VirtualMachineImpl::restore() +void VirtualMachineImpl::resume() { - if (getState() != SURF_VM_STATE_SAVED) - THROWF(vm_error, 0, "Cannot restore VM %s: it was not saved", piface_->cname()); + if (getState() != SURF_VM_STATE_SUSPENDED) + THROWF(vm_error, 0, "Cannot resume VM %s: it was not suspended", piface_->cname()); xbt_swag_t process_list = piface_->extension()->process_list; - XBT_DEBUG("Restore VM %s, where %d processes exist", piface_->cname(), xbt_swag_size(process_list)); + XBT_DEBUG("Resume VM %s, containing %d processes.", piface_->cname(), xbt_swag_size(process_list)); - vmState_ = SURF_VM_STATE_RESTORING; action_->resume(); - vmState_ = SURF_VM_STATE_RUNNING; - smx_actor_t smx_process, smx_process_safe; + 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); } + + vmState_ = SURF_VM_STATE_RUNNING; +} + +/** @brief Power off a VM. + * + * All hosted processes will be killed, but the VM state is preserved on memory. + * It can later be restarted. + * + * @param issuer the actor requesting the shutdown + */ +void VirtualMachineImpl::shutdown(smx_actor_t issuer) +{ + if (getState() != SURF_VM_STATE_RUNNING) + THROWF(vm_error, 0, "Cannot shutdown VM %s: it is not running", piface_->cname()); + + 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)); + + 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); + } + + setState(SURF_VM_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 **/ @@ -221,31 +231,31 @@ s4u::Host* VirtualMachineImpl::getPm() return hostPM_; } -/* Update the physical host of the given VM */ -void VirtualMachineImpl::migrate(s4u::Host* host_dest) +/** @brief Change the physical host on which the given VM is running + * + * This is an instantaneous migration. + */ +void VirtualMachineImpl::setPm(s4u::Host* destination) { const char* vm_name = piface_->cname(); const char* pm_name_src = hostPM_->cname(); - const char* pm_name_dst = host_dest->cname(); + const char* pm_name_dst = destination->cname(); /* update net_elm with that of the destination physical host */ - piface_->pimpl_netcard = host_dest->pimpl_netcard; + piface_->pimpl_netpoint = destination->pimpl_netpoint; - hostPM_ = host_dest; + hostPM_ = 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(host_dest->pimpl_cpu->execution_start(0)); + surf::CpuAction* new_cpu_action = static_cast(destination->pimpl_cpu->execution_start(0)); - surf::Action::State state = action_->getState(); - if (state != surf::Action::State::done) - XBT_CRITICAL("FIXME: may need a proper handling, %d", static_cast(state)); if (action_->getRemainsNoUpdate() > 0) XBT_CRITICAL("FIXME: need copy the state(?), %f", action_->getRemainsNoUpdate()); /* keep the bound value of the cpu action of the VM. */ double old_bound = action_->getBound(); - if (old_bound != 0) { + 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); }