Cannot destroy iface before impl.

[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 4b966f794d5cda950558ac85be9092b9031224e6..88d7f498b90a488638f7967c2a25eafd731774b6 100644 (file)
--- a/src/plugins/vm/s4u_VirtualMachine.cpp
+++ b/src/plugins/vm/s4u_VirtualMachine.cpp
@@ -30,7 +30,7 @@ VirtualMachine::VirtualMachine(const std::string& name, s4u::Host* physical_host
 }
 
 VirtualMachine::VirtualMachine(const std::string& name, s4u::Host* physical_host, int core_amount, size_t ramsize)
-    : Host(name, new vm::VirtualMachineImpl(name, this, physical_host, core_amount, ramsize))
+    : Host(new vm::VirtualMachineImpl(name, this, physical_host, core_amount, ramsize))
     , pimpl_vm_(dynamic_cast<vm::VirtualMachineImpl*>(Host::get_impl()))
 {
   XBT_DEBUG("Create VM %s", get_cname());
@@ -49,20 +49,17 @@ VirtualMachine::VirtualMachine(const std::string& name, s4u::Host* physical_host
       ->create_cpu(this, speeds)
       ->set_core_count(core_amount)
       ->seal();
+
   if (physical_host->get_pstate() != 0)
     set_pstate(physical_host->get_pstate());
 
-  // Real hosts are (only) created through NetZone::create_host(), and this where the on_creation signal is fired.
-  // VMs are created directly, thus firing the signal here. The right solution is probably to separate Host and VM.
-  simgrid::s4u::Host::on_creation(*this);
+  seal(); // seal this host
 }
 
 VirtualMachine::~VirtualMachine()
 {
   on_destruction(*this);
 
-  XBT_DEBUG("destroy %s", get_cname());
-
   /* Don't free these things twice: they are the ones of my physical host */
   set_netpoint(nullptr);
 }
@@ -129,9 +126,13 @@ void VirtualMachine::destroy()
   /* First, terminate all processes on the VM if necessary */
   shutdown();
 
+  XBT_DEBUG("destroy %s", get_cname());
+
   /* Then, destroy the VM object */
-  get_impl()->destroy();
-  delete this;
+  kernel::actor::simcall([this]() {
+    get_impl()->destroy();
+    delete this;
+  });
 }
 
 simgrid::s4u::Host* VirtualMachine::get_pm() const