X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/88fad0aaff9eb463f048bfdfe4ad6218aba44ddb..856f8fd502384979b5029aa67d026df79e5c6d70:/src/plugins/vm/VirtualMachineImpl.cpp diff --git a/src/plugins/vm/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp index 6eeac3dc51..9e7fa1e32f 100644 --- a/src/plugins/vm/VirtualMachineImpl.cpp +++ b/src/plugins/vm/VirtualMachineImpl.cpp @@ -4,10 +4,10 @@ * 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.hpp" - -#include // xbt_log_no_loc +#include "xbt/asserts.h" // xbt_log_no_loc XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_vm, surf, "Logging specific to the SURF VM module"); @@ -21,17 +21,14 @@ void surf_vm_model_init_HL13() } } - +namespace simgrid { +namespace vm { /************* * Callbacks * *************/ - -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 { +simgrid::xbt::signal VirtualMachineImpl::on_creation; +simgrid::xbt::signal VirtualMachineImpl::on_destruction; +simgrid::xbt::signal VirtualMachineImpl::on_state_change; /********* * Model * *********/ @@ -46,19 +43,20 @@ const double virt_overhead = 1; // 0.95 static void hostStateChange(s4u::Host& host) { - if (host.isOff()) { // just turned off. + 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->getPm() == &host) + if (vm->get_pm() == &host) trash.push_back(vm); for (s4u::VirtualMachine* vm : trash) vm->shutdown(); } } + VMModel::VMModel() { - s4u::Host::onStateChange.connect(hostStateChange); + s4u::Host::on_state_change.connect(hostStateChange); } double VMModel::next_occuring_event(double now) @@ -90,20 +88,19 @@ 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; - xbt_assert(cpu, "cpu-less host"); double solved_value = - ws_vm->getImpl()->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->getCname(), ws_vm->getPm()->getCname()); + 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()); - xbt_assert(cpu->model() == surf_cpu_model_vm); - kernel::lmm::System* vcpu_system = cpu->model()->get_maxmin_system(); - vcpu_system->update_constraint_bound(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. */ - ignoreEmptyVmInPmLMM(); + ignore_empty_vm_in_pm_LMM(); /* 3. Ready. Get the next occurring event */ return surf_cpu_model_vm->next_occuring_event(now); @@ -114,82 +111,71 @@ double VMModel::next_occuring_event(double now) ************/ 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) + 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, coreAmount); + action_ = host_PM->pimpl_cpu->execution_start(0, core_amount); - XBT_VERB("Create VM(%s)@PM(%s)", piface->getCname(), hostPM_->getCname()); - onVmCreation(this); + XBT_VERB("Create VM(%s)@PM(%s)", piface->get_cname(), physical_host_->get_cname()); + on_creation(this); } /** @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); /* 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_; -} - -void VirtualMachineImpl::setState(e_surf_vm_state_t state) -{ - vmState_ = state; + XBT_ATTRIB_UNUSED bool ret = action_->unref(); + xbt_assert(ret, "Bug: some resource still remains"); } void VirtualMachineImpl::suspend(smx_actor_t issuer) { - 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()); + 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()); - auto& process_list = piface_->extension()->process_list; - XBT_DEBUG("suspend VM(%s), where %zu processes exist", piface_->getCname(), process_list.size()); + XBT_DEBUG("suspend VM(%s), where %zu processes exist", piface_->get_cname(), process_list.size()); action_->suspend(); for (auto& smx_process : process_list) { - XBT_DEBUG("suspend %s", smx_process.name.c_str()); + 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_->getCname()); + if (get_state() != s4u::VirtualMachine::state::SUSPENDED) + THROWF(vm_error, 0, "Cannot resume VM %s: it was not suspended", piface_->get_cname()); - auto& process_list = piface_->extension()->process_list; - XBT_DEBUG("Resume VM %s, containing %zu processes.", piface_->getCname(), process_list.size()); + XBT_DEBUG("Resume VM %s, containing %zu processes.", piface_->get_cname(), process_list.size()); action_->resume(); for (auto& smx_process : process_list) { - XBT_DEBUG("resume %s", smx_process.getCname()); + 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. @@ -201,64 +187,57 @@ 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; default: /* SURF_VM_STATE_RUNNING or unexpected values */ THROW_IMPOSSIBLE; break; } - XBT_VERB("Shutting down the VM %s even if it's not running but %s", piface_->getCname(), stateName); + XBT_VERB("Shutting down the VM %s even if it's not running but %s", piface_->get_cname(), stateName); } - auto& process_list = piface_->extension()->process_list; - XBT_DEBUG("shutdown VM %s, that contains %zu processes", piface_->getCname(), process_list.size()); + XBT_DEBUG("shutdown VM %s, that contains %zu processes", piface_->get_cname(), process_list.size()); 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()); + 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_->getCname(); - const char* pm_name_src = hostPM_->getCname(); - const char* pm_name_dst = destination->getCname(); + 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, this->coreAmount_)); + 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()); @@ -270,15 +249,15 @@ void VirtualMachineImpl::setPm(s4u::Host* destination) 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); } -void VirtualMachineImpl::setBound(double bound) +void VirtualMachineImpl::set_bound(double bound) { action_->set_bound(bound); }