X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d9c9e08948a8387e9e8ecb0fe67ab6b94ec2a66f..ad5141788b986c8d0ae77612ad85e17dc1abb603:/teshsuite/msg/host_on_off_processes/host_on_off_processes.c?ds=sidebyside

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 13dea29c7d..8c136170a0 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
@@ -14,28 +14,31 @@
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
                              "Messages specific for this msg example");
 
-int test(int argc, char *argv[]);
-int daemon(int argc, char *argv[]);
+int test_launcher(int argc, char *argv[]);
+int process_daemon(int argc, char *argv[]);
+int process_sleep(int argc, char *argv[]);
 int commRX(int argc, char *argv[]);
 int commTX(int argc, char *argv[]);
 
 xbt_dynar_t tests;
 
-int test(int argc, char *argv[])
+int test_launcher(int argc, char *argv[])
 {
   int test = 0;
   char **argvF;
   argvF = xbt_new(char*, 2);
-  argvF[0] = xbt_strdup("daemon");
+  argvF[0] = xbt_strdup("process_daemon");
   msg_host_t jupiter = MSG_get_host_by_name("Jupiter");
 
   test = 1;
-  if (xbt_dynar_member(tests, &test)){
+  // Create a process running a simple task on a host and turn the host off during the execution of the process.
+  if (xbt_dynar_search_or_negative(tests, &test)!=-1){
     XBT_INFO("Test 1:");
     XBT_INFO("  Create a process on Jupiter");
     argvF = xbt_new(char*, 2);
-    argvF[0] = xbt_strdup("daemon");
-    MSG_process_create_with_arguments("daemon", daemon, NULL, jupiter, 1, argvF);
+    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);
@@ -43,13 +46,16 @@ int test(int argc, char *argv[])
   }
 
   test = 2;
-  if (xbt_dynar_member(tests, &test)){
+  // Create a process that on a host that is turned off (this should not be possible)
+  if (xbt_dynar_search_or_negative(tests, &test)!=-1){
     XBT_INFO("Test 2:");
     XBT_INFO("  Turn off Jupiter");
+    // adsein: Jupiter is already, hence nothing should happen
+    // adsein: This can be one additional test, to check that you cannot shutdown twice a host
     MSG_host_off(jupiter);
     argvF = xbt_new(char*, 2);
-    argvF[0] = xbt_strdup("daemon");
-    MSG_process_create_with_arguments("daemon", daemon, NULL, jupiter, 1, argvF);
+    argvF[0] = xbt_strdup("process_daemon");
+    MSG_process_create_with_arguments("process_daemon", process_daemon, NULL, jupiter, 1, argvF);
     MSG_process_sleep(10);
     XBT_INFO("  Test 2 does not crash, WTF ?!(number of Process : %d, it should be 1)", MSG_process_get_number());
     XBT_INFO("  Ok so let's turn on/off the node to see whether the process is correctly bound to Jupiter");
@@ -61,9 +67,25 @@ int test(int argc, char *argv[])
     XBT_INFO("number of Process : %d it should be 1. The daemon that has been created for test2 has been correctly destroyed....ok at least it looks rigorous, cool ! You just have to disallow the possibility to create a new process on a node when the node is off.)", MSG_process_get_number());
   }
 
-  test = 3;
-  if (xbt_dynar_member(tests, &test)){
-    XBT_INFO("Test 3 (turn off src during a communication) : Create a Process/task to make a communication between Jupiter and Tremblay and turn off Jupiter during the communication");
+   test = 3;
+  // Create a process running sucessive sleeps on a host and turn the host off during the execution of the process.
+  if (xbt_dynar_search_or_negative(tests, &test)!=-1){
+    XBT_INFO("Test 3:");
+    MSG_host_on(jupiter);
+    argvF = xbt_new(char*, 2);
+    argvF[0] = xbt_strdup("process_sleep");
+    MSG_process_create_with_arguments("process_sleep", process_sleep, NULL, jupiter, 1, argvF);
+    MSG_process_sleep(100);
+    XBT_INFO("  Turn off");
+    MSG_host_off(jupiter);
+    XBT_INFO("  sleep for 10 seconds");
+    MSG_process_sleep(10000);
+    XBT_INFO("number of Process : %d it should be 1 (i.e. the Test one))", MSG_process_get_number());
+  }
+
+  test = 4;
+  if (xbt_dynar_search_or_negative(tests, &test)!=-1){
+    XBT_INFO("Test 4 (turn off src during a communication) : Create a Process/task to make a communication between Jupiter and Tremblay and turn off Jupiter during the communication");
     MSG_host_on(jupiter);
     MSG_process_sleep(10);
     argvF = xbt_new(char*, 2);
@@ -71,58 +93,106 @@ int test(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 = 4;
-  if (xbt_dynar_member(tests, &test)){
-    XBT_INFO("Test 4 (turn off dest during a communication : Create a Process/task to make a communication between Tremblay and Jupiter and turn off Jupiter during the communication");
+  test = 5;
+  if (xbt_dynar_search_or_negative(tests, &test)!=-1){
+    XBT_INFO("Test 5 (turn off dest during a communication : Create a Process/task to make a communication between Tremblay and Jupiter and turn off Jupiter during the communication");
     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 =5;
-  if (xbt_dynar_member(tests, &test)){
+  test =6;
+  if (xbt_dynar_search_or_negative(tests, &test)!=-1){
+    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);
 
-  test = 6;
-  if (xbt_dynar_member(tests, &test)){
+    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;
-  if (xbt_dynar_member(tests, &test)){
+  if (xbt_dynar_search_or_negative(tests, &test)!=-1){
 
   }
 
   test = 8;
-  if (xbt_dynar_member(tests, &test)){
+  if (xbt_dynar_search_or_negative(tests, &test)!=-1){
 
   }
 
+  test = 9;
+  if (xbt_dynar_search_or_negative(tests, &test)!=-1){
+
+  }
+  XBT_INFO("  Test done. See you!");
   return 0;
 }
 
-int daemon(int argc, char *argv[])
+// 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;
-  task = MSG_task_create("deamon", 100*MSG_get_host_speed(MSG_host_self()), 0, NULL);
-  XBT_INFO("  Execute deamon");
-  MSG_task_execute(task);
+  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", MSG_get_host_speed(MSG_host_self()), 0, NULL);
+    XBT_INFO("  Execute deamon");
+    MSG_task_execute(task);
+    MSG_task_destroy(task);
+  }
+  XBT_INFO("  Deamon done. See you!");
+  return 0;
+}
+
+int process_sleep(int argc, char *argv[])
+{
+  for(;;){
+    XBT_INFO("  I'm alive but I should sleep");
+    MSG_process_sleep(10);
+  }
   XBT_INFO("  I'm done. See you!");
   return 0;
 }
@@ -193,8 +263,9 @@ int main(int argc, char *argv[])
     MSG_create_environment(platform_file);
   }
   {                             /*   Application deployment */
-    MSG_function_register("test", test);
-    MSG_function_register("daemon", daemon);
+    MSG_function_register("test_launcher", test_launcher);
+    MSG_function_register("process_daemon", process_daemon);
+    MSG_function_register("process_sleep", process_sleep);
 
     MSG_launch_application(application_file);
   }