X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d740a86eb8bb0e5d729e0ad55db7395444dad131..1bd3b1e9e02dd5662a771c1b382cfa1d1d9a2e08:/teshsuite/simdag/platforms/flatifier.tesh
diff --git a/teshsuite/simdag/platforms/flatifier.tesh b/teshsuite/simdag/platforms/flatifier.tesh
index bc0ac38a6a..afa52367a8 100644
--- a/teshsuite/simdag/platforms/flatifier.tesh
+++ b/teshsuite/simdag/platforms/flatifier.tesh
@@ -1,7 +1,9 @@
#! ./tesh
+! output sort
+
$ ${bindir:=.}/flatifier$EXEEXT one_cluster.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
-> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07
+> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
>
>
>
@@ -14,125 +16,263 @@ $ ${bindir:=.}/flatifier$EXEEXT one_cluster.xml "--log=root.fmt:[%10.6r]%e[%i:%P
>
>
>
->
->
->
->
->
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
>
+$ ${bindir:=.}/flatifier$EXEEXT one_cluster_multicore.xml "--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.
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
$ ${bindir:=.}/flatifier$EXEEXT one_host_availability.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
-> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07
+> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
>
>
>
@@ -146,7 +286,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_availability.xml "--log=root.fmt:[%10.6
>
$ ${bindir:=.}/flatifier$EXEEXT one_host_properties.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
-> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07
+> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
>
>
>
@@ -164,7 +304,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_properties.xml "--log=root.fmt:[%10.6r]
>
$ ${bindir:=.}/flatifier$EXEEXT one_host_state_file.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
-> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07
+> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
>
>
>
@@ -178,7 +318,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_state_file.xml "--log=root.fmt:[%10.6r]
>
$ ${bindir:=.}/flatifier$EXEEXT one_host_state_off.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
-> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07
+> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
>
>
>
@@ -192,7 +332,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_state_off.xml "--log=root.fmt:[%10.6r]%
>
$ ${bindir:=.}/flatifier$EXEEXT one_host_state_on.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
-> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07
+> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
>
>
>
@@ -206,7 +346,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_state_on.xml "--log=root.fmt:[%10.6r]%e
>
$ ${bindir:=.}/flatifier$EXEEXT one_host_trace_file.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
-> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07
+> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
>
>
>
@@ -220,7 +360,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_trace_file.xml "--log=root.fmt:[%10.6r]
>
$ ${bindir:=.}/flatifier$EXEEXT one_host_trace_inside.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
-> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07
+> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
>
>
>
@@ -234,7 +374,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_trace_inside.xml "--log=root.fmt:[%10.6
>
$ ${bindir:=.}/flatifier$EXEEXT one_host.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
-> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07
+> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
>
>
>
@@ -248,7 +388,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h
>
$ ${bindir:=.}/flatifier$EXEEXT one_link_availability.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
-> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07
+> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
>
>
>
@@ -263,7 +403,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_link_availability.xml "--log=root.fmt:[%10.6
>
$ ${bindir:=.}/flatifier$EXEEXT one_link_fatpipe.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
-> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07
+> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
>
>
>
@@ -278,7 +418,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_link_fatpipe.xml "--log=root.fmt:[%10.6r]%e[
>
$ ${bindir:=.}/flatifier$EXEEXT one_link_shared.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
-> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07
+> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
>
>
>
@@ -293,7 +433,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_link_shared.xml "--log=root.fmt:[%10.6r]%e[%
>
$ ${bindir:=.}/flatifier$EXEEXT one_link_state_file.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
-> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07
+> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
>
>
>
@@ -308,7 +448,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_link_state_file.xml "--log=root.fmt:[%10.6r]
>
$ ${bindir:=.}/flatifier$EXEEXT three_hosts_non_symmetric_route.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
-> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07
+> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
>
>
>
@@ -351,7 +491,7 @@ $ ${bindir:=.}/flatifier$EXEEXT three_hosts_non_symmetric_route.xml "--log=root.
>
$ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
-> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07
+> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
>
>
>
@@ -370,377 +510,387 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%
>
>
>
->
->
->
->
->
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
>
>
->
->
->
->
->
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
>
@@ -749,34 +899,34 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%
>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
>
@@ -785,41 +935,40 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%
>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
>
-
$ ${bindir:=.}/flatifier$EXEEXT two_hosts_multi_hop.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
-> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07
+> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
>
>
>
@@ -846,7 +995,7 @@ $ ${bindir:=.}/flatifier$EXEEXT two_hosts_multi_hop.xml "--log=root.fmt:[%10.6r]
>
$ ${bindir:=.}/flatifier$EXEEXT two_hosts_one_link.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
-> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07
+> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
>
>
>
@@ -870,8 +1019,8 @@ $ ${bindir:=.}/flatifier$EXEEXT two_hosts_one_link.xml "--log=root.fmt:[%10.6r]%
>
>
-$ ${bindir:=.}/flatifier$EXEEXT three_clusters_bypass.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
-> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07
+$ ${bindir:=.}/flatifier$EXEEXT ${srcdir:=.}/examples/platforms/bypassASroute.xml "--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.
>
>
>
@@ -887,62 +1036,65 @@ $ ${bindir:=.}/flatifier$EXEEXT three_clusters_bypass.xml "--log=root.fmt:[%10.6
>
>
>
->
->
->
+>
+>
+>
+>
+>
+>
>
->
+>
>
>
>
>
>
->
+>
>
>
>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
>
@@ -954,13 +1106,13 @@ $ ${bindir:=.}/flatifier$EXEEXT three_clusters_bypass.xml "--log=root.fmt:[%10.6
>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
>
@@ -972,13 +1124,13 @@ $ ${bindir:=.}/flatifier$EXEEXT three_clusters_bypass.xml "--log=root.fmt:[%10.6
>
>
>
->
+>
>
>
>
>
>
->
+>
>
>
>
@@ -990,13 +1142,629 @@ $ ${bindir:=.}/flatifier$EXEEXT three_clusters_bypass.xml "--log=root.fmt:[%10.6
>
>
>
->
+>
>
>
->
+>
>
>
->
+>
+>
+>
+>
+
+
+$ ${bindir:=.}/flatifier$EXEEXT ${srcdir:=.}/examples/platforms/torus_cluster.xml "--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.
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
>
>
->
\ No newline at end of file
+>
+