X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/98a7e16b0620dead1ef3f21792ce9f917b4ece58..7c480b01951b33f03d72ede0a47a45a88bd40b61:/src/plugins/vm/s4u_VirtualMachine.cpp?ds=sidebyside diff --git a/src/plugins/vm/s4u_VirtualMachine.cpp b/src/plugins/vm/s4u_VirtualMachine.cpp index 197e4dd71b..5dfaf837c6 100644 --- a/src/plugins/vm/s4u_VirtualMachine.cpp +++ b/src/plugins/vm/s4u_VirtualMachine.cpp @@ -1,4 +1,4 @@ -/* 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. */ @@ -9,15 +9,18 @@ #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, 0) + : VirtualMachine(name, pm, coreAmount, 1024) { } @@ -38,9 +41,11 @@ VirtualMachine::VirtualMachine(const char* name, s4u::Host* pm, int coreAmount, /* Make a process container */ extension_set(new simgrid::simix::Host()); - if (TRACE_msg_vm_is_enabled()) { - container_t host_container = simgrid::instr::Container::byName(pm->getName()); - new simgrid::instr::Container(name, "MSG_VM", host_container); + 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 } } @@ -60,10 +65,16 @@ 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"); + simgrid::simix::kernelImmediate([this]() { simgrid::vm::VmHostExt::ensureVmExtInstalled(); @@ -79,8 +90,8 @@ void VirtualMachine::start() /* 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->pimpl_vm_->getPm()) - total_ramsize_of_vms += ws_vm->pimpl_vm_->getRamsize(); + if (pm == ws_vm->getPm()) + total_ramsize_of_vms += ws_vm->getRamsize(); 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).", @@ -92,29 +103,41 @@ void VirtualMachine::start() this->pimpl_vm_->setState(SURF_VM_STATE_RUNNING); }); + + if (TRACE_vm_is_enabled()) + simgrid::instr::Container::byName(getName())->getState("MSG_VM_STATE")->popEvent(); } void VirtualMachine::suspend() { 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"); } void VirtualMachine::resume() { pimpl_vm_->resume(); + if (TRACE_vm_is_enabled()) + simgrid::instr::Container::byName(getName())->getState("MSG_VM_STATE")->popEvent(); } void VirtualMachine::shutdown() { smx_actor_t issuer = SIMIX_process_self(); simgrid::simix::kernelImmediate([this, issuer]() { pimpl_vm_->shutdown(issuer); }); + onVmShutdown(this); } -bool VirtualMachine::isMigrating() +void VirtualMachine::destroy() { - return pimpl_vm_ && pimpl_vm_->isMigrating; + /* First, terminate all processes on the VM if necessary */ + shutdown(); + + /* Then, destroy the VM object */ + Host::destroy(); } simgrid::s4u::Host* VirtualMachine::getPm() @@ -129,7 +152,7 @@ void VirtualMachine::setPm(simgrid::s4u::Host* pm) e_surf_vm_state_t VirtualMachine::getState() { - return pimpl_vm_->getState(); + return simgrid::simix::kernelImmediate([this]() { return pimpl_vm_->getState(); }); } size_t VirtualMachine::getRamsize() @@ -171,17 +194,117 @@ void VirtualMachine::setBound(double bound) { simgrid::simix::kernelImmediate([this, bound]() { pimpl_vm_->setBound(bound); }); } -/** @brief Retrieve a copy of the parameters of that VM/PM - * @details The ramsize and overcommit fields are used on the PM too */ -void VirtualMachine::getParameters(vm_params_t params) + +} // namespace simgrid +} // namespace s4u + +/* **************************** 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. + */ +sg_vm_t sg_vm_create_core(sg_host_t pm, const char* name) { - pimpl_vm_->getParams(params); + return sg_vm_create_multicore(pm, name, 1); } -/** @brief Sets the params of that VM/PM */ -void VirtualMachine::setParameters(vm_params_t params) +/** @brief Create a new VM object with the default parameters, but with a specified amount of cores + * A VM is treated as a host. The name of the VM must be unique among all hosts. + */ +sg_vm_t sg_vm_create_multicore(sg_host_t pm, const char* name, int coreAmount) { - simgrid::simix::kernelImmediate([this, params] { pimpl_vm_->setParams(params); }); + xbt_assert(sg_host_by_name(name) == nullptr, + "Cannot create a VM named %s: this name is already used by an host or a VM", name); + + return new simgrid::s4u::VirtualMachine(name, pm, coreAmount); } -} // namespace simgrid -} // namespace s4u +const char* sg_vm_get_name(sg_vm_t vm) +{ + return vm->getCname(); +} + +/** @brief Get the physical host of a given VM. */ +sg_host_t sg_vm_get_pm(sg_vm_t vm) +{ + return vm->getPm(); +} + +void sg_vm_set_ramsize(sg_vm_t vm, size_t size) +{ + vm->setRamsize(size); +} + +size_t sg_vm_get_ramsize(sg_vm_t vm) +{ + return vm->getRamsize(); +} + +void sg_vm_set_bound(sg_vm_t vm, double bound) +{ + vm->setBound(bound); +} + +/** @brief Returns whether the given VM has just created, not running. */ +int sg_vm_is_created(sg_vm_t vm) +{ + return vm->getState() == SURF_VM_STATE_CREATED; +} + +/** @brief Returns whether the given VM is currently running */ +int sg_vm_is_running(sg_vm_t vm) +{ + return vm->getState() == SURF_VM_STATE_RUNNING; +} + +/** @brief Returns whether the given VM is currently suspended, not running. */ +int sg_vm_is_suspended(sg_vm_t vm) +{ + return vm->getState() == SURF_VM_STATE_SUSPENDED; +} + +/** @brief Start a vm (i.e., boot the guest operating system) + * If the VM cannot be started (because of memory over-provisioning), an exception is generated. + */ +void sg_vm_start(sg_vm_t vm) +{ + vm->start(); +} + +/** @brief Immediately suspend the execution of all processes within the given VM. + * + * This function stops the execution of the VM. All the processes on this VM + * will pause. The state of the VM is preserved. We can later resume it again. + * + * No suspension cost occurs. + */ +void sg_vm_suspend(sg_vm_t vm) +{ + vm->suspend(); +} + +/** @brief Resume the execution of the VM. All processes on the VM run again. + * No resume cost occurs. + */ +void sg_vm_resume(sg_vm_t vm) +{ + vm->resume(); +} + +/** @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(). + */ +void sg_vm_shutdown(sg_vm_t vm) +{ + vm->shutdown(); +} + +/** @brief Destroy a VM. Destroy the VM object from the simulation. */ +void sg_vm_destroy(sg_vm_t vm) +{ + vm->destroy(); +} + +SG_END_DECL()