X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/999a64fe86043f1b9cc777db6a5cdc4e34c4c922..07c319ec54d6fc778ee3cc5e75a747242006723e:/examples/msg/actions/actions.tesh

diff --git a/examples/msg/actions/actions.tesh b/examples/msg/actions/actions.tesh
index 193608086d..632a2bf0ba 100644
--- a/examples/msg/actions/actions.tesh
+++ b/examples/msg/actions/actions.tesh
@@ -1,76 +1,81 @@
 # A little tesh file testing most MPI-related actions
 
 
-$ ./actions --log=actions.thres=verbose --log=root.fmt:[%h:%P:(%i)%e%r]%e%m%n homogeneous_3_hosts.xml deployment_split.xml
-> [host0:p0:(1) 500.005200] p0 recv p1 500.005200
-> [host1:p1:(2) 500.005200] p1 send p0 1e10 500.005200
-> [host0:p0:(1) 500.005201] p0 compute 12 0.000001
-> [host1:p1:(2) 512.005200] p1 sleep 12 12.000000 
-> [::(0) 512.005200] Simulation time 512.005
+! output sort
+$ ./actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment_split.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
+> [500.005200] (1:p0@host0) p0 recv p1 500.005200
+> [500.005200] (2:p1@host1) p1 send p0 1e10 500.005200
+> [500.005201] (1:p0@host0) p0 compute 12 0.000001
+> [512.005200] (0:@) Simulation time 512.005
+> [512.005200] (2:p1@host1) p1 sleep 12 12.000000 
 
-$ ./actions --log=actions.thres=verbose --log=root.fmt:[%h:%P:(%i)%e%r]%e%m%n homogeneous_3_hosts.xml deployment.xml actions_allReduce.txt
-> [host0:p0:(1) 0.000000] p0 comm_size 3 0.000000
-> [host1:p1:(2) 100.015912] p1 allReduce 5e8 5e8 100.015912
-> [host2:p2:(3) 100.021112] p2 allReduce 5e8 5e8 100.021112
-> [host0:p0:(1) 100.021112] p0 allReduce 5e8 5e8 100.021112
-> [host1:p1:(2) 150.015912] p1 compute 5e8 50.000000
-> [host0:p0:(1) 150.021112] p0 compute 5e8 50.000000
-> [host2:p2:(3) 150.021112] p2 compute 5e8 50.000000
-> [::(0) 150.021112] Simulation time 150.021
+! output sort
+$ ./actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment.xml actions_allReduce.txt --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
+> [  0.000000] (1:p0@host0) p0 comm_size 3 0.000000
+> [100.015912] (2:p1@host1) p1 allReduce 5e8 5e8 100.015912
+> [100.021112] (1:p0@host0) p0 allReduce 5e8 5e8 100.021112
+> [100.021112] (3:p2@host2) p2 allReduce 5e8 5e8 100.021112
+> [150.015912] (2:p1@host1) p1 compute 5e8 50.000000
+> [150.021112] (0:@) Simulation time 150.021
+> [150.021112] (1:p0@host0) p0 compute 5e8 50.000000
+> [150.021112] (3:p2@host2) p2 compute 5e8 50.000000
 
-$ ./actions --log=actions.thres=verbose --log=root.fmt:[%h:%P:(%i)%e%r]%e%m%n homogeneous_3_hosts.xml deployment.xml actions_barrier.txt
-> [host0:p0:(1) 0.000000] p0 comm_size 3 0.000000
-> [host1:p1:(2) 0.000000] p1 comm_size 3 0.000000
-> [host2:p2:(3) 0.000000] p2 comm_size 3 0.000000
-> [host0:p0:(1) 0.505200] p0 send p1 1E7 0.505200
-> [host1:p1:(2) 0.505200] p1 recv p0 0.505200
-> [host1:p1:(2) 0.905200] p1 compute 4E6 0.400000
-> [host2:p2:(3) 0.905200] p2 compute 4E6 0.400000
-> [host0:p0:(1) 0.955200] p0 compute 4.5E6 0.450000
-> [::(0) 0.955200] Simulation time 0.9552
+! output sort
+$ ./actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment.xml actions_barrier.txt --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
+> [  0.000000] (1:p0@host0) p0 comm_size 3 0.000000
+> [  0.000000] (2:p1@host1) p1 comm_size 3 0.000000
+> [  0.000000] (3:p2@host2) p2 comm_size 3 0.000000
+> [  0.505200] (1:p0@host0) p0 send p1 1E7 0.505200
+> [  0.505200] (2:p1@host1) p1 recv p0 0.505200
+> [  0.905200] (2:p1@host1) p1 compute 4E6 0.400000
+> [  0.905200] (3:p2@host2) p2 compute 4E6 0.400000
+> [  0.955200] (0:@) Simulation time 0.9552
+> [  0.955200] (1:p0@host0) p0 compute 4.5E6 0.450000
 
-$ ./actions --log=actions.thres=verbose --log=root.fmt:[%h:%P:(%i)%e%r]%e%m%n homogeneous_3_hosts.xml deployment.xml actions_bcast.txt
-> [host0:p0:(1) 0.000000] p0 comm_size 3 0.000000
-> [host1:p1:(2) 25.010400] p1 bcast 5e8 25.010400
-> [host2:p2:(3) 25.015600] p2 bcast 5e8 25.015600
-> [host0:p0:(1) 25.015600] p0 bcast 5e8 25.015600
-> [host1:p1:(2) 45.010400] p1 compute 2e8 20.000000
-> [host0:p0:(1) 75.015600] p0 compute 5e8 50.000000
-> [host2:p2:(3) 75.015600] p2 compute 5e8 50.000000
-> [host1:p1:(2) 100.026000] p1 bcast 5e8 55.015600
-> [host2:p2:(3) 100.031200] p2 bcast 5e8 25.015600
-> [host0:p0:(1) 100.031200] p0 bcast 5e8 25.015600
-> [host1:p1:(2) 120.026000] p1 compute 2e8 20.000000
-> [host0:p0:(1) 150.031200] p0 compute 5e8 50.000000
-> [host2:p2:(3) 150.031200] p2 compute 5e8 50.000000
-> [host1:p1:(2) 175.036400] p1 reduce 5e8 5e8 55.010400
-> [host2:p2:(3) 175.036400] p2 reduce 5e8 5e8 25.005200
-> [host0:p0:(1) 225.036712] p0 reduce 5e8 5e8 75.005512
-> [::(0) 225.036712] Simulation time 225.037
+! output sort
+$ ./actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment.xml actions_bcast.txt --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
+> [  0.000000] (1:p0@host0) p0 comm_size 3 0.000000
+> [ 25.010400] (2:p1@host1) p1 bcast 5e8 25.010400
+> [ 25.015600] (1:p0@host0) p0 bcast 5e8 25.015600
+> [ 25.015600] (3:p2@host2) p2 bcast 5e8 25.015600
+> [ 45.010400] (2:p1@host1) p1 compute 2e8 20.000000
+> [ 75.015600] (1:p0@host0) p0 compute 5e8 50.000000
+> [ 75.015600] (3:p2@host2) p2 compute 5e8 50.000000
+> [100.026000] (2:p1@host1) p1 bcast 5e8 55.015600
+> [100.031200] (1:p0@host0) p0 bcast 5e8 25.015600
+> [100.031200] (3:p2@host2) p2 bcast 5e8 25.015600
+> [120.026000] (2:p1@host1) p1 compute 2e8 20.000000
+> [150.031200] (1:p0@host0) p0 compute 5e8 50.000000
+> [150.031200] (3:p2@host2) p2 compute 5e8 50.000000
+> [175.036400] (2:p1@host1) p1 reduce 5e8 5e8 55.010400
+> [175.036400] (3:p2@host2) p2 reduce 5e8 5e8 25.005200
+> [225.036712] (0:@) Simulation time 225.037
+> [225.036712] (1:p0@host0) p0 reduce 5e8 5e8 75.005512
 
-$ ./actions --log=actions.thres=verbose --log=root.fmt:[%h:%P:(%i)%e%r]%e%m%n homogeneous_3_hosts.xml deployment.xml actions_reduce.txt
-> [host0:p0:(1) 0.000000] p0 comm_size 3 0.000000
-> [host1:p1:(2) 25.005200] p1 reduce 5e8 5e8 25.005200
-> [host2:p2:(3) 25.005200] p2 reduce 5e8 5e8 25.005200
-> [host1:p1:(2) 75.005200] p1 compute 5e8 50.000000
-> [host2:p2:(3) 75.005200] p2 compute 5e8 50.000000
-> [host0:p0:(1) 75.005512] p0 reduce 5e8 5e8 75.005512
-> [host0:p0:(1) 125.005512] p0 compute 5e8 50.000000
-> [::(0) 125.005512] Simulation time 125.006
+! output sort
+$ ./actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment.xml actions_reduce.txt --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
+> [  0.000000] (1:p0@host0) p0 comm_size 3 0.000000
+> [ 25.005200] (2:p1@host1) p1 reduce 5e8 5e8 25.005200
+> [ 25.005200] (3:p2@host2) p2 reduce 5e8 5e8 25.005200
+> [ 75.005200] (2:p1@host1) p1 compute 5e8 50.000000
+> [ 75.005200] (3:p2@host2) p2 compute 5e8 50.000000
+> [ 75.005512] (1:p0@host0) p0 reduce 5e8 5e8 75.005512
+> [125.005512] (0:@) Simulation time 125.006
+> [125.005512] (1:p0@host0) p0 compute 5e8 50.000000
 
-$ ./actions --log=actions.thres=verbose --log=root.fmt:[%h:%P:(%i)%e%r]%e%m%n homogeneous_3_hosts.xml deployment.xml actions_with_isend.txt
-> [host1:p1:(2) 0.000000] p1 Irecv p0 0.000000
-> [host2:p2:(3) 0.000000] p2 Irecv p1 0.000000
-> [host2:p2:(3) 50.000000] p2 compute 5e8 50.000000
-> [host0:p0:(1) 50.005200] p0 send p1 1e9 50.005200
-> [host1:p1:(2) 100.000000] p1 compute 1e9 100.000000
-> [host1:p1:(2) 100.000156] p1 wait 0.000156
-> [host0:p0:(1) 150.005200] p0 compute 1e9 100.000000
-> [host1:p1:(2) 150.005356] p1 send p2 1e9 50.005200
-> [host2:p2:(3) 150.005512] p2 wait 100.005512
-> [host2:p2:(3) 150.005512] p2 Isend p0 1e9 0.000000
-> [host2:p2:(3) 200.005512] p2 compute 5e8 50.000000
-> [host0:p0:(1) 200.010712] p0 recv p2 50.005512
-> [::(0) 200.010712] Simulation time 200.011
+! output sort
+$ ./actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment.xml actions_with_isend.txt --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
+> [  0.000000] (2:p1@host1) p1 Irecv p0 0.000000
+> [  0.000000] (3:p2@host2) p2 Irecv p1 0.000000
+> [ 50.000000] (3:p2@host2) p2 compute 5e8 50.000000
+> [ 50.005200] (1:p0@host0) p0 send p1 1e9 50.005200
+> [100.000000] (2:p1@host1) p1 compute 1e9 100.000000
+> [100.000156] (2:p1@host1) p1 wait 0.000156
+> [150.005200] (1:p0@host0) p0 compute 1e9 100.000000
+> [150.005356] (2:p1@host1) p1 send p2 1e9 50.005200
+> [150.005512] (3:p2@host2) p2 wait 100.005512
+> [150.005512] (3:p2@host2) p2 Isend p0 1e9 0.000000
+> [200.005512] (3:p2@host2) p2 compute 5e8 50.000000
+> [200.010712] (0:@) Simulation time 200.011
+> [200.010712] (1:p0@host0) p0 recv p2 50.005512
 
-	   
\ No newline at end of file