X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eee21ec5f99218189fc98898a09150294cd0fbf4..9417357ad97284aa163a86b0ab60058641fc0064:/src/simix/smx_vm.c

diff --git a/src/simix/smx_vm.c b/src/simix/smx_vm.c
index e56c555b2f..d91b857b7d 100644
--- a/src/simix/smx_vm.c
+++ b/src/simix/smx_vm.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2012. The SimGrid Team.
+/* Copyright (c) 2007-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -96,7 +96,8 @@ static int __can_be_started(smx_host_t vm)
 void SIMIX_vm_start(smx_host_t ind_vm)
 {
   if (__can_be_started(ind_vm))
-    SIMIX_vm_set_state(ind_vm, SURF_VM_STATE_RUNNING);
+    surf_resource_set_state(surf_workstation_resource_priv(ind_vm),
+                            (int)SURF_VM_STATE_RUNNING);
   else
     THROWF(vm_error, 0, "The VM %s cannot be started", SIMIX_host_get_name(ind_vm));
 }
@@ -108,18 +109,6 @@ void SIMIX_pre_vm_start(smx_simcall_t simcall, smx_host_t ind_vm)
   SIMIX_vm_start(ind_vm);
 }
 
-/* ***** set/get state of a VM ***** */
-void SIMIX_vm_set_state(smx_host_t ind_vm, int state)
-{
-  /* jump to vm_ws_set_state */
- surf_resource_set_state(surf_workstation_resource_priv(ind_vm), state);
-}
-
-void SIMIX_pre_vm_set_state(smx_simcall_t simcall, smx_host_t ind_vm, int state)
-{
-  SIMIX_vm_set_state(ind_vm, state);
-}
-
 int SIMIX_vm_get_state(smx_host_t ind_vm)
 {
   return surf_resource_get_state(surf_workstation_resource_priv(ind_vm));
@@ -132,17 +121,16 @@ int SIMIX_pre_vm_get_state(smx_simcall_t simcall, smx_host_t ind_vm)
 
 
 /**
- * \brief Function to migrate a SIMIX VM host. 
+ * \brief Function to migrate a SIMIX VM host.
  *
  * \param host the vm host to migrate (a smx_host_t)
  */
 void SIMIX_vm_migrate(smx_host_t ind_vm, smx_host_t ind_dst_pm)
 {
   /* precopy migration makes the VM temporally paused */
-  e_surf_vm_state_t state = SIMIX_vm_get_state(ind_vm);
-  xbt_assert(state == SURF_VM_STATE_SUSPENDED);
+  xbt_assert(SIMIX_vm_get_state(ind_vm) == SURF_VM_STATE_SUSPENDED);
 
-  /* jump to vm_ws_migrate(). this will update the vm location. */
+  /* jump to vm_ws_xigrate(). this will update the vm location. */
   surf_vm_workstation_migrate(ind_vm, ind_dst_pm);
 }
 
@@ -210,7 +198,7 @@ void SIMIX_pre_vm_set_affinity(smx_simcall_t simcall, smx_host_t ind_vm, smx_hos
 
 
 /**
- * \brief Function to suspend a SIMIX VM host. This function stops the exection of the
+ * \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
  * preserved on memory. We can later resume it again.
  *
@@ -252,7 +240,7 @@ void SIMIX_pre_vm_suspend(smx_simcall_t simcall, smx_host_t ind_vm)
 
 /**
  * \brief Function to resume a SIMIX VM host. This function restart the execution of the
- * VM. All the processes on this VM will run again. 
+ * VM. All the processes on this VM will run again.
  *
  * \param host the vm host to resume (a smx_host_t)
  */
@@ -316,7 +304,7 @@ void SIMIX_pre_vm_save(smx_simcall_t simcall, smx_host_t ind_vm)
 
 /**
  * \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. 
+ * VM. All the processes on this VM will run again.
  *
  * \param host the vm host to restore (a smx_host_t)
  */
@@ -359,16 +347,18 @@ void SIMIX_vm_shutdown(smx_host_t ind_vm, smx_process_t issuer)
   if (SIMIX_vm_get_state(ind_vm) != SURF_VM_STATE_RUNNING)
     THROWF(vm_error, 0, "VM(%s) is not running", name);
 
+  XBT_DEBUG("shutdown %s", name);
   XBT_DEBUG("%d processes in the VM", xbt_swag_size(SIMIX_host_priv(ind_vm)->process_list));
 
   smx_process_t smx_process, smx_process_safe;
   xbt_swag_foreach_safe(smx_process, smx_process_safe, SIMIX_host_priv(ind_vm)->process_list) {
-    XBT_DEBUG("shutdown %s", name);
+    XBT_DEBUG("kill %s", smx_process->name);
     SIMIX_process_kill(smx_process, issuer);
   }
 
   /* FIXME: we may have to do something at the surf layer, e.g., vcpu action */
-  SIMIX_vm_set_state(ind_vm, SURF_VM_STATE_CREATED);
+  surf_resource_set_state(surf_workstation_resource_priv(ind_vm),
+                          (int)SURF_VM_STATE_CREATED);
 }
 
 void SIMIX_pre_vm_shutdown(smx_simcall_t simcall, smx_host_t ind_vm)
@@ -389,6 +379,8 @@ void SIMIX_vm_destroy(smx_host_t ind_vm)
   xbt_assert((ind_vm != NULL), "Invalid parameters");
   const char *hostname = SIMIX_host_get_name(ind_vm);
 
+  XBT_DEBUG("destroy %s", hostname);
+
   /* this will call the registered callback function, i.e., SIMIX_host_destroy().  */
   xbt_lib_unset(host_lib, hostname, SIMIX_HOST_LEVEL, 1);