Debug the cloud API, it should work as expected now.

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

diff --git a/src/msg/msg_vm.c b/src/msg/msg_vm.c
index b31536f..fd951c2 100644 (file)
--- a/src/msg/msg_vm.c
+++ b/src/msg/msg_vm.c
@@ -65,7 +65,24 @@ 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) {
-  xbt_dynar_push_as(vm->processes,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);
+    }
+  }
+
+  ((msg_process_data_t)(simdata->data))->current_vm = vm;
+
+       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
@@ -107,7 +124,7 @@ void MSG_vm_suspend(msg_vm_t vm) {
   unsigned int cpt;
   m_process_t process;
   xbt_dynar_foreach(vm->processes,cpt,process) {
-    XBT_INFO("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);
   }
 }
@@ -123,7 +140,7 @@ void MSG_vm_resume(msg_vm_t vm) {
   unsigned int cpt;
   m_process_t process;
   xbt_dynar_foreach(vm->processes,cpt,process) {
-    XBT_INFO("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);
   }
 }