X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7bc340a73928fe73a57a9664aeba0cf5a92b654c..5e7d79b763a5f55d1afb579d2b5a8d30ccfe869c:/src/plugins/vm/VirtualMachineImpl.cpp diff --git a/src/plugins/vm/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp index 1a1f03aa08..da17d4a188 100644 --- a/src/plugins/vm/VirtualMachineImpl.cpp +++ b/src/plugins/vm/VirtualMachineImpl.cpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2013-2017. 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. */ @@ -22,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 * *********/ @@ -54,7 +53,7 @@ static void hostStateChange(s4u::Host& host) if (vm->getPm() == &host) trash.push_back(vm); for (s4u::VirtualMachine* vm : trash) - vm->pimpl_vm_->shutdown(SIMIX_process_self()); + vm->shutdown(); } } VMModel::VMModel() @@ -93,12 +92,12 @@ double VMModel::nextOccuringEvent(double now) surf::Cpu* cpu = ws_vm->pimpl_cpu; xbt_assert(cpu, "cpu-less host"); - double solved_value = ws_vm->pimpl_vm_->action_->getVariable()->get_value(); // this is X1 in comment above, what + 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->pimpl_vm_->getPm()->getCname()); + XBT_DEBUG("assign %f to vm %s @ pm %s", solved_value, ws_vm->getCname(), ws_vm->getPm()->getCname()); xbt_assert(cpu->model() == surf_cpu_model_vm); - surf::lmm_system_t vcpu_system = cpu->model()->getMaxminSystem(); + kernel::lmm::System* vcpu_system = cpu->model()->getMaxminSystem(); vcpu_system->update_constraint_bound(cpu->constraint(), virt_overhead * solved_value); } @@ -114,8 +113,8 @@ double VMModel::nextOccuringEvent(double now) ************/ VirtualMachineImpl::VirtualMachineImpl(simgrid::s4u::VirtualMachine* piface, simgrid::s4u::Host* host_PM, - int coreAmount) - : HostImpl(piface), hostPM_(host_PM), coreAmount_(coreAmount) + 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); @@ -124,10 +123,8 @@ VirtualMachineImpl::VirtualMachineImpl(simgrid::s4u::VirtualMachine* piface, sim /* TODO: we have to periodically input GUESTOS_NOISE to the system? how ? */ action_ = host_PM->pimpl_cpu->execution_start(0, coreAmount); - /* Initialize the VM parameters */ - params_.ramsize = 0; - XBT_VERB("Create VM(%s)@PM(%s)", piface->getCname(), hostPM_->getCname()); + onVmCreation(this); } /** @brief A physical host does not disappear in the current SimGrid code, but a VM may disappear during a simulation */ @@ -139,20 +136,6 @@ VirtualMachineImpl::~VirtualMachineImpl() if (iter != allVms_.end()) allVms_.erase(iter); - /* dirty page tracking */ - unsigned int size = dp_objs.size(); - static bool already_warned = false; - if (size > 0 && not already_warned) { - auto front = dp_objs.begin(); - 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)" : front->first.c_str())); - already_warned = true; - } - /* Free the cpu_action of the VM. */ XBT_ATTRIB_UNUSED int ret = action_->unref(); xbt_assert(ret == 1, "Bug: some resource still remains"); @@ -167,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_->getCname()); if (getState() != SURF_VM_STATE_RUNNING) 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->getCname(), piface_->getCname()); - xbt_swag_t process_list = piface_->extension()->process_list; - XBT_DEBUG("suspend VM(%s), where %d processes exist", piface_->getCname(), 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()); - smx_process->suspend(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"); @@ -198,16 +178,14 @@ void VirtualMachineImpl::resume() if (getState() != SURF_VM_STATE_SUSPENDED) 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_->getCname(), 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->getCname()); - smx_process->resume(); + for (auto& smx_process : process_list) { + XBT_DEBUG("resume %s", smx_process.getCname()); + smx_process.resume(); } vmState_ = SURF_VM_STATE_RUNNING; @@ -241,15 +219,13 @@ void VirtualMachineImpl::shutdown(smx_actor_t issuer) 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_->getCname(), 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@%s on behalf of %s which shutdown that VM.", smx_process->getCname(), - smx_process->host->getCname(), issuer->getCname()); - 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); @@ -283,14 +259,14 @@ void VirtualMachineImpl::setPm(s4u::Host* destination) 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(); @@ -301,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; -} } }