cosmetics in teshsuite

diff --git a/teshsuite/simdag/comm-mxn-all2all/comm-mxn-all2all.c b/teshsuite/simdag/comm-mxn-all2all/comm-mxn-all2all.c
index 7e746af..9aeb6b0 100644 (file)
--- a/teshsuite/simdag/comm-mxn-all2all/comm-mxn-all2all.c
+++ b/teshsuite/simdag/comm-mxn-all2all/comm-mxn-all2all.c
@@ -6,8 +6,8 @@
 /* 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 "simgrid/simdag.h"
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(comm_mxn_all2all, sd, "SimDag test All2All");
 
 /*
  * intra communication test
@@ -25,19 +25,16 @@ int main(int argc, char **argv)
                                     1.0, 1.0, 0.0, 1.0,
                                     1.0, 1.0, 1.0, 0.0 };
 
-  double no_cost[] = { 0.0, 0.0, 0.0, 0.0 };
-
   SD_init(&argc, argv);
   SD_create_environment(argv[1]);
 
   SD_task_t task = SD_task_create("All2all task", NULL, 1.0);
 
-  SD_task_schedule(task, 4, sg_host_list(), no_cost, communication_amount, -1.0);
+  SD_task_schedule(task, 4, sg_host_list(), SD_SCHED_NO_COST, communication_amount, -1.0);
 
   SD_simulate(-1.0);
 
-  printf("%g\n", SD_get_clock());
-  fflush(stdout);
+  XBT_INFO("%g", SD_get_clock());
 
   SD_task_destroy(task);
 

diff --git a/teshsuite/simdag/comm-mxn-all2all/comm-mxn-all2all.tesh b/teshsuite/simdag/comm-mxn-all2all/comm-mxn-all2all.tesh
index e73348e..f4edb07 100644 (file)
--- a/teshsuite/simdag/comm-mxn-all2all/comm-mxn-all2all.tesh
+++ b/teshsuite/simdag/comm-mxn-all2all/comm-mxn-all2all.tesh
@@ -3,4 +3,4 @@ p all 2 all test, only fat pipe switch is used concurrently
 
 $ ${bindir:=.}/comm-mxn-all2all ../platforms/platform_4p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
-> 8
+> [  8.000000] (0:maestro@) 8

diff --git a/teshsuite/simdag/comm-mxn-independent/comm-mxn-independent.c b/teshsuite/simdag/comm-mxn-independent/comm-mxn-independent.c
index 56d851e..59cbb8d 100644 (file)
--- a/teshsuite/simdag/comm-mxn-independent/comm-mxn-independent.c
+++ b/teshsuite/simdag/comm-mxn-independent/comm-mxn-independent.c
@@ -6,8 +6,8 @@
 /* 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 "simgrid/simdag.h"
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(comm_mxn_independent, sd, "SimDag test independent communications");
 
 /*
  * intra communication test
@@ -26,19 +26,16 @@ int main(int argc, char **argv)
                                     0.0, 0.0, 0.0, 1.0,
                                     0.0, 0.0, 0.0, 0.0 };
 
-  double no_cost[] = { 0.0, 0.0, 0.0, 0.0 };
-
   SD_init(&argc, argv);
   SD_create_environment(argv[1]);
 
   SD_task_t task = SD_task_create("Comm 1", NULL, 1.0);
 
-  SD_task_schedule(task, 4, sg_host_list(), no_cost, communication_amount, -1.0);
+  SD_task_schedule(task, 4, sg_host_list(), SD_SCHED_NO_COST, communication_amount, -1.0);
 
   SD_simulate(-1.0);
 
-  printf("%g\n", SD_get_clock());
-  fflush(stdout);
+  XBT_INFO("%g", SD_get_clock());
 
   SD_task_destroy(task);
 

diff --git a/teshsuite/simdag/comm-mxn-independent/comm-mxn-independent.tesh b/teshsuite/simdag/comm-mxn-independent/comm-mxn-independent.tesh
index 5a6c3bb..fde722f 100644 (file)
--- a/teshsuite/simdag/comm-mxn-independent/comm-mxn-independent.tesh
+++ b/teshsuite/simdag/comm-mxn-independent/comm-mxn-independent.tesh
@@ -3,4 +3,4 @@ p sending on different paths test
 
 $ ${bindir:=.}/comm-mxn-independent ../platforms/platform_4p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
-> 3
+> [  3.000000] (0:maestro@) 3

diff --git a/teshsuite/simdag/comm-mxn-scatter/comm-mxn-scatter.c b/teshsuite/simdag/comm-mxn-scatter/comm-mxn-scatter.c
index 8fc362d..e26c44a 100644 (file)
--- a/teshsuite/simdag/comm-mxn-scatter/comm-mxn-scatter.c
+++ b/teshsuite/simdag/comm-mxn-scatter/comm-mxn-scatter.c
@@ -6,8 +6,8 @@
 /* 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 "simgrid/simdag.h"
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(comm_mxn_scatter, sd, "SimDag test scatter");
 
 /*
  * intra communication test 1
@@ -22,24 +22,21 @@
 
 int main(int argc, char **argv)
 {
-
   double communication_amount[] = { 0.0, 1.0, 2.0, 3.0,
                                     0.0, 0.0, 0.0, 0.0,
                                     0.0, 0.0, 0.0, 0.0,
                                     0.0, 0.0, 0.0, 0.0 };
-  double no_cost[] = { 0.0, 0.0, 0.0, 0.0 };
 
   SD_init(&argc, argv);
   SD_create_environment(argv[1]);
 
   SD_task_t task = SD_task_create("Scatter task", NULL, 1.0);
 
-  SD_task_schedule(task, 4, sg_host_list(), no_cost, communication_amount, -1.0);
+  SD_task_schedule(task, 4, sg_host_list(), SD_SCHED_NO_COST, communication_amount, -1.0);
 
   SD_simulate(-1.0);
 
-  printf("%g\n", SD_get_clock());
-  fflush(stdout);
+  XBT_INFO("%g", SD_get_clock());
 
   SD_task_destroy(task);
 

diff --git a/teshsuite/simdag/comm-mxn-scatter/comm-mxn-scatter.tesh b/teshsuite/simdag/comm-mxn-scatter/comm-mxn-scatter.tesh
index 627b9fe..4eaeddf 100644 (file)
--- a/teshsuite/simdag/comm-mxn-scatter/comm-mxn-scatter.tesh
+++ b/teshsuite/simdag/comm-mxn-scatter/comm-mxn-scatter.tesh
@@ -3,4 +3,4 @@ p scatter test
 
 $ ${bindir:=.}/comm-mxn-scatter ../platforms/platform_4p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
-> 8
+> [  8.000000] (0:maestro@) 8