cosmetics: .name().c_str() becomes .cname()

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

diff --git a/src/simix/smx_vm.cpp b/src/simix/smx_vm.cpp
index 515fb1f..5714078 100644 (file)
--- a/src/simix/smx_vm.cpp
+++ b/src/simix/smx_vm.cpp
@@ -12,62 +12,6 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_vm, simix, "Logging specific to SIMIX Virtual Machines");
 
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_vm, simix, "Logging specific to SIMIX Virtual Machines");
 

-/* works for VMs and PMs */
-static long host_get_ramsize(sg_host_t vm, int *overcommit)
-{
-  s_vm_params_t params;
-  static_cast<simgrid::s4u::VirtualMachine*>(vm)->parameters(&params);
-
-  if (overcommit)
-    *overcommit = params.overcommit;
-
-  return params.ramsize;
-}
-
-/* **** start a VM **** */
-void SIMIX_vm_start(sg_host_t vm)
-{
-  sg_host_t pm = static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->getPm();
-
-  simgrid::vm::VmHostExt::ensureVmExtInstalled();
-  if (pm->extension<simgrid::vm::VmHostExt>() == nullptr)
-    pm->extension_set(new simgrid::vm::VmHostExt());
-
-  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);
-
-  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());
-    }
-  }
-
-  static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->setState(SURF_VM_STATE_RUNNING);
-}
-
-/**
- * @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);
-}
-

 /**
  * @brief Function to suspend a SIMIX VM host. This function stops the execution of the
  * VM. All the processes on this VM will pause. The state of the VM is
 /**
  * @brief Function to suspend a SIMIX VM host. This function stops the execution of the
  * VM. All the processes on this VM will pause. The state of the VM is


@@ -78,9 +22,9 @@ 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 (static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->getState() != SURF_VM_STATE_RUNNING)
 void SIMIX_vm_suspend(sg_host_t vm, smx_actor_t issuer)
 {
   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());
+    THROWF(vm_error, 0, "VM(%s) is not running", vm->cname());

 
 

-  XBT_DEBUG("suspend VM(%s), where %d processes exist", vm->name().c_str(), xbt_swag_size(sg_host_simix(vm)->process_list));
+  XBT_DEBUG("suspend VM(%s), where %d processes exist", vm->cname(), xbt_swag_size(sg_host_simix(vm)->process_list));

 
   /* jump to vm_ws_suspend. The state will be set. */
   static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->suspend();
 
   /* jump to vm_ws_suspend. The state will be set. */
   static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->suspend();


@@ -113,10 +57,9 @@ void simcall_HANDLER_vm_suspend(smx_simcall_t simcall, sg_host_t vm)
 void SIMIX_vm_resume(sg_host_t vm)
 {
   if (static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->getState() != SURF_VM_STATE_SUSPENDED)
 void SIMIX_vm_resume(sg_host_t vm)
 {
   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());
+    THROWF(vm_error, 0, "VM(%s) was not suspended", vm->cname());

 
 

-  XBT_DEBUG("resume VM(%s), where %d processes exist",
-      vm->name().c_str(), xbt_swag_size(sg_host_simix(vm)->process_list));
+  XBT_DEBUG("resume VM(%s), where %d processes exist", vm->cname(), xbt_swag_size(sg_host_simix(vm)->process_list));

 
   /* jump to vm_ws_resume() */
   static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->resume();
 
   /* jump to vm_ws_resume() */
   static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->resume();


@@ -137,19 +80,16 @@ void SIMIX_vm_resume(sg_host_t vm)
  */
 void SIMIX_vm_save(sg_host_t vm, smx_actor_t issuer)
 {
  */
 void SIMIX_vm_save(sg_host_t vm, smx_actor_t issuer)
 {

-  const char *name = sg_host_get_name(vm);
-

   if (static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->getState() != 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);
+    THROWF(vm_error, 0, "VM(%s) is not running", vm->cname());

 
 

-  XBT_DEBUG("save VM(%s), where %d processes exist", name, xbt_swag_size(sg_host_simix(vm)->process_list));
+  XBT_DEBUG("save VM(%s), where %d processes exist", vm->cname(), xbt_swag_size(sg_host_simix(vm)->process_list));

 
 

-  /* jump to vm_ws_save() */

   static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->save();
 
   smx_actor_t smx_process, smx_process_safe;
   xbt_swag_foreach_safe(smx_process, smx_process_safe, sg_host_simix(vm)->process_list) {
   static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->save();
 
   smx_actor_t smx_process, smx_process_safe;
   xbt_swag_foreach_safe(smx_process, smx_process_safe, sg_host_simix(vm)->process_list) {

-    XBT_DEBUG("suspend %s", smx_process->name.c_str());
+    XBT_DEBUG("suspend %s", smx_process->cname());

     SIMIX_process_suspend(smx_process, issuer);
   }
 }
     SIMIX_process_suspend(smx_process, issuer);
   }
 }


@@ -169,10 +109,9 @@ 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 (static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->getState() != SURF_VM_STATE_RUNNING)
 void SIMIX_vm_shutdown(sg_host_t vm, smx_actor_t issuer)
 {
   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());
+    THROWF(vm_error, 0, "VM(%s) is not running", vm->cname());

 
 

-  XBT_DEBUG("shutdown VM %s, that contains %d processes",
-      vm->name().c_str(),xbt_swag_size(sg_host_simix(vm)->process_list));
+  XBT_DEBUG("shutdown VM %s, that contains %d processes", vm->cname(), xbt_swag_size(sg_host_simix(vm)->process_list));

 
   smx_actor_t smx_process, smx_process_safe;
   xbt_swag_foreach_safe(smx_process, smx_process_safe, sg_host_simix(vm)->process_list) {
 
   smx_actor_t smx_process, smx_process_safe;
   xbt_swag_foreach_safe(smx_process, smx_process_safe, sg_host_simix(vm)->process_list) {