use std::map for sparse vectors. This simplifies things

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

diff --git a/src/simix/smx_vm.cpp b/src/simix/smx_vm.cpp
index 073a9fb..3e50aca 100644 (file)
--- a/src/simix/smx_vm.cpp
+++ b/src/simix/smx_vm.cpp
@@ -119,7 +119,6 @@ void SIMIX_vm_migrate(sg_host_t ind_vm, sg_host_t ind_dst_pm)
 /**
  * @brief Encompassing simcall to prevent the removal of the src or the dst node at the end of a VM migration
  *  The simcall actually invokes the following calls: 
- *     simcall_vm_set_affinity(vm, src_pm, 0); 
  *     simcall_vm_migrate(vm, dst_pm); 
  *     simcall_vm_resume(vm);
  *
@@ -131,14 +130,11 @@ void SIMIX_vm_migrate(sg_host_t ind_vm, sg_host_t ind_dst_pm)
  */
 void SIMIX_vm_migratefrom_resumeto(sg_host_t vm, sg_host_t src_pm, sg_host_t dst_pm)
 {
-  /* deinstall the current affinity setting for the CPU */
-  SIMIX_vm_set_affinity(vm, src_pm, 0);
-
   /* Update the vm location */
   SIMIX_vm_migrate(vm, dst_pm);
  
   /* Resume the VM */
-  smx_process_t self = SIMIX_process_self(); 
+  smx_actor_t self = SIMIX_process_self(); 
   SIMIX_vm_resume(vm, self->simcall.issuer);
 } 
 
@@ -163,22 +159,6 @@ void SIMIX_vm_set_bound(sg_host_t host, double bound)
   surf_vm_set_bound(host, bound);
 }
 
-/**
- * @brief Function to set the CPU affinity of the given SIMIX VM host.
- *
- * @param host the vm host (a sg_host_t)
- * @param host the pm host (a sg_host_t)
- * @param mask affinity mask (a unsigned long)
- */
-void SIMIX_vm_set_affinity(sg_host_t ind_vm, sg_host_t ind_pm, unsigned long mask)
-{
-  /* make sure this at the MSG layer. */
-  xbt_assert(SIMIX_vm_get_pm(ind_vm) == ind_pm);
-
-  surf_vm_set_affinity(ind_vm, ind_pm, mask);
-}
-
-
 /**
  * @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
@@ -186,7 +166,7 @@ void SIMIX_vm_set_affinity(sg_host_t ind_vm, sg_host_t ind_pm, unsigned long mas
  *
  * @param host the vm host to suspend (a sg_host_t)
  */
-void SIMIX_vm_suspend(sg_host_t ind_vm, smx_process_t issuer)
+void SIMIX_vm_suspend(sg_host_t ind_vm, smx_actor_t issuer)
 {
   const char *name = sg_host_get_name(ind_vm);
 
@@ -198,7 +178,7 @@ void SIMIX_vm_suspend(sg_host_t ind_vm, smx_process_t issuer)
   /* jump to vm_ws_suspend. The state will be set. */
   surf_vm_suspend(ind_vm);
 
-  smx_process_t smx_process, smx_process_safe;
+  smx_actor_t smx_process, smx_process_safe;
   xbt_swag_foreach_safe(smx_process, smx_process_safe, sg_host_simix(ind_vm)->process_list) {
     XBT_DEBUG("suspend %s", smx_process->name.c_str());
     SIMIX_process_suspend(smx_process, issuer);
@@ -226,7 +206,7 @@ void simcall_HANDLER_vm_suspend(smx_simcall_t simcall, sg_host_t ind_vm)
  *
  * @param host the vm host to resume (a sg_host_t)
  */
-void SIMIX_vm_resume(sg_host_t ind_vm, smx_process_t issuer)
+void SIMIX_vm_resume(sg_host_t ind_vm, smx_actor_t issuer)
 {
   const char *name = sg_host_get_name(ind_vm);
 
@@ -238,7 +218,7 @@ void SIMIX_vm_resume(sg_host_t ind_vm, smx_process_t issuer)
   /* jump to vm_ws_resume() */
   surf_vm_resume(ind_vm);
 
-  smx_process_t smx_process, smx_process_safe;
+  smx_actor_t smx_process, smx_process_safe;
   xbt_swag_foreach_safe(smx_process, smx_process_safe, sg_host_simix(ind_vm)->process_list) {
     XBT_DEBUG("resume %s", smx_process->name.c_str());
     SIMIX_process_resume(smx_process, issuer);
@@ -258,7 +238,7 @@ void simcall_HANDLER_vm_resume(smx_simcall_t simcall, sg_host_t ind_vm)
  *
  * @param host the vm host to save (a sg_host_t)
  */
-void SIMIX_vm_save(sg_host_t ind_vm, smx_process_t issuer)
+void SIMIX_vm_save(sg_host_t ind_vm, smx_actor_t issuer)
 {
   const char *name = sg_host_get_name(ind_vm);
 
@@ -271,7 +251,7 @@ void SIMIX_vm_save(sg_host_t ind_vm, smx_process_t issuer)
   /* jump to vm_ws_save() */
   surf_vm_save(ind_vm);
 
-  smx_process_t smx_process, smx_process_safe;
+  smx_actor_t smx_process, smx_process_safe;
   xbt_swag_foreach_safe(smx_process, smx_process_safe, sg_host_simix(ind_vm)->process_list) {
     XBT_DEBUG("suspend %s", smx_process->name.c_str());
     SIMIX_process_suspend(smx_process, issuer);
@@ -290,7 +270,7 @@ void simcall_HANDLER_vm_save(smx_simcall_t simcall, sg_host_t ind_vm)
  *
  * @param host the vm host to restore (a sg_host_t)
  */
-void SIMIX_vm_restore(sg_host_t ind_vm, smx_process_t issuer)
+void SIMIX_vm_restore(sg_host_t ind_vm, smx_actor_t issuer)
 {
   const char *name = sg_host_get_name(ind_vm);
 
@@ -302,7 +282,7 @@ void SIMIX_vm_restore(sg_host_t ind_vm, smx_process_t issuer)
   /* jump to vm_ws_restore() */
   surf_vm_resume(ind_vm);
 
-  smx_process_t smx_process, smx_process_safe;
+  smx_actor_t smx_process, smx_process_safe;
   xbt_swag_foreach_safe(smx_process, smx_process_safe, sg_host_simix(ind_vm)->process_list) {
     XBT_DEBUG("resume %s", smx_process->name.c_str());
     SIMIX_process_resume(smx_process, issuer);
@@ -322,7 +302,7 @@ void simcall_HANDLER_vm_restore(smx_simcall_t simcall, sg_host_t ind_vm)
  *
  * @param host the vm host to shutdown (a sg_host_t)
  */
-void SIMIX_vm_shutdown(sg_host_t ind_vm, smx_process_t issuer)
+void SIMIX_vm_shutdown(sg_host_t ind_vm, smx_actor_t issuer)
 {
   const char *name = sg_host_get_name(ind_vm);
 
@@ -332,7 +312,7 @@ void SIMIX_vm_shutdown(sg_host_t ind_vm, smx_process_t issuer)
   XBT_DEBUG("shutdown %s", name);
   XBT_DEBUG("%d processes in the VM", xbt_swag_size(sg_host_simix(ind_vm)->process_list));
 
-  smx_process_t smx_process, smx_process_safe;
+  smx_actor_t smx_process, smx_process_safe;
   xbt_swag_foreach_safe(smx_process, smx_process_safe, sg_host_simix(ind_vm)->process_list) {
     XBT_DEBUG("kill %s", smx_process->name.c_str());
     SIMIX_process_kill(smx_process, issuer);