A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
provide a backtrace implementation that uses boost.stacktrace
[simgrid.git]
/
src
/
plugins
/
vm
/
s4u_VirtualMachine.cpp
diff --git
a/src/plugins/vm/s4u_VirtualMachine.cpp
b/src/plugins/vm/s4u_VirtualMachine.cpp
index
9e892c6
..
2e3a673
100644
(file)
--- a/
src/plugins/vm/s4u_VirtualMachine.cpp
+++ b/
src/plugins/vm/s4u_VirtualMachine.cpp
@@
-21,16
+21,21
@@
simgrid::xbt::signal<void(VirtualMachine&)> VirtualMachine::on_started;
simgrid::xbt::signal<void(VirtualMachine&)> VirtualMachine::on_shutdown;
simgrid::xbt::signal<void(VirtualMachine&)> VirtualMachine::on_suspend;
simgrid::xbt::signal<void(VirtualMachine&)> VirtualMachine::on_resume;
simgrid::xbt::signal<void(VirtualMachine&)> VirtualMachine::on_shutdown;
simgrid::xbt::signal<void(VirtualMachine&)> VirtualMachine::on_suspend;
simgrid::xbt::signal<void(VirtualMachine&)> VirtualMachine::on_resume;
+simgrid::xbt::signal<void(VirtualMachine&)> VirtualMachine::on_migration_start;
+simgrid::xbt::signal<void(VirtualMachine&)> 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(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))
{
: 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;
/* 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)
{
*/
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);
}
return new simgrid::s4u::VirtualMachine(name, pm, coreAmount);
}