(hopefully) fix the memory issues in the VMs

[simgrid.git] / src / simix / smx_vm.cpp

diff --git a/src/simix/smx_vm.cpp b/src/simix/smx_vm.cpp
index cd04a97..359286a 100644 (file)
--- a/src/simix/smx_vm.cpp
+++ b/src/simix/smx_vm.cpp
@@ -7,6 +7,7 @@
 #include "simgrid/s4u/VirtualMachine.hpp"
 #include "smx_private.h"
 #include "src/plugins/vm/VirtualMachineImpl.hpp"
+#include "src/plugins/vm/VmHostExt.hpp"
 #include "src/surf/HostImpl.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_vm, simix, "Logging specific to SIMIX Virtual Machines");
@@ -26,10 +27,14 @@ static long host_get_ramsize(sg_host_t vm, int *overcommit)
 /* **** start a VM **** */
 static int __can_be_started(sg_host_t vm)
 {
+  simgrid::vm::VmHostExt::ensureVmExtInstalled();
+
   sg_host_t pm = static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->getPm();
 
   int pm_overcommit = 0;
-  long pm_ramsize = host_get_ramsize(pm, &pm_overcommit);
+  if (pm->extension<simgrid::vm::VmHostExt>() == nullptr)
+    pm->extension_set(new simgrid::vm::VmHostExt());
+  long pm_ramsize = pm->extension<simgrid::vm::VmHostExt>()->ramsize;
   long vm_ramsize = host_get_ramsize(vm, nullptr);
 
   if (!pm_ramsize) {
@@ -67,17 +72,11 @@ static int __can_be_started(sg_host_t vm)
 void SIMIX_vm_start(sg_host_t vm)
 {
   if (__can_be_started(vm))
-    static_cast<simgrid::surf::VirtualMachineImpl*>(vm->pimpl_)->setState(SURF_VM_STATE_RUNNING);
+    static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->setState(SURF_VM_STATE_RUNNING);
   else
     THROWF(vm_error, 0, "The VM %s cannot be started", vm->name().c_str());
 }
 
-
-e_surf_vm_state_t SIMIX_vm_get_state(sg_host_t vm)
-{
-  return static_cast<simgrid::surf::VirtualMachineImpl*>(vm->pimpl_)->getState();
-}
-
 /**
  * @brief Function to migrate a SIMIX VM host.
  *
@@ -86,7 +85,7 @@ e_surf_vm_state_t SIMIX_vm_get_state(sg_host_t vm)
 void SIMIX_vm_migrate(sg_host_t vm, sg_host_t dst_pm)
 {
   /* precopy migration makes the VM temporally paused */
-  xbt_assert(SIMIX_vm_get_state(vm) == SURF_VM_STATE_SUSPENDED);
+  xbt_assert(static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->getState() == SURF_VM_STATE_SUSPENDED);
 
   /* jump to vm_ws_xigrate(). this will update the vm location. */
   static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->migrate(dst_pm);
@@ -101,7 +100,7 @@ void SIMIX_vm_migrate(sg_host_t vm, sg_host_t dst_pm)
  */
 void SIMIX_vm_suspend(sg_host_t vm, smx_actor_t issuer)
 {
-  if (SIMIX_vm_get_state(vm) != SURF_VM_STATE_RUNNING)
+  if (static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->getState() != SURF_VM_STATE_RUNNING)
     THROWF(vm_error, 0, "VM(%s) is not running", vm->name().c_str());
 
   XBT_DEBUG("suspend VM(%s), where %d processes exist", vm->name().c_str(), xbt_swag_size(sg_host_simix(vm)->process_list));
@@ -136,7 +135,7 @@ void simcall_HANDLER_vm_suspend(smx_simcall_t simcall, sg_host_t vm)
  */
 void SIMIX_vm_resume(sg_host_t vm)
 {
-  if (SIMIX_vm_get_state(vm) != SURF_VM_STATE_SUSPENDED)
+  if (static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->getState() != SURF_VM_STATE_SUSPENDED)
     THROWF(vm_error, 0, "VM(%s) was not suspended", vm->name().c_str());
 
   XBT_DEBUG("resume VM(%s), where %d processes exist",
@@ -163,7 +162,7 @@ void SIMIX_vm_save(sg_host_t vm, smx_actor_t issuer)
 {
   const char *name = sg_host_get_name(vm);
 
-  if (SIMIX_vm_get_state(vm) != SURF_VM_STATE_RUNNING)
+  if (static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->getState() != SURF_VM_STATE_RUNNING)
     THROWF(vm_error, 0, "VM(%s) is not running", name);
 
   XBT_DEBUG("save VM(%s), where %d processes exist", name, xbt_swag_size(sg_host_simix(vm)->process_list));
@@ -192,7 +191,7 @@ void simcall_HANDLER_vm_save(smx_simcall_t simcall, sg_host_t vm)
  */
 void SIMIX_vm_shutdown(sg_host_t vm, smx_actor_t issuer)
 {
-  if (SIMIX_vm_get_state(vm) != SURF_VM_STATE_RUNNING)
+  if (static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->getState() != SURF_VM_STATE_RUNNING)
     THROWF(vm_error, 0, "VM(%s) is not running", vm->name().c_str());
 
   XBT_DEBUG("shutdown VM %s, that contains %d processes",
@@ -205,7 +204,7 @@ void SIMIX_vm_shutdown(sg_host_t vm, smx_actor_t issuer)
   }
 
   /* FIXME: we may have to do something at the surf layer, e.g., vcpu action */
-  static_cast<simgrid::surf::VirtualMachineImpl*>(vm->pimpl_)->setState(SURF_VM_STATE_CREATED);
+  static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->setState(SURF_VM_STATE_CREATED);
 }
 
 void simcall_HANDLER_vm_shutdown(smx_simcall_t simcall, sg_host_t vm)