X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/163f8696544cfc2c11a545b9ed06011903780031..4a8bc21517c2e7759a0036d879338f84ed6bf56e:/src/plugins/vm/s4u_VirtualMachine.cpp diff --git a/src/plugins/vm/s4u_VirtualMachine.cpp b/src/plugins/vm/s4u_VirtualMachine.cpp index 9e892c6e78..2e3a673c1b 100644 --- a/src/plugins/vm/s4u_VirtualMachine.cpp +++ b/src/plugins/vm/s4u_VirtualMachine.cpp @@ -21,16 +21,21 @@ 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) +VirtualMachine::VirtualMachine(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(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 an host or a VM", name.c_str()); + + XBT_DEBUG("Create VM %s", name.c_str()); /* Currently, a VM uses the network resource of its physical host */ pimpl_netpoint = physical_host->pimpl_netpoint; @@ -192,9 +197,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); }