X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/daf48de02c5ddf826a62409660b93eaaeaa7006b..db5adf7439201fb67d1d697b86806d58ace9fe85:/src/plugins/vm/s4u_VirtualMachine.cpp diff --git a/src/plugins/vm/s4u_VirtualMachine.cpp b/src/plugins/vm/s4u_VirtualMachine.cpp index 7dd96b893a..8c3963ad60 100644 --- a/src/plugins/vm/s4u_VirtualMachine.cpp +++ b/src/plugins/vm/s4u_VirtualMachine.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2015-2020. 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. */ @@ -11,8 +11,7 @@ #include "src/plugins/vm/VmHostExt.hpp" #include "src/surf/cpu_cas01.hpp" -XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_vm, "S4U virtual machines"); - +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_vm, s4u, "S4U virtual machines"); namespace simgrid { namespace s4u { @@ -32,13 +31,10 @@ VirtualMachine::VirtualMachine(const std::string& name, s4u::Host* physical_host VirtualMachine::VirtualMachine(const std::string& 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_assert(s4u::Host::by_name(name) == nullptr, - // "Cannot create a VM named %s: this name is already used by a host or a VM", get_cname()); - XBT_DEBUG("Create VM %s", get_cname()); /* Currently, a VM uses the network resource of its physical host */ - pimpl_netpoint = physical_host->pimpl_netpoint; + set_netpoint(physical_host->get_netpoint()); // Create a VCPU for this VM std::vector speeds; @@ -48,6 +44,10 @@ VirtualMachine::VirtualMachine(const std::string& name, s4u::Host* physical_host surf_cpu_model_vm->create_cpu(this, speeds, core_amount); if (physical_host->get_pstate() != 0) set_pstate(physical_host->get_pstate()); + + // Real hosts are (only) created through NetZone::create_host(), and this where the on_creation signal is fired. + // VMs are created directly, thus firing the signal here. The right solution is probably to separate Host and VM. + simgrid::s4u::Host::on_creation(*this); } VirtualMachine::~VirtualMachine() @@ -57,28 +57,28 @@ VirtualMachine::~VirtualMachine() XBT_DEBUG("destroy %s", get_cname()); /* Don't free these things twice: they are the ones of my physical host */ - pimpl_netpoint = nullptr; + set_netpoint(nullptr); } void VirtualMachine::start() { on_start(*this); - simgrid::simix::simcall([this]() { - simgrid::vm::VmHostExt::ensureVmExtInstalled(); + kernel::actor::simcall([this]() { + vm::VmHostExt::ensureVmExtInstalled(); - simgrid::s4u::Host* pm = this->pimpl_vm_->get_physical_host(); - if (pm->extension() == nullptr) - pm->extension_set(new simgrid::vm::VmHostExt()); + Host* pm = this->pimpl_vm_->get_physical_host(); + if (pm->extension() == nullptr) + pm->extension_set(new vm::VmHostExt()); - long pm_ramsize = pm->extension()->ramsize; - int pm_overcommit = pm->extension()->overcommit; + long pm_ramsize = pm->extension()->ramsize; + int pm_overcommit = pm->extension()->overcommit; 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_) + for (VirtualMachine* const& ws_vm : vm::VirtualMachineImpl::allVms_) if (pm == ws_vm->get_pm()) total_ramsize_of_vms += ws_vm->get_ramsize(); @@ -100,8 +100,8 @@ void VirtualMachine::start() void VirtualMachine::suspend() { on_suspend(*this); - smx_actor_t issuer = SIMIX_process_self(); - simgrid::simix::simcall([this, issuer]() { pimpl_vm_->suspend(issuer); }); + kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self(); + kernel::actor::simcall([this, issuer]() { pimpl_vm_->suspend(issuer); }); } void VirtualMachine::resume() @@ -112,8 +112,8 @@ void VirtualMachine::resume() void VirtualMachine::shutdown() { - smx_actor_t issuer = SIMIX_process_self(); - simgrid::simix::simcall([this, issuer]() { pimpl_vm_->shutdown(issuer); }); + kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self(); + kernel::actor::simcall([this, issuer]() { pimpl_vm_->shutdown(issuer); }); on_shutdown(*this); } @@ -126,29 +126,31 @@ void VirtualMachine::destroy() Host::destroy(); } -simgrid::s4u::Host* VirtualMachine::get_pm() +simgrid::s4u::Host* VirtualMachine::get_pm() const { return pimpl_vm_->get_physical_host(); } -void VirtualMachine::set_pm(simgrid::s4u::Host* pm) +VirtualMachine* VirtualMachine::set_pm(simgrid::s4u::Host* pm) { - simgrid::simix::simcall([this, pm]() { pimpl_vm_->set_physical_host(pm); }); + kernel::actor::simcall([this, pm]() { pimpl_vm_->set_physical_host(pm); }); + return this; } VirtualMachine::state VirtualMachine::get_state() { - return simgrid::simix::simcall([this]() { return pimpl_vm_->get_state(); }); + return kernel::actor::simcall([this]() { return pimpl_vm_->get_state(); }); } -size_t VirtualMachine::get_ramsize() +size_t VirtualMachine::get_ramsize() const { return pimpl_vm_->get_ramsize(); } -void VirtualMachine::set_ramsize(size_t ramsize) +VirtualMachine* VirtualMachine::set_ramsize(size_t ramsize) { pimpl_vm_->set_ramsize(ramsize); + return this; } /** @brief Set a CPU bound for a given VM. * @ingroup msg_VMs @@ -176,9 +178,10 @@ void VirtualMachine::set_ramsize(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::set_bound(double bound) +VirtualMachine* VirtualMachine::set_bound(double bound) { - simgrid::simix::simcall([this, bound]() { pimpl_vm_->set_bound(bound); }); + kernel::actor::simcall([this, bound]() { pimpl_vm_->set_bound(bound); }); + return this; } } // namespace simgrid @@ -201,13 +204,13 @@ sg_vm_t sg_vm_create_multicore(sg_host_t pm, const char* name, int coreAmount) return new simgrid::s4u::VirtualMachine(name, pm, coreAmount); } -const char* sg_vm_get_name(sg_vm_t vm) +const char* sg_vm_get_name(const_sg_vm_t vm) { return vm->get_cname(); } /** @brief Get the physical host of a given VM. */ -sg_host_t sg_vm_get_pm(sg_vm_t vm) +sg_host_t sg_vm_get_pm(const_sg_vm_t vm) { return vm->get_pm(); } @@ -217,7 +220,7 @@ void sg_vm_set_ramsize(sg_vm_t vm, size_t size) vm->set_ramsize(size); } -size_t sg_vm_get_ramsize(sg_vm_t vm) +size_t sg_vm_get_ramsize(const_sg_vm_t vm) { return vm->get_ramsize(); } @@ -274,9 +277,14 @@ void sg_vm_resume(sg_vm_t vm) } /** @brief Immediately kills all processes within the given VM. - * Any memory that they allocated will be leaked, unless you used #MSG_process_on_exit(). * - * No extra delay occurs. If you want to simulate this too, you want to use a #MSG_process_sleep(). + @beginrst + + The memory allocated by these actors is leaked, unless you used :cpp:func:`simgrid::s4u::Actor::on_exit`. + + @endrst + * + * No extra delay occurs by default. You may let your actor sleep by a specific amount to simulate any extra delay that you want. */ void sg_vm_shutdown(sg_vm_t vm) {