X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/07c319ec54d6fc778ee3cc5e75a747242006723e..687dd96433495ec61a5ffd5b4437b6e5808993c6:/examples/msg/icomms/peer.tesh

diff --git a/examples/msg/icomms/peer.tesh b/examples/msg/icomms/peer.tesh
index 5c75a0f08c..e2e9e5cfe7 100644
--- 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 small_platform.xml deployment_peer01.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
+$ ./peer ${srcdir:=.}/small_platform.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
@@ -30,11 +28,10 @@ $ ./peer small_platform.xml deployment_peer01.xml --log=root.fmt:[%10.6r]%e(%i:%
 > [  6.929130] (2:receiver@Ruby) Received "finalize"
 > [  6.929130] (2:receiver@Ruby) I'm done. See you!
 
-
 p Test2 MSG_comm_test() with Sleep_sender < Sleep_receiver
 
 ! output sort
-$ ./peer small_platform.xml deployment_peer02.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
+$ ./peer ${srcdir:=.}/small_platform.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
@@ -59,89 +56,84 @@ $ ./peer small_platform.xml deployment_peer02.xml --log=root.fmt:[%10.6r]%e(%i:%
 > [  6.929130] (2:receiver@Ruby) Received "finalize"
 > [  6.929130] (2:receiver@Ruby) I'm done. See you!
 
-
 p Test1 MSG_comm_wait() with Sleep_sender > Sleep_receiver
 
 ! output sort
-$ ./peer small_platform.xml deployment_peer03.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
+$ ./peer ${srcdir:=.}/small_platform.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.016560] (1:sender@Tremblay) Send to receiver-0 Task_1
-> [  5.016560] (2:receiver@Ruby) Received "Task_0"
-> [  5.016560] (2:receiver@Ruby) Processing "Task_0"
-> [  5.526270] (2:receiver@Ruby) "Task_0" done
-> [  5.526270] (2:receiver@Ruby) Wait to receive a task
-> [  5.542830] (1:sender@Tremblay) Send to receiver-0 Task_2
-> [  5.542830] (2:receiver@Ruby) Received "Task_1"
-> [  5.542830] (2:receiver@Ruby) Processing "Task_1"
-> [  6.052540] (2:receiver@Ruby) "Task_1" done
-> [  6.052540] (2:receiver@Ruby) Wait to receive a task
-> [  6.069100] (1:sender@Tremblay) Send to receiver-0 finalize
-> [  6.069100] (2:receiver@Ruby) Received "Task_2"
-> [  6.069100] (2:receiver@Ruby) Processing "Task_2"
-> [  6.578810] (2:receiver@Ruby) "Task_2" done
-> [  6.578810] (2:receiver@Ruby) Wait to receive a task
-> [  6.580370] (0:@) Simulation time 6.58037
-> [  6.580370] (1:sender@Tremblay) Goodbye now!
-> [  6.580370] (2:receiver@Ruby) Received "finalize"
-> [  6.580370] (2:receiver@Ruby) I'm done. See you!
-
+> [  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!
 
 p Test2 MSG_comm_wait() with Sleep_sender < Sleep_receiver
 
 ! output sort
-$ ./peer small_platform.xml deployment_peer04.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
+$ ./peer ${srcdir:=.}/small_platform.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.016560] (1:sender@Tremblay) Send to receiver-0 Task_1
-> [  5.016560] (2:receiver@Ruby) Received "Task_0"
-> [  5.016560] (2:receiver@Ruby) Processing "Task_0"
-> [  5.526270] (2:receiver@Ruby) "Task_0" done
-> [  5.526270] (2:receiver@Ruby) Wait to receive a task
-> [  5.542830] (1:sender@Tremblay) Send to receiver-0 Task_2
-> [  5.542830] (2:receiver@Ruby) Received "Task_1"
-> [  5.542830] (2:receiver@Ruby) Processing "Task_1"
-> [  6.052540] (2:receiver@Ruby) "Task_1" done
-> [  6.052540] (2:receiver@Ruby) Wait to receive a task
-> [  6.069100] (1:sender@Tremblay) Send to receiver-0 finalize
-> [  6.069100] (2:receiver@Ruby) Received "Task_2"
-> [  6.069100] (2:receiver@Ruby) Processing "Task_2"
-> [  6.578810] (2:receiver@Ruby) "Task_2" done
-> [  6.578810] (2:receiver@Ruby) Wait to receive a task
-> [  6.580370] (0:@) Simulation time 6.58037
-> [  6.580370] (1:sender@Tremblay) Goodbye now!
-> [  6.580370] (2:receiver@Ruby) Received "finalize"
-> [  6.580370] (2:receiver@Ruby) I'm done. See you!
-
-
-p Test1 MSG_comm_waitall() for sender 
+> [  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!
+
+p Test1 MSG_comm_waitall() for sender
 
 ! output sort
-$ ./peer2 small_platform.xml deployment_peer.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
+$ ./peer2 ${srcdir:=.}/small_platform.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.016560] (2:receiver@Ruby) Received "Task_0"
-> [ 10.016560] (2:receiver@Ruby) Processing "Task_0"
-> [ 10.526270] (2:receiver@Ruby) "Task_0" done
-> [ 10.526270] (2:receiver@Ruby) Wait to receive a task
-> [ 10.542830] (2:receiver@Ruby) Received "Task_1"
-> [ 10.542830] (2:receiver@Ruby) Processing "Task_1"
-> [ 11.052540] (2:receiver@Ruby) "Task_1" done
-> [ 11.052540] (2:receiver@Ruby) Wait to receive a task
-> [ 11.069100] (2:receiver@Ruby) Received "Task_2"
-> [ 11.069100] (2:receiver@Ruby) Processing "Task_2"
-> [ 11.578810] (2:receiver@Ruby) "Task_2" done
-> [ 11.578810] (2:receiver@Ruby) Wait to receive a task
-> [ 11.580370] (0:@) Simulation time 11.5804
-> [ 11.580370] (1:sender@Tremblay) Goodbye now!
-> [ 11.580370] (2:receiver@Ruby) Received "finalize"
-> [ 11.580370] (2:receiver@Ruby) I'm done. See you!
-
-
+> [ 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!