X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6f2e9113097b642198bdf52fc3a85a5593fa17cd..0f5aaf299f85e9347fa65abc98fd03d0555cc254:/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 cb48a8a970..c6e82220cb 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
@@ -1,11 +1,11 @@
-/* Copyright (c) 2010-2014. The SimGrid Team.
+/* Copyright (c) 2010-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include <stdio.h>
-#include "msg/msg.h"            /* Yeah! If you want to use msg, you need to include msg/msg.h */
+#include "simgrid/msg.h"            /* Yeah! If you want to use msg, you need to include simgrid/msg.h */
 #include "xbt/sysdep.h"         /* calloc, printf */
 
 /* Create a log channel to have nice outputs. */
@@ -21,6 +21,7 @@ int commRX(int argc, char *argv[]);
 int commTX(int argc, char *argv[]);
 
 xbt_dynar_t tests;
+int tasks_done = 0;
 
 int test_launcher(int argc, char *argv[])
 {
@@ -28,11 +29,11 @@ int test_launcher(int argc, char *argv[])
   char **argvF;
   argvF = xbt_new(char*, 2);
   argvF[0] = xbt_strdup("process_daemon");
-  msg_host_t jupiter = MSG_get_host_by_name("Jupiter");
+  msg_host_t jupiter = MSG_host_by_name("Jupiter");
 
   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);
@@ -42,12 +43,12 @@ int test_launcher(int argc, char *argv[])
     XBT_INFO("  Turn off Jupiter");
     MSG_host_off(jupiter);
     MSG_process_sleep(10);
-    XBT_INFO("Test 1 seems ok, cool !(number of Process : %d, it should be 1 (i.e. the Test one))", MSG_process_get_number());
+    XBT_INFO("Test 1 seems ok, cool !(#Processes: %d, it should be 1; #tasks: %d)", MSG_process_get_number(), tasks_done);
   }
 
   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
@@ -69,7 +70,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);
@@ -84,13 +85,13 @@ 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);
     argvF = xbt_new(char*, 2);
     argvF[0] = xbt_strdup("commRX");
-    MSG_process_create_with_arguments("commRX", commRX, NULL, MSG_get_host_by_name("Tremblay"), 1, argvF);
+    MSG_process_create_with_arguments("commRX", commRX, NULL, MSG_host_by_name("Tremblay"), 1, argvF);
     argvF = xbt_new(char*, 2);
     argvF[0] = xbt_strdup("commTX");
     MSG_process_create_with_arguments("commTX", commTX, NULL, jupiter, 1, argvF);
@@ -102,7 +103,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);
@@ -111,16 +112,16 @@ int test_launcher(int argc, char *argv[])
     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);
+    MSG_process_create_with_arguments("commTX", commTX, NULL, MSG_host_by_name("Tremblay"), 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 2", MSG_process_get_number());
+    XBT_INFO("Test 5 seems ok, cool !(number of Process : %d, it should be 2", MSG_process_get_number());
   }
 
   test =6;
-  if (xbt_dynar_member(tests, &test)){
+  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
@@ -155,35 +156,35 @@ int test_launcher(int argc, char *argv[])
   }
 
   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!");
   return 0;
 }
 
-// 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", MSG_get_host_speed(MSG_host_self()), 0, NULL);
-    XBT_INFO("  Execute deamon");
+    task = MSG_task_create("daemon", MSG_get_host_speed(MSG_host_self()), 0, NULL);
+    XBT_INFO("  Execute daemon");
     MSG_task_execute(task);
     MSG_task_destroy(task);
+    tasks_done ++;
   }
-  XBT_INFO("  Deamon done. See you!");
+  XBT_INFO("  daemon done. See you!");
   return 0;
 }
 
@@ -254,11 +255,11 @@ int main(int argc, char *argv[])
      sscanf(xbt_dynar_get_as(s_tests, iter, char *), "%d", &tmp_test);
      xbt_dynar_set_as(tests, iter, int, tmp_test);
   }
+  xbt_dynar_free(&s_tests);
 
   platform_file = argv[1];
   application_file = argv[2];
 
-  /* MSG_config("workstation/model","KCCFLN05"); */
   {                             /*  Simulation setting */
     MSG_create_environment(platform_file);
   }
@@ -273,8 +274,5 @@ int main(int argc, char *argv[])
 
   XBT_INFO("Simulation time %g", MSG_get_clock());
 
-  if (res == MSG_OK)
-    return 0;
-  else
-    return 1;
+  return res != MSG_OK;
 }                               /* end_of_main */