X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/67fe7b9d6c00b390a8598bc1e72d42d8343cb218..15846f15348dff76e73e1a99dee9f2a706cb85d8:/src/plugins/vm/s4u_VirtualMachine.cpp diff --git a/src/plugins/vm/s4u_VirtualMachine.cpp b/src/plugins/vm/s4u_VirtualMachine.cpp index 6f0dbe580b..3cf72b4112 100644 --- a/src/plugins/vm/s4u_VirtualMachine.cpp +++ b/src/plugins/vm/s4u_VirtualMachine.cpp @@ -1,14 +1,14 @@ -/* Copyright (c) 2015-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2015-2019. 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/Exception.hpp" #include "simgrid/s4u/Actor.hpp" #include "simgrid/vm.h" #include "src/include/surf/surf.hpp" #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" XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_vm, "S4U virtual machines"); @@ -16,23 +16,26 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_vm, "S4U virtual machines"); namespace simgrid { namespace s4u { -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; -simgrid::xbt::signal VirtualMachine::on_migration_start; -simgrid::xbt::signal VirtualMachine::on_migration_end; - -VirtualMachine::VirtualMachine(const char* name, s4u::Host* physical_host, int core_amount) +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; +simgrid::xbt::signal VirtualMachine::on_migration_start; +simgrid::xbt::signal VirtualMachine::on_migration_end; + +VirtualMachine::VirtualMachine(const std::string& name, s4u::Host* physical_host, int core_amount) : VirtualMachine(name, physical_host, core_amount, 1024) { } -VirtualMachine::VirtualMachine(const char* name, s4u::Host* physical_host, int core_amount, size_t ramsize) +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_DEBUG("Create VM %s", name); + // 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; @@ -42,7 +45,7 @@ VirtualMachine::VirtualMachine(const char* name, s4u::Host* physical_host, int c for (int i = 0; i < physical_host->get_pstate_count(); i++) speeds.push_back(physical_host->get_pstate_speed(i)); - surf_cpu_model_vm->create_cpu(this, &speeds, physical_host->get_core_count()); + surf_cpu_model_vm->create_cpu(this, speeds, core_amount); if (physical_host->get_pstate() != 0) set_pstate(physical_host->get_pstate()); } @@ -61,7 +64,7 @@ void VirtualMachine::start() { on_start(*this); - simgrid::simix::simcall([this]() { + simgrid::kernel::actor::simcall([this]() { simgrid::vm::VmHostExt::ensureVmExtInstalled(); simgrid::s4u::Host* pm = this->pimpl_vm_->get_physical_host(); @@ -82,8 +85,9 @@ void VirtualMachine::start() if (vm_ramsize > pm_ramsize - total_ramsize_of_vms) { 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()); + throw VmFailureException(XBT_THROW_POINT, + xbt::string_printf("Memory shortage on host '%s', VM '%s' cannot be started", + pm->get_cname(), this->get_cname())); } } @@ -97,7 +101,7 @@ void VirtualMachine::suspend() { on_suspend(*this); smx_actor_t issuer = SIMIX_process_self(); - simgrid::simix::simcall([this, issuer]() { pimpl_vm_->suspend(issuer); }); + simgrid::kernel::actor::simcall([this, issuer]() { pimpl_vm_->suspend(issuer); }); } void VirtualMachine::resume() @@ -109,7 +113,7 @@ void VirtualMachine::resume() void VirtualMachine::shutdown() { smx_actor_t issuer = SIMIX_process_self(); - simgrid::simix::simcall([this, issuer]() { pimpl_vm_->shutdown(issuer); }); + simgrid::kernel::actor::simcall([this, issuer]() { pimpl_vm_->shutdown(issuer); }); on_shutdown(*this); } @@ -129,12 +133,12 @@ simgrid::s4u::Host* VirtualMachine::get_pm() void VirtualMachine::set_pm(simgrid::s4u::Host* pm) { - simgrid::simix::simcall([this, pm]() { pimpl_vm_->set_physical_host(pm); }); + simgrid::kernel::actor::simcall([this, pm]() { pimpl_vm_->set_physical_host(pm); }); } VirtualMachine::state VirtualMachine::get_state() { - return simgrid::simix::simcall([this]() { return pimpl_vm_->get_state(); }); + return simgrid::kernel::actor::simcall([this]() { return pimpl_vm_->get_state(); }); } size_t VirtualMachine::get_ramsize() @@ -174,7 +178,7 @@ void VirtualMachine::set_ramsize(size_t ramsize) */ void VirtualMachine::set_bound(double bound) { - simgrid::simix::simcall([this, bound]() { pimpl_vm_->set_bound(bound); }); + simgrid::kernel::actor::simcall([this, bound]() { pimpl_vm_->set_bound(bound); }); } } // namespace simgrid @@ -194,9 +198,6 @@ sg_vm_t sg_vm_create_core(sg_host_t pm, const char* name) */ sg_vm_t sg_vm_create_multicore(sg_host_t pm, const char* name, int coreAmount) { - 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); }