X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ac8eac49ab6fe99c58ace8411b9c378d70bb4915..a6957f33a8f941b49d923e43675d50fe2671a554:/src/plugins/vm/s4u_VirtualMachine.cpp diff --git a/src/plugins/vm/s4u_VirtualMachine.cpp b/src/plugins/vm/s4u_VirtualMachine.cpp index e5b209e456..a3c9efdf07 100644 --- a/src/plugins/vm/s4u_VirtualMachine.cpp +++ b/src/plugins/vm/s4u_VirtualMachine.cpp @@ -1,59 +1,57 @@ -/* Copyright (c) 2015-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2015-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 "simgrid/s4u/Actor.hpp" -#include "src/instr/instr_private.hpp" +#include "simgrid/vm.h" #include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/plugins/vm/VmHostExt.hpp" #include "src/simix/smx_host_private.hpp" #include "src/surf/cpu_cas01.hpp" -#include -#include XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_vm, "S4U virtual machines"); -simgrid::xbt::signal simgrid::s4u::VirtualMachine::onVmShutdown; namespace simgrid { namespace s4u { - -VirtualMachine::VirtualMachine(const char* name, s4u::Host* pm, int coreAmount) - : VirtualMachine(name, pm, coreAmount, 1024) +simgrid::xbt::signal VirtualMachine::on_start; +simgrid::xbt::signal VirtualMachine::on_started; +simgrid::xbt::signal VirtualMachine::on_shutdown; +simgrid::xbt::signal VirtualMachine::on_suspend; +simgrid::xbt::signal VirtualMachine::on_resume; + +VirtualMachine::VirtualMachine(const char* name, s4u::Host* physical_host, int core_amount) + : VirtualMachine(name, physical_host, core_amount, 1024) { } -VirtualMachine::VirtualMachine(const char* name, s4u::Host* pm, int coreAmount, size_t ramsize) - : Host(name), pimpl_vm_(new vm::VirtualMachineImpl(this, pm, coreAmount, ramsize)) +VirtualMachine::VirtualMachine(const char* name, s4u::Host* physical_host, int core_amount, size_t ramsize) + : Host(name), pimpl_vm_(new vm::VirtualMachineImpl(this, physical_host, core_amount, ramsize)) { XBT_DEBUG("Create VM %s", name); /* Currently, a VM uses the network resource of its physical host */ - pimpl_netpoint = pm->pimpl_netpoint; + pimpl_netpoint = physical_host->pimpl_netpoint; + // Create a VCPU for this VM - surf::CpuCas01* sub_cpu = dynamic_cast(pm->pimpl_cpu); + std::vector speeds; + for (int i = 0; i < physical_host->get_pstate_count(); i++) + speeds.push_back(physical_host->getPstateSpeed(i)); - pimpl_cpu = surf_cpu_model_vm->createCpu(this, sub_cpu->getSpeedPeakList(), coreAmount); - if (sub_cpu->getPState() != 0) - pimpl_cpu->setPState(sub_cpu->getPState()); + surf_cpu_model_vm->create_cpu(this, &speeds, physical_host->get_core_count()); + if (physical_host->get_pstate() != 0) + set_pstate(physical_host->get_pstate()); /* Make a process container */ extension_set(new simgrid::simix::Host()); - - if (TRACE_vm_is_enabled()) { - container_t host_container = instr::Container::byName(pm->getName()); - new instr::Container(name, "MSG_VM", host_container); - instr::Container::byName(getName())->getState("MSG_VM_STATE")->addEntityValue("start", "0 0 1"); // start is blue - instr::Container::byName(getName())->getState("MSG_VM_STATE")->addEntityValue("suspend", "1 0 0"); // suspend is red - } } VirtualMachine::~VirtualMachine() { - onDestruction(*this); + on_destruction(*this); - XBT_DEBUG("destroy %s", getCname()); + XBT_DEBUG("destroy %s", get_cname()); /* FIXME: this is really strange that everything fails if the next line is removed. * This is as if we shared these data with the PM, which definitely should not be the case... @@ -65,70 +63,62 @@ VirtualMachine::~VirtualMachine() /* Don't free these things twice: they are the ones of my physical host */ pimpl_netpoint = nullptr; - - if (TRACE_vm_is_enabled()) - simgrid::instr::Container::byName(getName())->removeFromParent(); } void VirtualMachine::start() { - if (TRACE_vm_is_enabled()) - simgrid::instr::Container::byName(getName())->getState("MSG_VM_STATE")->pushEvent("start"); + on_start(*this); - simgrid::simix::kernelImmediate([this]() { + simgrid::simix::simcall([this]() { simgrid::vm::VmHostExt::ensureVmExtInstalled(); - simgrid::s4u::Host* pm = this->pimpl_vm_->getPm(); + simgrid::s4u::Host* pm = this->pimpl_vm_->get_physical_host(); if (pm->extension() == nullptr) pm->extension_set(new simgrid::vm::VmHostExt()); long pm_ramsize = pm->extension()->ramsize; int pm_overcommit = pm->extension()->overcommit; - long vm_ramsize = this->getRamsize(); + long vm_ramsize = this->get_ramsize(); if (pm_ramsize && not pm_overcommit) { /* Only verify that we don't overcommit on need */ /* Retrieve the memory occupied by the VMs on that host. Yep, we have to traverse all VMs of all hosts for that */ long total_ramsize_of_vms = 0; for (simgrid::s4u::VirtualMachine* const& ws_vm : simgrid::vm::VirtualMachineImpl::allVms_) - if (pm == ws_vm->getPm()) - total_ramsize_of_vms += ws_vm->getRamsize(); + if (pm == ws_vm->get_pm()) + total_ramsize_of_vms += ws_vm->get_ramsize(); if (vm_ramsize > pm_ramsize - total_ramsize_of_vms) { - XBT_WARN("cannnot start %s@%s due to memory shortage: vm_ramsize %ld, free %ld, pm_ramsize %ld (bytes).", - this->getCname(), pm->getCname(), vm_ramsize, pm_ramsize - total_ramsize_of_vms, pm_ramsize); - THROWF(vm_error, 0, "Memory shortage on host '%s', VM '%s' cannot be started", pm->getCname(), - this->getCname()); + XBT_WARN("cannot start %s@%s due to memory shortage: vm_ramsize %ld, free %ld, pm_ramsize %ld (bytes).", + this->get_cname(), pm->get_cname(), vm_ramsize, pm_ramsize - total_ramsize_of_vms, pm_ramsize); + THROWF(vm_error, 0, "Memory shortage on host '%s', VM '%s' cannot be started", pm->get_cname(), + this->get_cname()); } } - this->pimpl_vm_->setState(SURF_VM_STATE_RUNNING); + this->pimpl_vm_->set_state(SURF_VM_STATE_RUNNING); }); - if (TRACE_vm_is_enabled()) - simgrid::instr::Container::byName(getName())->getState("MSG_VM_STATE")->popEvent(); + on_started(*this); } void VirtualMachine::suspend() { + on_suspend(*this); smx_actor_t issuer = SIMIX_process_self(); - simgrid::simix::kernelImmediate([this, issuer]() { pimpl_vm_->suspend(issuer); }); - if (TRACE_vm_is_enabled()) - simgrid::instr::Container::byName(getName())->getState("MSG_VM_STATE")->pushEvent("suspend"); - XBT_DEBUG("vm_suspend done"); + simgrid::simix::simcall([this, issuer]() { pimpl_vm_->suspend(issuer); }); } void VirtualMachine::resume() { pimpl_vm_->resume(); - if (TRACE_vm_is_enabled()) - simgrid::instr::Container::byName(getName())->getState("MSG_VM_STATE")->popEvent(); + on_resume(*this); } void VirtualMachine::shutdown() { smx_actor_t issuer = SIMIX_process_self(); - simgrid::simix::kernelImmediate([this, issuer]() { pimpl_vm_->shutdown(issuer); }); - onVmShutdown(this); + simgrid::simix::simcall([this, issuer]() { pimpl_vm_->shutdown(issuer); }); + on_shutdown(*this); } void VirtualMachine::destroy() @@ -140,29 +130,29 @@ void VirtualMachine::destroy() Host::destroy(); } -simgrid::s4u::Host* VirtualMachine::getPm() +simgrid::s4u::Host* VirtualMachine::get_pm() { - return pimpl_vm_->getPm(); + return pimpl_vm_->get_physical_host(); } -void VirtualMachine::setPm(simgrid::s4u::Host* pm) +void VirtualMachine::set_pm(simgrid::s4u::Host* pm) { - simgrid::simix::kernelImmediate([this, pm]() { pimpl_vm_->setPm(pm); }); + simgrid::simix::simcall([this, pm]() { pimpl_vm_->set_physical_host(pm); }); } e_surf_vm_state_t VirtualMachine::getState() { - return simgrid::simix::kernelImmediate([this]() { return pimpl_vm_->getState(); }); + return simgrid::simix::simcall([this]() { return pimpl_vm_->get_state(); }); } -size_t VirtualMachine::getRamsize() +size_t VirtualMachine::get_ramsize() { - return pimpl_vm_->getRamsize(); + return pimpl_vm_->get_ramsize(); } -void VirtualMachine::setRamsize(size_t ramsize) +void VirtualMachine::set_ramsize(size_t ramsize) { - pimpl_vm_->setRamsize(ramsize); + pimpl_vm_->set_ramsize(ramsize); } /** @brief Set a CPU bound for a given VM. * @ingroup msg_VMs @@ -190,9 +180,9 @@ void VirtualMachine::setRamsize(size_t ramsize) * 2. Note that bound == 0 means no bound (i.e., unlimited). But, if a host has multiple CPU cores, the CPU share of a * computation task (or a VM) never exceeds the capacity of a CPU core. */ -void VirtualMachine::setBound(double bound) +void VirtualMachine::set_bound(double bound) { - simgrid::simix::kernelImmediate([this, bound]() { pimpl_vm_->setBound(bound); }); + simgrid::simix::simcall([this, bound]() { pimpl_vm_->set_bound(bound); }); } } // namespace simgrid @@ -200,7 +190,6 @@ void VirtualMachine::setBound(double bound) /* **************************** Public C interface *************************** */ -SG_BEGIN_DECL() /** @brief Create a new VM object with the default parameters * A VM is treated as a host. The name of the VM must be unique among all hosts. */ @@ -221,28 +210,28 @@ sg_vm_t sg_vm_create_multicore(sg_host_t pm, const char* name, int coreAmount) const char* sg_vm_get_name(sg_vm_t vm) { - return vm->getCname(); + return vm->get_cname(); } /** @brief Get the physical host of a given VM. */ sg_host_t sg_vm_get_pm(sg_vm_t vm) { - return vm->getPm(); + return vm->get_pm(); } void sg_vm_set_ramsize(sg_vm_t vm, size_t size) { - vm->setRamsize(size); + vm->set_ramsize(size); } size_t sg_vm_get_ramsize(sg_vm_t vm) { - return vm->getRamsize(); + return vm->get_ramsize(); } void sg_vm_set_bound(sg_vm_t vm, double bound) { - vm->setBound(bound); + vm->set_bound(bound); } /** @brief Returns whether the given VM has just created, not running. */ @@ -306,5 +295,3 @@ void sg_vm_destroy(sg_vm_t vm) { vm->destroy(); } - -SG_END_DECL()