merge msg_vm.c - adrien (please note that there is one line (destruction of the tx_pr...

[simgrid.git] / 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 a9c9b78..8c13617 100644 (file)
--- a/teshsuite/msg/host_on_off_processes/host_on_off_processes.c
+++ b/teshsuite/msg/host_on_off_processes/host_on_off_processes.c
@@ -32,12 +32,13 @@ int test_launcher(int argc, char *argv[])
 
   test = 1;
   // Create a process running a simple task on a host and turn the host off during the execution of the process.
-  if (xbt_dynar_member(tests, &test)){
+  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("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);
@@ -46,7 +47,7 @@ int test_launcher(int argc, char *argv[])
 
   test = 2;
   // Create a process that on a host that is turned off (this should not be possible)
-  if (xbt_dynar_member(tests, &test)){
+  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
@@ -68,7 +69,7 @@ int test_launcher(int argc, char *argv[])
 
    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_member(tests, &test)){
+  if (xbt_dynar_search_or_negative(tests, &test)!=-1){
     XBT_INFO("Test 3:");
     MSG_host_on(jupiter);
     argvF = xbt_new(char*, 2);
@@ -83,7 +84,7 @@ int test_launcher(int argc, char *argv[])
   }
 
   test = 4;
-  if (xbt_dynar_member(tests, &test)){
+  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);
@@ -101,7 +102,7 @@ int test_launcher(int argc, char *argv[])
   }
 
   test = 5;
-  if (xbt_dynar_member(tests, &test)){
+  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);
@@ -119,49 +120,52 @@ int test_launcher(int argc, char *argv[])
   }
 
   test =6;
-  if (xbt_dynar_member(tests, &test)){
-    /*XBT_INFO("Test 5: Turn on Jupiter, assign a VM on Jupiter, launch a process inside the VM, and turn off the node");
+  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_vm_create (msg_host_t ind_pm, const char *name, int ncpus, int ramsize, int net_cap, char *disk_path, int disksize, int mig_netspeed, int dp_intensity)
-  vm0 = MSG_vm_create_core(jupiter, "vm0");
-  params.ramsize = 1L * 1000 * 1000 * 1000; // 1Gbytes
-  MSG_host_set_params(vm0, &params);
-  MSG_vm_start(vm0);
-    XVM vm0 = null;
-        vm0 = new XVM(
-                host1,
-                "vm0",
-                1, // Nb of vcpu
-                2048, // Ramsize,
-                125, // Net Bandwidth
-                null, //VM disk image
-                -1,   //size of disk image,
-                125, // Net bandwidth,
-                dpRate // Memory intensity
-        );
-        vm0.start();
-        vm0.setLoad(90);
-
-        host1.off();
-        Msg.info("Test 5 is also weird: when the node host1 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 ;)\n");*/
+    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;
-  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_member(tests, &test)){
+  if (xbt_dynar_search_or_negative(tests, &test)!=-1){
 
   }
   XBT_INFO("  Test done. See you!");
@@ -172,12 +176,13 @@ MSG_vm_create (msg_host_t ind_pm, const char *name, int ncpus, int ramsize, int
 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("  Deamon done. See you!");
   return 0;
 }