Tesh: Use 0 as a default sorting prefix

[simgrid.git] / examples / msg / icomms / peer.tesh

diff --git a/examples/msg/icomms/peer.tesh b/examples/msg/icomms/peer.tesh
index 02d08d4..184334e 100644 (file)
--- a/examples/msg/icomms/peer.tesh
+++ b/examples/msg/icomms/peer.tesh
@@ -1,11 +1,9 @@
 #! ./tesh
 
-
-
 p Test1 MSG_comm_test() with Sleep_sender > Sleep_receiver
 
-! output sort
-$ ./peer ${srcdir:=.}/small_platform.xml ${srcdir:=.}/deployment_peer01.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+! output sort 19
+$ ./peer ${srcdir:=.}/../../platforms/small_platform_fatpipe.xml ${srcdir:=.}/deployment_peer01.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:sender@Tremblay) sleep_start_time : 5.000000 , sleep_test_time : 0.100000
 > [  0.000000] (2:receiver@Ruby) sleep_start_time : 1.000000 , sleep_test_time : 0.100000
 > [  1.000000] (2:receiver@Ruby) Wait to receive a task
@@ -32,8 +30,8 @@ $ ./peer ${srcdir:=.}/small_platform.xml ${srcdir:=.}/deployment_peer01.xml "--l
 
 p Test2 MSG_comm_test() with Sleep_sender < Sleep_receiver
 
-! output sort
-$ ./peer ${srcdir:=.}/small_platform.xml ${srcdir:=.}/deployment_peer02.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+! output sort 19
+$ ./peer ${srcdir:=.}/../../platforms/small_platform_fatpipe.xml ${srcdir:=.}/deployment_peer02.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:sender@Tremblay) sleep_start_time : 1.000000 , sleep_test_time : 0.100000
 > [  0.000000] (2:receiver@Ruby) sleep_start_time : 5.000000 , sleep_test_time : 0.100000
 > [  1.000000] (1:sender@Tremblay) Send to receiver-0 Task_0
@@ -60,82 +58,83 @@ $ ./peer ${srcdir:=.}/small_platform.xml ${srcdir:=.}/deployment_peer02.xml "--l
 
 p Test1 MSG_comm_wait() with Sleep_sender > Sleep_receiver
 
-! output sort
-$ ./peer ${srcdir:=.}/small_platform.xml ${srcdir:=.}/deployment_peer03.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+! output sort 19
+$ ./peer ${srcdir:=.}/../../platforms/small_platform_fatpipe.xml ${srcdir:=.}/deployment_peer03.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:sender@Tremblay) sleep_start_time : 5.000000 , sleep_test_time : 0.000000
 > [  0.000000] (2:receiver@Ruby) sleep_start_time : 1.000000 , sleep_test_time : 0.000000
 > [  1.000000] (2:receiver@Ruby) Wait to receive a task
 > [  5.000000] (1:sender@Tremblay) Send to receiver-0 Task_0
-> [  5.016951] (1:sender@Tremblay) Send to receiver-0 Task_1
-> [  5.016951] (2:receiver@Ruby) Received "Task_0"
-> [  5.016951] (2:receiver@Ruby) Processing "Task_0"
-> [  5.526661] (2:receiver@Ruby) "Task_0" done
-> [  5.526661] (2:receiver@Ruby) Wait to receive a task
-> [  5.543613] (1:sender@Tremblay) Send to receiver-0 Task_2
-> [  5.543613] (2:receiver@Ruby) Received "Task_1"
-> [  5.543613] (2:receiver@Ruby) Processing "Task_1"
-> [  6.053323] (2:receiver@Ruby) "Task_1" done
-> [  6.053323] (2:receiver@Ruby) Wait to receive a task
-> [  6.070274] (1:sender@Tremblay) Send to receiver-0 finalize
-> [  6.070274] (2:receiver@Ruby) Received "Task_2"
-> [  6.070274] (2:receiver@Ruby) Processing "Task_2"
-> [  6.579984] (2:receiver@Ruby) "Task_2" done
-> [  6.579984] (2:receiver@Ruby) Wait to receive a task
-> [  6.581936] (0:@) Simulation time 6.58194
-> [  6.581936] (1:sender@Tremblay) Goodbye now!
-> [  6.581936] (2:receiver@Ruby) Received "finalize"
-> [  6.581936] (2:receiver@Ruby) I'm done. See you!
+> [  5.004022] (1:sender@Tremblay) Send to receiver-0 Task_1
+> [  5.004022] (2:receiver@Ruby) Received "Task_0"
+> [  5.004022] (2:receiver@Ruby) Processing "Task_0"
+> [  5.513732] (2:receiver@Ruby) "Task_0" done
+> [  5.513732] (2:receiver@Ruby) Wait to receive a task
+> [  5.517753] (1:sender@Tremblay) Send to receiver-0 Task_2
+> [  5.517753] (2:receiver@Ruby) Received "Task_1"
+> [  5.517753] (2:receiver@Ruby) Processing "Task_1"
+> [  6.027463] (2:receiver@Ruby) "Task_1" done
+> [  6.027463] (2:receiver@Ruby) Wait to receive a task
+> [  6.031485] (1:sender@Tremblay) Send to receiver-0 finalize
+> [  6.031485] (2:receiver@Ruby) Received "Task_2"
+> [  6.031485] (2:receiver@Ruby) Processing "Task_2"
+> [  6.541195] (2:receiver@Ruby) "Task_2" done
+> [  6.541195] (2:receiver@Ruby) Wait to receive a task
+> [  6.543146] (0:@) Simulation time 6.54315
+> [  6.543146] (1:sender@Tremblay) Goodbye now!
+> [  6.543146] (2:receiver@Ruby) Received "finalize"
+> [  6.543146] (2:receiver@Ruby) I'm done. See you!
+
 
 p Test2 MSG_comm_wait() with Sleep_sender < Sleep_receiver
 
-! output sort
-$ ./peer ${srcdir:=.}/small_platform.xml ${srcdir:=.}/deployment_peer04.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+! output sort 19
+$ ./peer ${srcdir:=.}/../../platforms/small_platform_fatpipe.xml ${srcdir:=.}/deployment_peer04.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:sender@Tremblay) sleep_start_time : 1.000000 , sleep_test_time : 0.000000
 > [  0.000000] (2:receiver@Ruby) sleep_start_time : 5.000000 , sleep_test_time : 0.000000
 > [  1.000000] (1:sender@Tremblay) Send to receiver-0 Task_0
 > [  5.000000] (2:receiver@Ruby) Wait to receive a task
-> [  5.016951] (1:sender@Tremblay) Send to receiver-0 Task_1
-> [  5.016951] (2:receiver@Ruby) Received "Task_0"
-> [  5.016951] (2:receiver@Ruby) Processing "Task_0"
-> [  5.526661] (2:receiver@Ruby) "Task_0" done
-> [  5.526661] (2:receiver@Ruby) Wait to receive a task
-> [  5.543613] (1:sender@Tremblay) Send to receiver-0 Task_2
-> [  5.543613] (2:receiver@Ruby) Received "Task_1"
-> [  5.543613] (2:receiver@Ruby) Processing "Task_1"
-> [  6.053323] (2:receiver@Ruby) "Task_1" done
-> [  6.053323] (2:receiver@Ruby) Wait to receive a task
-> [  6.070274] (1:sender@Tremblay) Send to receiver-0 finalize
-> [  6.070274] (2:receiver@Ruby) Received "Task_2"
-> [  6.070274] (2:receiver@Ruby) Processing "Task_2"
-> [  6.579984] (2:receiver@Ruby) "Task_2" done
-> [  6.579984] (2:receiver@Ruby) Wait to receive a task
-> [  6.581936] (0:@) Simulation time 6.58194
-> [  6.581936] (1:sender@Tremblay) Goodbye now!
-> [  6.581936] (2:receiver@Ruby) Received "finalize"
-> [  6.581936] (2:receiver@Ruby) I'm done. See you!
+> [  5.004022] (1:sender@Tremblay) Send to receiver-0 Task_1
+> [  5.004022] (2:receiver@Ruby) Received "Task_0"
+> [  5.004022] (2:receiver@Ruby) Processing "Task_0"
+> [  5.513732] (2:receiver@Ruby) "Task_0" done
+> [  5.513732] (2:receiver@Ruby) Wait to receive a task
+> [  5.517753] (1:sender@Tremblay) Send to receiver-0 Task_2
+> [  5.517753] (2:receiver@Ruby) Received "Task_1"
+> [  5.517753] (2:receiver@Ruby) Processing "Task_1"
+> [  6.027463] (2:receiver@Ruby) "Task_1" done
+> [  6.027463] (2:receiver@Ruby) Wait to receive a task
+> [  6.031485] (1:sender@Tremblay) Send to receiver-0 finalize
+> [  6.031485] (2:receiver@Ruby) Received "Task_2"
+> [  6.031485] (2:receiver@Ruby) Processing "Task_2"
+> [  6.541195] (2:receiver@Ruby) "Task_2" done
+> [  6.541195] (2:receiver@Ruby) Wait to receive a task
+> [  6.543146] (0:@) Simulation time 6.54315
+> [  6.543146] (1:sender@Tremblay) Goodbye now!
+> [  6.543146] (2:receiver@Ruby) Received "finalize"
+> [  6.543146] (2:receiver@Ruby) I'm done. See you!
 
-p Test1 MSG_comm_waitall() for sender 
+p Test1 MSG_comm_waitall() for sender
 
-! output sort
-$ ./peer2 ${srcdir:=.}/small_platform.xml ${srcdir:=.}/deployment_peer.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+! output sort 19
+$ ./peer2 ${srcdir:=.}/../../platforms/small_platform_fatpipe.xml ${srcdir:=.}/deployment_peer.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:sender@Tremblay) Send to receiver-0 Task_0
 > [  0.000000] (1:sender@Tremblay) Send to receiver-0 Task_1
 > [  0.000000] (1:sender@Tremblay) Send to receiver-0 Task_2
 > [  0.000000] (1:sender@Tremblay) Send to receiver-0 finalize
 > [ 10.000000] (2:receiver@Ruby) Wait to receive a task
-> [ 10.016952] (2:receiver@Ruby) Received "Task_0"
-> [ 10.016952] (2:receiver@Ruby) Processing "Task_0"
-> [ 10.526661] (2:receiver@Ruby) "Task_0" done
-> [ 10.526661] (2:receiver@Ruby) Wait to receive a task
-> [ 10.543613] (2:receiver@Ruby) Received "Task_1"
-> [ 10.543613] (2:receiver@Ruby) Processing "Task_1"
-> [ 11.053323] (2:receiver@Ruby) "Task_1" done
-> [ 11.053323] (2:receiver@Ruby) Wait to receive a task
-> [ 11.070274] (2:receiver@Ruby) Received "Task_2"
-> [ 11.070274] (2:receiver@Ruby) Processing "Task_2"
-> [ 11.579984] (2:receiver@Ruby) "Task_2" done
-> [ 11.579984] (2:receiver@Ruby) Wait to receive a task
-> [ 11.581936] (0:@) Simulation time 11.5819
-> [ 11.581936] (1:sender@Tremblay) Goodbye now!
-> [ 11.581936] (2:receiver@Ruby) Received "finalize"
-> [ 11.581936] (2:receiver@Ruby) I'm done. See you!
+> [ 10.004022] (2:receiver@Ruby) Received "Task_0"
+> [ 10.004022] (2:receiver@Ruby) Processing "Task_0"
+> [ 10.513732] (2:receiver@Ruby) "Task_0" done
+> [ 10.513732] (2:receiver@Ruby) Wait to receive a task
+> [ 10.517753] (2:receiver@Ruby) Received "Task_1"
+> [ 10.517753] (2:receiver@Ruby) Processing "Task_1"
+> [ 11.027463] (2:receiver@Ruby) "Task_1" done
+> [ 11.027463] (2:receiver@Ruby) Wait to receive a task
+> [ 11.031485] (2:receiver@Ruby) Received "Task_2"
+> [ 11.031485] (2:receiver@Ruby) Processing "Task_2"
+> [ 11.541195] (2:receiver@Ruby) "Task_2" done
+> [ 11.541195] (2:receiver@Ruby) Wait to receive a task
+> [ 11.543146] (0:@) Simulation time 11.5431
+> [ 11.543146] (1:sender@Tremblay) Goodbye now!
+> [ 11.543146] (2:receiver@Ruby) Received "finalize"
+> [ 11.543146] (2:receiver@Ruby) I'm done. See you!