VM: move content from simix to s4u

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

diff --git a/src/simix/smx_vm.cpp b/src/simix/smx_vm.cpp
index 10def72dddf10140e6658bc2d42d2a0055c76c7d..49115f17539d6f55901d020998d1c4ca0ecc6efc 100644 (file)
--- a/src/simix/smx_vm.cpp
+++ b/src/simix/smx_vm.cpp
@@ -22,9 +22,9 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_vm, simix, "Logging specific to SIMIX Virt
 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();
@@ -57,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)
-    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();
@@ -72,37 +71,6 @@ void SIMIX_vm_resume(sg_host_t vm)
   }
 }
 
-/**
- * @brief Function to save a SIMIX VM host.
- * This function is the same as vm_suspend, but the state of the VM is saved to the disk, and not preserved on memory.
- * We can later restore it again.
- *
- * @param vm the vm host to save (a sg_host_t)
- */
-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)
-    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));
-
-  /* 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) {
-    XBT_DEBUG("suspend %s", smx_process->name.c_str());
-    SIMIX_process_suspend(smx_process, issuer);
-  }
-}
-
-void simcall_HANDLER_vm_save(smx_simcall_t simcall, sg_host_t vm)
-{
-  SIMIX_vm_save(vm, simcall->issuer);
-}
-
 /**
  * @brief Function to shutdown a SIMIX VM host. This function powers off the
  * VM. All the processes on this VM will be killed. But, the state of the VM is
@@ -113,10 +81,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)
-    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) {