X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e13d26773d3aa31c3d0eb24816470bcf8ccc26c0..0586543235cb7550a5952d01af0d4f656670c622:/src/simix/smx_vm.cpp

diff --git a/src/simix/smx_vm.cpp b/src/simix/smx_vm.cpp
index d1b585fb40..e11f0777d4 100644
--- 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");
@@ -24,66 +25,33 @@ static long host_get_ramsize(sg_host_t vm, int *overcommit)
 }
 
 /* **** start a VM **** */
-static int __can_be_started(sg_host_t vm)
+void SIMIX_vm_start(sg_host_t vm)
 {
   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);
-  long vm_ramsize = host_get_ramsize(vm, nullptr);
+  simgrid::vm::VmHostExt::ensureVmExtInstalled();
+  if (pm->extension<simgrid::vm::VmHostExt>() == nullptr)
+    pm->extension_set(new simgrid::vm::VmHostExt());
 
-  if (!pm_ramsize) {
-    /* We assume users do not want to care about ramsize. */
-    return 1;
-  }
-
-  if (pm_overcommit) {
-    XBT_VERB("%s allows memory overcommit.", sg_host_get_name(pm));
-    return 1;
-  }
+  long pm_ramsize = pm->extension<simgrid::vm::VmHostExt>()->ramsize;
+  int pm_overcommit = pm->extension<simgrid::vm::VmHostExt>()->overcommit;
+  long vm_ramsize = host_get_ramsize(vm, nullptr);
 
-  long total_ramsize_of_vms = 0;
-  xbt_dynar_t dyn_vms       = pm->pimpl_->getVms();
-  {
-    unsigned int cursor = 0;
-    sg_host_t another_vm;
-    xbt_dynar_foreach(dyn_vms, cursor, another_vm) {
-      long another_vm_ramsize = host_get_ramsize(vm, nullptr);
-      total_ramsize_of_vms += another_vm_ramsize;
+  if (pm_ramsize && !pm_overcommit) { /* Only verify that we don't overcommit on need */
+    /* Retrieve the memory occupied by the VMs on that host. Yep, we have to traverse all VMs of all hosts for that */
+    long total_ramsize_of_vms = 0;
+    for (simgrid::surf::VirtualMachineImpl* ws_vm : simgrid::surf::VirtualMachineImpl::allVms_)
+      if (pm == ws_vm->getPm())
+        total_ramsize_of_vms += ws_vm->getRamsize();
+
+    if (vm_ramsize > pm_ramsize - total_ramsize_of_vms) {
+      XBT_WARN("cannnot start %s@%s due to memory shortage: vm_ramsize %ld, free %ld, pm_ramsize %ld (bytes).",
+               sg_host_get_name(vm), sg_host_get_name(pm), vm_ramsize, pm_ramsize - total_ramsize_of_vms, pm_ramsize);
+      THROWF(vm_error, 0, "The VM %s cannot be started", vm->name().c_str());
     }
   }
 
-  if (vm_ramsize > pm_ramsize - total_ramsize_of_vms) {
-    XBT_WARN("cannnot start %s@%s due to memory shortage: vm_ramsize %ld, free %ld, pm_ramsize %ld (bytes).",
-        sg_host_get_name(vm), sg_host_get_name(pm),
-        vm_ramsize, pm_ramsize - total_ramsize_of_vms, pm_ramsize);
-    xbt_dynar_free(&dyn_vms);
-    return 0;
-  }
-
-  return 1;
-}
-
-void SIMIX_vm_start(sg_host_t vm)
-{
-  if (__can_be_started(vm))
-    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());
-}
-
-/**
- * @brief Function to migrate a SIMIX VM host.
- *
- * @param host the vm host to migrate (a sg_host_t)
- */
-void SIMIX_vm_migrate(sg_host_t vm, sg_host_t dst_pm)
-{
-  /* precopy migration makes the VM temporally paused */
-  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);
+  static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->setState(SURF_VM_STATE_RUNNING);
 }
 
 /**