X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5a20476e6eb7af4862cae3d678446e1465520382..dd38b27f7d03f21920f17eda3083b16b19465824:/teshsuite/msg/host_on_off_processes/host_on_off_processes.c

diff --git a/teshsuite/msg/host_on_off_processes/host_on_off_processes.c b/teshsuite/msg/host_on_off_processes/host_on_off_processes.c
index b33dc648dd..cb48a8a970 100644
--- a/teshsuite/msg/host_on_off_processes/host_on_off_processes.c
+++ b/teshsuite/msg/host_on_off_processes/host_on_off_processes.c
@@ -38,6 +38,7 @@ int test_launcher(int argc, char *argv[])
     argvF = xbt_new(char*, 2);
     argvF[0] = xbt_strdup("process_daemon");
     MSG_process_create_with_arguments("process_daemon", process_daemon, NULL, jupiter, 1, argvF);
+    MSG_process_sleep(3);
     XBT_INFO("  Turn off Jupiter");
     MSG_host_off(jupiter);
     MSG_process_sleep(10);
@@ -92,12 +93,12 @@ int test_launcher(int argc, char *argv[])
     MSG_process_create_with_arguments("commRX", commRX, NULL, MSG_get_host_by_name("Tremblay"), 1, argvF);
     argvF = xbt_new(char*, 2);
     argvF[0] = xbt_strdup("commTX");
-    MSG_process_create_with_arguments("commTX", commTX, NULL, MSG_get_host_by_name("Jupiter"), 1, argvF);
+    MSG_process_create_with_arguments("commTX", commTX, NULL, jupiter, 1, argvF);
     XBT_INFO("  number of processes: %d", MSG_process_get_number());
     MSG_process_sleep(10);
     XBT_INFO("  Turn Jupiter off");
     MSG_host_off(jupiter);
-    XBT_INFO("Test 3 seems ok  (number of Process : %d, it should be 1 or 2 if RX has not been satisfied) cool, you can now turn off a node that has a process paused by a sleep call", MSG_process_get_number());
+    XBT_INFO("Test 4 seems ok  (number of Process : %d, it should be 1 or 2 if RX has not been satisfied) cool, you can now turn off a node that has a process paused by a sleep call", MSG_process_get_number());
   }
 
   test = 5;
@@ -106,18 +107,51 @@ int test_launcher(int argc, char *argv[])
     MSG_host_on(jupiter);
     MSG_process_sleep(10);
     argvF = xbt_new(char*, 2);
+    argvF[0] = xbt_strdup("commRX");
+    MSG_process_create_with_arguments("commRX", commRX, NULL, jupiter, 1, argvF);
+    argvF = xbt_new(char*, 2);
     argvF[0] = xbt_strdup("commTX");
     MSG_process_create_with_arguments("commTX", commTX, NULL, MSG_get_host_by_name("Tremblay"), 1, argvF);
-    argvF = xbt_new(char*, 2);
-    argvF[0] = xbt_strdup("commRX");
-    MSG_process_create_with_arguments("commRX", commRX, NULL, MSG_get_host_by_name("Jupiter"), 1, argvF);
+    XBT_INFO("  number of processes: %d", MSG_process_get_number());
+    MSG_process_sleep(10);
+    XBT_INFO("  Turn Jupiter off");
     MSG_host_off(jupiter);
-    XBT_INFO("Test 4 seems ok, cool !(number of Process : %d, it should be 1", MSG_process_get_number());
+    XBT_INFO("Test 4 seems ok, cool !(number of Process : %d, it should be 2", MSG_process_get_number());
   }
 
   test =6;
   if (xbt_dynar_member(tests, &test)){
+    XBT_INFO("Test 6: Turn on Jupiter, assign a VM on Jupiter, launch a process inside the VM, and turn off the node");
+
+    // Create VM0
+    int dpRate = 70;
+    msg_vm_t vm0;
+    msg_process_t daemon;
+
+    vm0 = MSG_vm_create (jupiter, "vm0", 1, 2048, 125, NULL, -1, 125, dpRate);
+    MSG_vm_start(vm0);
 
+    argvF = xbt_new(char*, 2);
+    argvF[0] = xbt_strdup("process_daemon");
+    daemon = MSG_process_create_with_arguments("process_daemon", process_daemon, NULL, vm0, 1, argvF);
+
+    argvF = xbt_new(char*, 2);
+    argvF[0] = xbt_strdup("process_daemonJUPI");
+    MSG_process_create_with_arguments("process_daemonJUPI", process_daemon, NULL, jupiter, 1, argvF);
+
+    MSG_process_suspend(daemon);
+    MSG_vm_set_bound(vm0, 90);
+    MSG_process_resume(daemon);
+
+    MSG_process_sleep(10);
+
+    XBT_INFO("  Turn Jupiter off");
+    MSG_host_off(jupiter);
+    XBT_INFO("  Shutdown vm0");
+    MSG_vm_shutdown(vm0);
+    XBT_INFO("  Destroy vm0");
+    MSG_vm_destroy(vm0);
+    XBT_INFO("Test 6 is also weird: when the node Jupiter is turned off once again, the VM and its daemon are not killed. However, the issue regarding the shutdown of hosted VMs can be seen a feature not a bug ;)");
   }
 
   test = 7;
@@ -134,21 +168,22 @@ int test_launcher(int argc, char *argv[])
   if (xbt_dynar_member(tests, &test)){
 
   }
-
+  XBT_INFO("  Test done. See you!");
   return 0;
 }
 
-// adsein: Is this really a daemon ? it ran only one task ? I just added a stupid loop 
+// adsein: Is this really a daemon ? it ran only one task ? I just added a stupid loop
 int process_daemon(int argc, char *argv[])
 {
   msg_task_t task = NULL;
+  XBT_INFO("  Start daemon on %s (%f)",  MSG_host_get_name(MSG_host_self()), MSG_get_host_speed(MSG_host_self()));
   for(;;){
-    task = MSG_task_create("deamon", 100*MSG_get_host_speed(MSG_host_self()), 0, NULL);
+    task = MSG_task_create("deamon", MSG_get_host_speed(MSG_host_self()), 0, NULL);
     XBT_INFO("  Execute deamon");
+    MSG_task_execute(task);
     MSG_task_destroy(task);
   }
-  MSG_task_execute(task);
-  XBT_INFO("  I'm done. See you!");
+  XBT_INFO("  Deamon done. See you!");
   return 0;
 }