Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / src / msg / msg_vm.c

diff --git a/src/msg/msg_vm.c b/src/msg/msg_vm.c
index fd951c2..bda366c 100644 (file)
--- a/src/msg/msg_vm.c
+++ b/src/msg/msg_vm.c
@@ -65,24 +65,22 @@ int MSG_vm_is_running(msg_vm_t vm) {
  * @bug for now, if a binded process terminates, every VM functions will segfault. Baaaad.
  */
 void MSG_vm_bind(msg_vm_t vm, m_process_t process) {
-  simdata_process_t simdata = simcall_process_get_data(process);
-  if (!simdata->data) {
-       simdata->data = xbt_new0(s_msg_process_data_t,1);
-  }
-  //If if it is already in a vm, get it out of it
-  if ( ((msg_process_data_t)(simdata->data))->current_vm) {
-       msg_vm_t old_vm = ((msg_process_data_t)(simdata->data))->current_vm;
-    int pos = xbt_dynar_search(old_vm->processes,&process);
-    xbt_dynar_remove_at(old_vm->processes,pos, NULL);
-    //If it is on the wrong host, migrate it to the new host
-    if (vm->location != old_vm->location) {
-       MSG_process_migrate(process,vm->location);
-    }
-  }
+       /* check if the process is already in a VM */
+       simdata_process_t simdata = simcall_process_get_data(process);
+       if (simdata->vm) {
+               msg_vm_t old_vm = simdata->vm;
+               int pos = xbt_dynar_search(old_vm->processes,&process);
+               xbt_dynar_remove_at(old_vm->processes,pos, NULL);
+       }
+       /* check if the host is in the right host */
+       if (simdata->m_host != vm->location) {
+               MSG_process_migrate(process,vm->location);
+       }
+       simdata->vm = vm;
 
-  ((msg_process_data_t)(simdata->data))->current_vm = vm;
+       XBT_DEBUG("binding Process %s to %p",MSG_process_get_name(process),vm);
 
-       xbt_dynar_push_as(vm->processes,m_process_t,process);
+  xbt_dynar_push_as(vm->processes,m_process_t,process);
 }
 /** @brief Removes the given process from the given VM, and kill it
  *  @ingroup msg_VMs
@@ -124,7 +122,7 @@ void MSG_vm_suspend(msg_vm_t vm) {
   unsigned int cpt;
   m_process_t process;
   xbt_dynar_foreach(vm->processes,cpt,process) {
-       XBT_DEBUG("suspend process %s of host %s",MSG_process_get_name(process),MSG_host_get_name(MSG_process_get_host(process)));
+    XBT_DEBUG("suspend process %s of host %s",MSG_process_get_name(process),MSG_host_get_name(MSG_process_get_host(process)));
     MSG_process_suspend(process);
   }
 }
@@ -140,7 +138,7 @@ void MSG_vm_resume(msg_vm_t vm) {
   unsigned int cpt;
   m_process_t process;
   xbt_dynar_foreach(vm->processes,cpt,process) {
-    XBT_DEBUG("resume process %s of host %s",MSG_process_get_name(process),MSG_host_get_name(MSG_process_get_host(process)));
+       XBT_DEBUG("resume process %s of host %s",MSG_process_get_name(process),MSG_host_get_name(MSG_process_get_host(process)));
     MSG_process_resume(process);
   }
 }
@@ -151,10 +149,27 @@ void MSG_vm_resume(msg_vm_t vm) {
  * No extra delay occurs. If you want to simulate this too, you want to
  * use a #MSG_process_sleep() or something. I'm not quite sure.
  */
-void MSG_vm_shutdown(msg_vm_t vm) {
-  unsigned int cpt;
+void MSG_vm_shutdown(msg_vm_t vm)
+{
   m_process_t process;
-  xbt_dynar_foreach(vm->processes,cpt,process) {
-    MSG_process_kill(process);
+  XBT_DEBUG("%lu processes in the VM", xbt_dynar_length(vm->processes));
+  while (xbt_dynar_length(vm->processes) > 0) {
+       process = xbt_dynar_get_as(vm->processes,0,m_process_t);
+       MSG_process_kill(process);
   }
 }
+
+/** @brief Destroy a msg_vm_t.
+ *  @ingroup msg_VMs
+ */
+void MSG_vm_destroy(msg_vm_t vm) {
+       unsigned int cpt;
+       m_process_t process;
+       xbt_dynar_foreach(vm->processes,cpt,process) {
+         //FIXME: Slow ?
+         simdata_process_t simdata = simcall_process_get_data(process);
+         simdata->vm = NULL;
+       }
+       xbt_dynar_free(&vm->processes);
+       xbt_free(vm);
+}