Uptade the teshsuite of SimDag to take the INFO -> VERB change

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7836 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/teshsuite/simdag/basic0.c b/teshsuite/simdag/basic0.c
index d66eb00..a178f22 100644 (file)
--- a/teshsuite/simdag/basic0.c
+++ b/teshsuite/simdag/basic0.c
@@ -7,6 +7,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "simdag/simdag.h"
+#include "xbt/log.h"
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(basic0, sd, "SimDag test basic0");
 
 int main(int argc, char **argv)
 {
@@ -21,7 +24,7 @@ int main(int argc, char **argv)
   double communication_amount2[] = { 0, 1, 0, 0 };
   const double no_cost[] = { 0.0, 0.0 };
 
-  /* initialisation of SD */
+  /* initialization of SD */
   SD_init(&argc, argv);
 
   /* creation of the environment */
@@ -49,6 +52,8 @@ int main(int argc, char **argv)
 
   SD_simulate(-1.0);
 
+  INFO1("Simulation time: %f", SD_get_clock());
+
   SD_exit();
   return 0;
 }

diff --git a/teshsuite/simdag/basic0.tesh b/teshsuite/simdag/basic0.tesh
index 85eaa1f..4d0a6a1 100644 (file)
--- a/teshsuite/simdag/basic0.tesh
+++ b/teshsuite/simdag/basic0.tesh
@@ -1,9 +1,2 @@
 $ simdag/basic0 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir}
-> [0.000000] [sd_kernel/INFO] Starting simulation...
-> [0.000000] [sd_kernel/INFO] Executing task 'Init'
-> [0.000000] [sd_kernel/INFO] Task 'Init' done
-> [0.000000] [sd_kernel/INFO] Executing task 'Task Comm 1'
-> [0.000000] [sd_kernel/INFO] Executing task 'Task Comm 2'
-> [0.000100] [sd_kernel/INFO] Task 'Task Comm 2' done
-> [1.000100] [sd_kernel/INFO] Task 'Task Comm 1' done
-> [1.000100] [sd_kernel/INFO] Simulation finished
+> [1.000100] [basic0/INFO] Simulation time: 1.000100
\ No newline at end of file

diff --git a/teshsuite/simdag/basic1.c b/teshsuite/simdag/basic1.c
index 2dccd6f..f9e216a 100644 (file)
--- a/teshsuite/simdag/basic1.c
+++ b/teshsuite/simdag/basic1.c
@@ -7,6 +7,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "simdag/simdag.h"
+#include "xbt/log.h"
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(basic1, sd, "SimDag test basic1");
 
 int main(int argc, char **argv)
 {
@@ -21,7 +24,7 @@ int main(int argc, char **argv)
 
   const SD_workstation_t *workstation;
 
-  /* initialisation of SD */
+  /* initialization of SD */
   SD_init(&argc, argv);
 
   /* creation of the environment */
@@ -50,6 +53,7 @@ int main(int argc, char **argv)
   SD_task_dependency_add(NULL, NULL, taskInit, taskB);
 
   SD_simulate(-1.0);
+  INFO1("Simulation time: %f", SD_get_clock());
 
   SD_exit();
   return 0;

diff --git a/teshsuite/simdag/basic1.tesh b/teshsuite/simdag/basic1.tesh
index e406fce..d5d4b24 100644 (file)
--- a/teshsuite/simdag/basic1.tesh
+++ b/teshsuite/simdag/basic1.tesh
@@ -1,9 +1,2 @@
 $ simdag/basic1 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir}
-> [0.000000] [sd_kernel/INFO] Starting simulation...
-> [0.000000] [sd_kernel/INFO] Executing task 'Init'
-> [0.000000] [sd_kernel/INFO] Task 'Init' done
-> [0.000000] [sd_kernel/INFO] Executing task 'Task Comm A'
-> [0.000000] [sd_kernel/INFO] Executing task 'Task Comm B'
-> [16.000100] [sd_kernel/INFO] Task 'Task Comm A' done
-> [16.000100] [sd_kernel/INFO] Task 'Task Comm B' done
-> [16.000100] [sd_kernel/INFO] Simulation finished
+> [16.000100] [basic1/INFO] Simulation time: 16.000100
\ No newline at end of file

diff --git a/teshsuite/simdag/basic2.c b/teshsuite/simdag/basic2.c
index 78bf4cf..2f9d230 100644 (file)
--- a/teshsuite/simdag/basic2.c
+++ b/teshsuite/simdag/basic2.c
@@ -7,6 +7,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "simdag/simdag.h"
+#include "xbt/log.h"
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(basic2, sd, "SimDag test basic2");
 
 int main(int argc, char **argv)
 {
@@ -21,7 +24,7 @@ int main(int argc, char **argv)
   double communication_amount2 = 100000000;
   double no_cost = 0.0;
 
-  /* initialisation of SD */
+  /* initialization of SD */
   SD_init(&argc, argv);
 
   /* creation of the environment */
@@ -50,6 +53,8 @@ int main(int argc, char **argv)
 
   SD_simulate(-1.0);
 
+  INFO1("Simulation time: %f", SD_get_clock());
+
   SD_exit();
   return 0;
 }

diff --git a/teshsuite/simdag/basic2.tesh b/teshsuite/simdag/basic2.tesh
index 871edd7..d640327 100644 (file)
--- a/teshsuite/simdag/basic2.tesh
+++ b/teshsuite/simdag/basic2.tesh
@@ -1,9 +1,2 @@
 $ simdag/basic2 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir}
-> [0.000000] [sd_kernel/INFO] Starting simulation...
-> [0.000000] [sd_kernel/INFO] Executing task 'Init'
-> [0.000000] [sd_kernel/INFO] Task 'Init' done
-> [0.000000] [sd_kernel/INFO] Executing task 'Task Comm A'
-> [0.000000] [sd_kernel/INFO] Executing task 'Task Comm B'
-> [1.600100] [sd_kernel/INFO] Task 'Task Comm B' done
-> [10.600100] [sd_kernel/INFO] Task 'Task Comm A' done
-> [10.600100] [sd_kernel/INFO] Simulation finished
+> [10.600100] [basic2/INFO] Simulation time: 10.600100
\ No newline at end of file

diff --git a/teshsuite/simdag/basic3.c b/teshsuite/simdag/basic3.c
index 9e764a7..2fa069a 100644 (file)
--- a/teshsuite/simdag/basic3.c
+++ b/teshsuite/simdag/basic3.c
@@ -7,6 +7,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "simdag/simdag.h"
+#include "xbt/log.h"
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(basic3, sd, "SimDag test basic3");
 
 int main(int argc, char **argv)
 {
@@ -19,7 +22,7 @@ int main(int argc, char **argv)
 
   double no_cost[] = { 0.0, 0.0, 0.0, 0.0 };
 
-  /* initialisation of SD */
+  /* initialization of SD */
   SD_init(&argc, argv);
 
   /* creation of the environment */
@@ -43,6 +46,8 @@ int main(int argc, char **argv)
 
   SD_simulate(-1.0);
 
+  INFO1("Simulation time: %f", SD_get_clock());
+
   SD_exit();
   return 0;
 }

diff --git a/teshsuite/simdag/basic3.tesh b/teshsuite/simdag/basic3.tesh
index 23a2775..95bc9bb 100644 (file)
--- a/teshsuite/simdag/basic3.tesh
+++ b/teshsuite/simdag/basic3.tesh
@@ -1,9 +1,2 @@
 $ simdag/basic3 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir}
-> [0.000000] [sd_kernel/INFO] Starting simulation...
-> [0.000000] [sd_kernel/INFO] Executing task 'Task Init'
-> [0.000000] [sd_kernel/INFO] Task 'Task Init' done
-> [0.000000] [sd_kernel/INFO] Executing task 'Task A'
-> [0.000000] [sd_kernel/INFO] Task 'Task A' done
-> [0.000000] [sd_kernel/INFO] Executing task 'Task Fin'
-> [0.000000] [sd_kernel/INFO] Task 'Task Fin' done
-> [0.000000] [sd_kernel/INFO] Simulation finished
+> [0.000000] [basic3/INFO] Simulation time: 0.000000
\ No newline at end of file

diff --git a/teshsuite/simdag/basic4.c b/teshsuite/simdag/basic4.c
index bdf7be3..7009d3d 100644 (file)
--- a/teshsuite/simdag/basic4.c
+++ b/teshsuite/simdag/basic4.c
@@ -7,6 +7,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "simdag/simdag.h"
+#include "xbt/log.h"
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(basic4, sd, "SimDag test basic4");
 
 int main(int argc, char **argv)
 {
@@ -47,6 +50,8 @@ int main(int argc, char **argv)
 
   SD_simulate(-1.0);
 
+  INFO1("Simulation time: %f", SD_get_clock());
+
   SD_exit();
   return 0;
 }

diff --git a/teshsuite/simdag/basic4.tesh b/teshsuite/simdag/basic4.tesh
index 2dc4f39..f23a818 100644 (file)
--- a/teshsuite/simdag/basic4.tesh
+++ b/teshsuite/simdag/basic4.tesh
@@ -1,9 +1,2 @@
 $ simdag/basic4 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir}
-> [0.000000] [sd_kernel/INFO] Starting simulation...
-> [0.000000] [sd_kernel/INFO] Executing task 'Task Init'
-> [0.000000] [sd_kernel/INFO] Task 'Task Init' done
-> [0.000000] [sd_kernel/INFO] Executing task 'Task A'
-> [0.000100] [sd_kernel/INFO] Task 'Task A' done
-> [0.000100] [sd_kernel/INFO] Executing task 'Task Fin'
-> [0.000100] [sd_kernel/INFO] Task 'Task Fin' done
-> [0.000100] [sd_kernel/INFO] Simulation finished
+> [0.000100] [basic4/INFO] Simulation time: 0.000100

diff --git a/teshsuite/simdag/basic5.c b/teshsuite/simdag/basic5.c
index c79e162..48a988b 100644 (file)
--- a/teshsuite/simdag/basic5.c
+++ b/teshsuite/simdag/basic5.c
@@ -7,6 +7,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "simdag/simdag.h"
+#include "xbt/log.h"
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(basic5, sd, "SimDag test basic5");
 
 int main(int argc, char **argv)
 {
@@ -23,7 +26,7 @@ int main(int argc, char **argv)
   double amount[] = { 0., 100000., 0., 0. };
   double comput[] = { 10000000. };
 
-  /* initialisation of SD */
+  /* initialization of SD */
   SD_init(&argc, argv);
 
   /* creation of the environment */
@@ -47,6 +50,8 @@ int main(int argc, char **argv)
 
   SD_simulate(-1.0);
 
+  INFO1("Simulation time: %f", SD_get_clock());
+
   SD_exit();
   return 0;
 }

diff --git a/teshsuite/simdag/basic5.tesh b/teshsuite/simdag/basic5.tesh
index b6625cc..62f302a 100644 (file)
--- a/teshsuite/simdag/basic5.tesh
+++ b/teshsuite/simdag/basic5.tesh
@@ -1,9 +1,2 @@
 $ simdag/basic5 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir}
-> [0.000000] [sd_kernel/INFO] Starting simulation...
-> [0.000000] [sd_kernel/INFO] Executing task 'Task Init'
-> [0.000000] [sd_kernel/INFO] Task 'Task Init' done
-> [0.000000] [sd_kernel/INFO] Executing task 'Task A'
-> [0.000000] [sd_kernel/INFO] Executing task 'Task B'
-> [0.001100] [sd_kernel/INFO] Task 'Task A' done
-> [0.002500] [sd_kernel/INFO] Task 'Task B' done
-> [0.002500] [sd_kernel/INFO] Simulation finished
+> [0.002500] [basic5/INFO] Simulation time: 0.002500

diff --git a/teshsuite/simdag/basic6.c b/teshsuite/simdag/basic6.c
index 176719b..d5c3078 100644 (file)
--- a/teshsuite/simdag/basic6.c
+++ b/teshsuite/simdag/basic6.c
@@ -9,6 +9,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "simdag/simdag.h"
+#include "xbt/log.h"
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(basic6, sd, "SimDag test basic6");
 
 int main(int argc, char **argv)
 {
@@ -29,6 +32,8 @@ int main(int argc, char **argv)
 
   SD_simulate(-1.0);
 
+  INFO1("Simulation time: %f", SD_get_clock());
+
   SD_exit();
   return 0;
 }

diff --git a/teshsuite/simdag/basic6.tesh b/teshsuite/simdag/basic6.tesh
index 1dc1ab8..f035c30 100644 (file)
--- a/teshsuite/simdag/basic6.tesh
+++ b/teshsuite/simdag/basic6.tesh
@@ -1,7 +1,3 @@
 $ simdag/basic6 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --surf-path=${srcdir}
-> [0.000000] [sd_kernel/INFO] Starting simulation...
-> [0.000000] [sd_kernel/INFO] Executing task 'Task A'
-> [0.000000] [sd_kernel/INFO] Executing task 'Task B'
-> [2.000000] [sd_kernel/INFO] Task 'Task A' done
-> [2.000000] [sd_kernel/INFO] Task 'Task B' done
-> [2.000000] [sd_kernel/INFO] Simulation finished
+> [2.000000] [basic6/INFO] Simulation time: 2.000000
+