X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d9a2ba6da1bdc02e8adeb3e87f792d5291b2ea10..d42d0c6f54ae825a249799cb1e4e2920de5205c8:/teshsuite/simdag/platforms/flatifier.tesh
diff --git a/teshsuite/simdag/platforms/flatifier.tesh b/teshsuite/simdag/platforms/flatifier.tesh
index bdc2b5d2ed..afa52367a8 100644
--- a/teshsuite/simdag/platforms/flatifier.tesh
+++ b/teshsuite/simdag/platforms/flatifier.tesh
@@ -1,9 +1,11 @@
#! ./tesh
-$ ./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
+! output sort
+
+$ ${bindir:=.}/flatifier$EXEEXT one_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.
>
->
+>
>
>
>
@@ -14,141 +16,279 @@ $ ./flatifier$EXEEXT one_cluster.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n
>
>
>
->
->
->
->
->
->
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
>
->
->
->
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
->
->
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
>
>
->
+>
+>
+>
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
->
->
+>
+>
+
+$ ${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.
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
>
->
->
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
>
>
>
-$ ./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
+$ ${bindir:=.}/flatifier$EXEEXT one_host_availability.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.
>
->
+>
>
>
>
>
>
->
+>
>
>
>
-$ ./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
+$ ${bindir:=.}/flatifier$EXEEXT one_host_properties.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.
>
->
+>
>
>
>
@@ -158,159 +298,159 @@ $ ./flatifier$EXEEXT one_host_properties.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]
>
>
>
->
+>
>
>
>
-$ ./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
+$ ${bindir:=.}/flatifier$EXEEXT one_host_state_file.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.
>
->
+>
>
>
>
>
>
->
+>
>
>
>
-$ ./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
+$ ${bindir:=.}/flatifier$EXEEXT one_host_state_off.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.
>
->
+>
>
>
>
>
>
->
+>
>
>
>
-$ ./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
+$ ${bindir:=.}/flatifier$EXEEXT one_host_state_on.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.
>
->
+>
>
>
>
>
>
->
+>
>
>
>
-$ ./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
+$ ${bindir:=.}/flatifier$EXEEXT one_host_trace_file.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.
>
->
+>
>
>
>
>
>
->
+>
>
>
>
-$ ./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
+$ ${bindir:=.}/flatifier$EXEEXT one_host_trace_inside.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.
>
->
+>
>
>
>
>
>
->
+>
>
>
>
-$ ./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
+$ ${bindir:=.}/flatifier$EXEEXT one_host.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.
>
->
+>
>
>
>
>
>
->
+>
>
>
>
-$ ./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
+$ ${bindir:=.}/flatifier$EXEEXT one_link_availability.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.
>
->
+>
>
>
>
>
>
>
->
+>
>
>
>
-$ ./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
+$ ${bindir:=.}/flatifier$EXEEXT one_link_fatpipe.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.
>
->
+>
>
>
>
>
>
>
->
+>
>
>
>
-$ ./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
+$ ${bindir:=.}/flatifier$EXEEXT one_link_shared.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.
>
->
+>
>
>
>
>
>
>
->
+>
>
>
>
-$ ./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
+$ ${bindir:=.}/flatifier$EXEEXT one_link_state_file.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.
>
->
+>
>
>
>
>
>
>
->
+>
>
>
>
-$ ./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
+$ ${bindir:=.}/flatifier$EXEEXT three_hosts_non_symmetric_route.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.
>
->
+>
>
>
>
@@ -321,39 +461,39 @@ $ ./flatifier$EXEEXT three_hosts_non_symmetric_route.xml --log=root.fmt:[%10.6r]
>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
>
-$ ./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
+$ ${bindir:=.}/flatifier$EXEEXT two_clusters.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.
>
->
+>
>
>
>
@@ -370,459 +510,467 @@ $ ./flatifier$EXEEXT two_clusters.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n
>
>
>
->
->
->
->
->
->
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
>
>
->
->
->
->
->
->
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
>
->
+>
>
>
->
+>
>
>
->
->
->
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
->
->
->
+>
>
>
->
+>
+>
+>
+>
+>
+>
+>
>
>
->
+>
>
>
->
+>
>
>
->
->
->
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
->
->
->
+>
>
>
->
+>
+>
+>
+>
+>
+>
+>
>
>
->
+>
>
>
->
+>
>
>
->
->
->
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
->
->
->
+>
>
>
->
->
->
->
->
->
->
->
->
->
->
->
->
->
->
->
+>
>
->
->
->
->
->
->
->
->
->
->
->
->
->
->
->
->
->
+>
+>
>
->
->
+>
+>
>
>
->
+>
>
>
->
+>
>
>
->
->
->
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
->
->
->
+>
>
>
->
+>
+>
+>
+>
+>
+>
+>
>
>
->
+>
>
>
->
+>
>
>
->
->
->
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
->
->
->
+>
>
>
->
+>
+>
+>
+>
+>
+>
+>
>
>
->
+>
>
>
->
+>
>
>
->
->
->
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
->
->
->
+>
>
>
->
+>
+>
+>
+>
+>
+>
+>
>
>
->
+>
>
>
->
+>
>
>
->
->
->
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
->
->
->
+>
>
>
->
+>
+>
+>
+>
+>
+>
+>
>
>
->
+>
>
>
->
+>
>
>
->
->
->
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
->
->
->
+>
>
>
->
+>
+>
+>
+>
+>
+>
+>
>
>
->
+>
>
>
->
+>
>
>
->
->
->
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
+>
+>
+>
+>
+>
+>
>
>
->
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
>
>
>
-$ ./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
+$ ${bindir:=.}/flatifier$EXEEXT two_hosts_multi_hop.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.
>
->
+>
>
>
>
@@ -832,24 +980,24 @@ $ ./flatifier$EXEEXT two_hosts_multi_hop.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]
>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
>
-$ ./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
+$ ${bindir:=.}/flatifier$EXEEXT two_hosts_one_link.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.
>
->
+>
>
>
>
@@ -857,16 +1005,766 @@ $ ./flatifier$EXEEXT two_hosts_one_link.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%
>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
+>
+>
+>
+
+$ ${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.
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
>
>
>
+
+
+$ ${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.
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+