more VM functions inlining (plus, getters don't need to be a simcall)

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

diff --git a/src/simix/smx_vm.cpp b/src/simix/smx_vm.cpp
index f6d3396..d1b585f 100644 (file)
--- a/src/simix/smx_vm.cpp
+++ b/src/simix/smx_vm.cpp
@@ -67,17 +67,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 +80,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 +95,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 +130,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 +157,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));
@@ -183,30 +177,6 @@ void simcall_HANDLER_vm_save(smx_simcall_t simcall, sg_host_t vm)
   SIMIX_vm_save(vm, simcall->issuer);
 }
 
-/**
- * @brief Function to restore a SIMIX VM host. This function restart the execution of the
- * VM. All the processes on this VM will run again.
- *
- * @param vm the vm host to restore (a sg_host_t)
- */
-void SIMIX_vm_restore(sg_host_t vm)
-{
-  if (SIMIX_vm_get_state(vm) != SURF_VM_STATE_SAVED)
-    THROWF(vm_error, 0, "VM(%s) was not saved", vm->name().c_str());
-
-  XBT_DEBUG("restore VM(%s), where %d processes exist",
-      vm->name().c_str(), xbt_swag_size(sg_host_simix(vm)->process_list));
-
-  /* jump to vm_ws_restore() */
-  static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->restore();
-
-  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("resume %s", smx_process->name.c_str());
-    SIMIX_process_resume(smx_process);
-  }
-}
-
 /**
  * @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
@@ -216,7 +186,7 @@ void SIMIX_vm_restore(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",
@@ -229,35 +199,10 @@ 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)
 {
   SIMIX_vm_shutdown(vm, simcall->issuer);
 }
-
-/**
- * @brief Function to destroy a SIMIX VM host.
- *
- * @param vm the vm host to destroy (a sg_host_t)
- */
-void SIMIX_vm_destroy(sg_host_t vm)
-{
-  /* this code basically performs a similar thing like SIMIX_host_destroy() */
-  XBT_DEBUG("destroy %s", vm->name().c_str());
-
-  /* FIXME: this is really strange that everything fails if the next line is removed.
-   * This is as if we shared these data with the PM, which definitely should not be the case...
-   *
-   * We need to test that suspending a VM does not suspends the processes running on its PM, for example.
-   * Or we need to simplify this code enough to make it actually readable (but this sounds harder than testing)
-   */
-  vm->extension_set<simgrid::simix::Host>(nullptr);
-
-  /* Don't free these things twice: they are the ones of my physical host */
-  vm->pimpl_cpu = nullptr;
-  vm->pimpl_netcard = nullptr;
-
-  vm->destroy();
-}