fix minor issues in the management of Java Exceptions + comment process cancelled...

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

diff --git a/src/msg/msg_vm.c b/src/msg/msg_vm.c
index 62d0cbf..bc400f4 100644 (file)
--- a/src/msg/msg_vm.c
+++ b/src/msg/msg_vm.c
@@ -391,10 +391,13 @@ static int migration_rx_fun(int argc, char *argv[])
   }
 
 
-  /* deinstall the current affinity setting */
+  /* deinstall the current affinity setting for the CPU */
   simcall_vm_set_affinity(ms->vm, ms->src_pm, 0);
 
+  /* Update the vm location */
   simcall_vm_migrate(ms->vm, ms->dst_pm);
+  
+  /* Resume the VM */
   simcall_vm_resume(ms->vm);
 
   /* install the affinity setting of the VM on the destination pm */
@@ -1077,8 +1080,25 @@ static void do_migration(msg_vm_t vm, msg_host_t src_pm, msg_host_t dst_pm)
   char *pr_rx_name = get_mig_process_rx_name(vm, src_pm, dst_pm);
   char *pr_tx_name = get_mig_process_tx_name(vm, src_pm, dst_pm);
 
-  MSG_process_create(pr_rx_name, migration_rx_fun, ms, dst_pm);
-  MSG_process_create(pr_tx_name, migration_tx_fun, ms, src_pm);
+//  MSG_process_create(pr_rx_name, migration_rx_fun, ms, dst_pm);
+//  MSG_process_create(pr_tx_name, migration_tx_fun, ms, src_pm);
+#if 1
+ {
+ char **argv = xbt_new(char *, 2);
+ argv[0] = pr_rx_name;
+ argv[1] = NULL;
+ MSG_process_create_with_arguments(pr_rx_name, migration_rx_fun, ms, dst_pm, 1, argv);
+ }
+ {
+ char **argv = xbt_new(char *, 2);
+ argv[0] = pr_tx_name;
+ argv[1] = NULL;
+ MSG_process_create_with_arguments(pr_tx_name, migration_tx_fun, ms, src_pm, 1, argv);
+ }
+#endif
+
+
+
 
   /* wait until the migration have finished */
   {