More consistency in resource creation/destruction

[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 4818d15..ce07172 100644 (file)
--- a/src/plugins/vm/s4u_VirtualMachine.cpp
+++ b/src/plugins/vm/s4u_VirtualMachine.cpp
@@ -16,6 +16,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_vm, s4u, "S4U virtual machines");
 
 namespace simgrid {
 namespace s4u {
+simgrid::xbt::signal<void(VirtualMachine&)> VirtualMachine::on_creation;
 simgrid::xbt::signal<void(VirtualMachine const&)> VirtualMachine::on_start;
 simgrid::xbt::signal<void(VirtualMachine const&)> VirtualMachine::on_started;
 simgrid::xbt::signal<void(VirtualMachine const&)> VirtualMachine::on_shutdown;
@@ -23,6 +24,7 @@ simgrid::xbt::signal<void(VirtualMachine const&)> VirtualMachine::on_suspend;
 simgrid::xbt::signal<void(VirtualMachine const&)> VirtualMachine::on_resume;
 simgrid::xbt::signal<void(VirtualMachine const&)> VirtualMachine::on_migration_start;
 simgrid::xbt::signal<void(VirtualMachine const&)> VirtualMachine::on_migration_end;
+simgrid::xbt::signal<void(VirtualMachine const&)> VirtualMachine::on_destruction;
 
 VirtualMachine::VirtualMachine(const std::string& name, s4u::Host* physical_host, int core_amount)
     : VirtualMachine(name, physical_host, core_amount, 1024)
@@ -40,7 +42,7 @@ VirtualMachine::VirtualMachine(const std::string& name, s4u::Host* physical_host
 
   // Create a VCPU for this VM
   std::vector<double> speeds;
-  for (int i = 0; i < physical_host->get_pstate_count(); i++)
+  for (unsigned long i = 0; i < physical_host->get_pstate_count(); i++)
     speeds.push_back(physical_host->get_pstate_speed(i));
 
   physical_host->get_netpoint()
@@ -54,14 +56,7 @@ VirtualMachine::VirtualMachine(const std::string& name, s4u::Host* physical_host
     set_pstate(physical_host->get_pstate());
 
   seal(); // seal this host
-}
-
-VirtualMachine::~VirtualMachine()
-{
-  on_destruction(*this);
-
-  /* Don't free these things twice: they are the ones of my physical host */
-  set_netpoint(nullptr);
+  s4u::VirtualMachine::on_creation(*this);
 }
 
 void VirtualMachine::start()
@@ -127,12 +122,16 @@ void VirtualMachine::destroy()
 
     /* Then, destroy the VM object */
     kernel::actor::simcall([this]() {
+      get_vm_impl()->destroy();
       get_impl()->destroy();
+
+      /* Don't free these things twice: they are the ones of my physical host */
+      set_netpoint(nullptr);
       delete this;
     });
   };
 
-  if (this_actor::get_host() == this) {
+  if (not this_actor::is_maestro() && this_actor::get_host() == this) {
     XBT_VERB("Launch another actor on physical host %s to destroy my own VM: %s", get_pm()->get_cname(), get_cname());
     simgrid::s4u::Actor::create(get_cname() + std::string("-destroy"), get_pm(), destroy_code);
     simgrid::s4u::this_actor::yield();