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

diff --git a/examples/msg/icomms/peer.tesh b/examples/msg/icomms/peer.tesh
index cd62f3f35a..e2e9e5cfe7 100644
--- a/examples/msg/icomms/peer.tesh
+++ b/examples/msg/icomms/peer.tesh
@@ -1,103 +1,139 @@
 #! ./tesh
 
-p Testing an ireceive and isend application
+p Test1 MSG_comm_test() with Sleep_sender > Sleep_receiver
 
-$ ./peer small_platform.xml deployment_peer01.xml 
-> [Tremblay:sender:(1) 0.000000] [msg_test/INFO] sleep_start_time : 5.000000 , sleep_test_time : 0.100000
-> [Ruby:receiver:(2) 0.000000] [msg_test/INFO] sleep_start_time : 1.000000 
-> [Ruby:receiver:(2) 1.000000] [msg_test/INFO] Wait to receive a task
-> [Tremblay:sender:(1) 5.000000] [msg_test/INFO] Send to receiver-0 Task_0
-> [Ruby:receiver:(2) 5.016560] [msg_test/INFO] Received "Task_0"
-> [Ruby:receiver:(2) 5.016560] [msg_test/INFO] Processing "Task_0"
-> [Tremblay:sender:(1) 5.100000] [msg_test/INFO] Send to receiver-0 Task_1
-> [Ruby:receiver:(2) 5.526270] [msg_test/INFO] "Task_0" done
-> [Ruby:receiver:(2) 5.526270] [msg_test/INFO] Wait to receive a task
-> [Ruby:receiver:(2) 5.542830] [msg_test/INFO] Received "Task_1"
-> [Ruby:receiver:(2) 5.542830] [msg_test/INFO] Processing "Task_1"
-> [Tremblay:sender:(1) 5.600000] [msg_test/INFO] Send to receiver-0 Task_2
-> [Ruby:receiver:(2) 6.052540] [msg_test/INFO] "Task_1" done
-> [Ruby:receiver:(2) 6.052540] [msg_test/INFO] Wait to receive a task
-> [Ruby:receiver:(2) 6.069100] [msg_test/INFO] Received "Task_2"
-> [Ruby:receiver:(2) 6.069100] [msg_test/INFO] Processing "Task_2"
-> [Tremblay:sender:(1) 6.100000] [msg_test/INFO] Send to receiver-0 finalize
-> [Ruby:receiver:(2) 6.578810] [msg_test/INFO] "Task_2" done
-> [Ruby:receiver:(2) 6.578810] [msg_test/INFO] Wait to receive a task
-> [Ruby:receiver:(2) 6.580370] [msg_test/INFO] Received "finalize"
-> [Ruby:receiver:(2) 6.580370] [msg_test/INFO] I'm done. See you!
-> [Tremblay:sender:(1) 6.600000] [msg_test/INFO] Goodbye now!
-> [6.600000] [msg_test/INFO] Simulation time 6.6
+! output sort
+$ ./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
+> [  5.000000] (1:sender@Tremblay) Send to receiver-0 Task_0
+> [  5.100000] (1:sender@Tremblay) Send to receiver-0 Task_1
+> [  5.100000] (2:receiver@Ruby) Received "Task_0"
+> [  5.100000] (2:receiver@Ruby) Processing "Task_0"
+> [  5.609710] (2:receiver@Ruby) "Task_0" done
+> [  5.609710] (2:receiver@Ruby) Wait to receive a task
+> [  5.700000] (1:sender@Tremblay) Send to receiver-0 Task_2
+> [  5.709710] (2:receiver@Ruby) Received "Task_1"
+> [  5.709710] (2:receiver@Ruby) Processing "Task_1"
+> [  6.219420] (2:receiver@Ruby) "Task_1" done
+> [  6.219420] (2:receiver@Ruby) Wait to receive a task
+> [  6.300000] (1:sender@Tremblay) Send to receiver-0 finalize
+> [  6.319420] (2:receiver@Ruby) Received "Task_2"
+> [  6.319420] (2:receiver@Ruby) Processing "Task_2"
+> [  6.829130] (2:receiver@Ruby) "Task_2" done
+> [  6.829130] (2:receiver@Ruby) Wait to receive a task
+> [  6.900000] (1:sender@Tremblay) Goodbye now!
+> [  6.929130] (0:@) Simulation time 6.92913
+> [  6.929130] (2:receiver@Ruby) Received "finalize"
+> [  6.929130] (2:receiver@Ruby) I'm done. See you!
 
-$ ./peer small_platform.xml deployment_peer02.xml 
-> [Tremblay:sender:(1) 0.000000] [msg_test/INFO] sleep_start_time : 1.000000 , sleep_test_time : 0.100000
-> [Ruby:receiver:(2) 0.000000] [msg_test/INFO] sleep_start_time : 5.000000 
-> [Tremblay:sender:(1) 1.000000] [msg_test/INFO] Send to receiver-0 Task_0
-> [Ruby:receiver:(2) 5.000000] [msg_test/INFO] Wait to receive a task
-> [Ruby:receiver:(2) 5.016560] [msg_test/INFO] Received "Task_0"
-> [Ruby:receiver:(2) 5.016560] [msg_test/INFO] Processing "Task_0"
-> [Tremblay:sender:(1) 5.100000] [msg_test/INFO] Send to receiver-0 Task_1
-> [Ruby:receiver:(2) 5.526270] [msg_test/INFO] "Task_0" done
-> [Ruby:receiver:(2) 5.526270] [msg_test/INFO] Wait to receive a task
-> [Ruby:receiver:(2) 5.542830] [msg_test/INFO] Received "Task_1"
-> [Ruby:receiver:(2) 5.542830] [msg_test/INFO] Processing "Task_1"
-> [Tremblay:sender:(1) 5.600000] [msg_test/INFO] Send to receiver-0 Task_2
-> [Ruby:receiver:(2) 6.052540] [msg_test/INFO] "Task_1" done
-> [Ruby:receiver:(2) 6.052540] [msg_test/INFO] Wait to receive a task
-> [Ruby:receiver:(2) 6.069100] [msg_test/INFO] Received "Task_2"
-> [Ruby:receiver:(2) 6.069100] [msg_test/INFO] Processing "Task_2"
-> [Tremblay:sender:(1) 6.100000] [msg_test/INFO] Send to receiver-0 finalize
-> [Ruby:receiver:(2) 6.578810] [msg_test/INFO] "Task_2" done
-> [Ruby:receiver:(2) 6.578810] [msg_test/INFO] Wait to receive a task
-> [Ruby:receiver:(2) 6.580370] [msg_test/INFO] Received "finalize"
-> [Ruby:receiver:(2) 6.580370] [msg_test/INFO] I'm done. See you!
-> [Tremblay:sender:(1) 6.600000] [msg_test/INFO] Goodbye now!
-> [6.600000] [msg_test/INFO] Simulation time 6.6
+p Test2 MSG_comm_test() with Sleep_sender < Sleep_receiver
 
-$ ./peer small_platform.xml deployment_peer03.xml 
-> [Tremblay:sender:(1) 0.000000] [msg_test/INFO] sleep_start_time : 5.000000 , sleep_test_time : 0.000000
-> [Ruby:receiver:(2) 0.000000] [msg_test/INFO] sleep_start_time : 1.000000 
-> [Ruby:receiver:(2) 1.000000] [msg_test/INFO] Wait to receive a task
-> [Tremblay:sender:(1) 5.000000] [msg_test/INFO] Send to receiver-0 Task_0
-> [Ruby:receiver:(2) 5.016560] [msg_test/INFO] Received "Task_0"
-> [Ruby:receiver:(2) 5.016560] [msg_test/INFO] Processing "Task_0"
-> [Tremblay:sender:(1) 5.016560] [msg_test/INFO] Send to receiver-0 Task_1
-> [Ruby:receiver:(2) 5.526270] [msg_test/INFO] "Task_0" done
-> [Ruby:receiver:(2) 5.526270] [msg_test/INFO] Wait to receive a task
-> [Tremblay:sender:(1) 5.542830] [msg_test/INFO] Send to receiver-0 Task_2
-> [Ruby:receiver:(2) 5.542830] [msg_test/INFO] Received "Task_1"
-> [Ruby:receiver:(2) 5.542830] [msg_test/INFO] Processing "Task_1"
-> [Ruby:receiver:(2) 6.052540] [msg_test/INFO] "Task_1" done
-> [Ruby:receiver:(2) 6.052540] [msg_test/INFO] Wait to receive a task
-> [Tremblay:sender:(1) 6.069100] [msg_test/INFO] Send to receiver-0 finalize
-> [Ruby:receiver:(2) 6.069100] [msg_test/INFO] Received "Task_2"
-> [Ruby:receiver:(2) 6.069100] [msg_test/INFO] Processing "Task_2"
-> [Ruby:receiver:(2) 6.578810] [msg_test/INFO] "Task_2" done
-> [Ruby:receiver:(2) 6.578810] [msg_test/INFO] Wait to receive a task
-> [Tremblay:sender:(1) 6.580370] [msg_test/INFO] Goodbye now!
-> [Ruby:receiver:(2) 6.580370] [msg_test/INFO] Received "finalize"
-> [Ruby:receiver:(2) 6.580370] [msg_test/INFO] I'm done. See you!
-> [6.580370] [msg_test/INFO] Simulation time 6.58037
+! output sort
+$ ./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
+> [  5.000000] (2:receiver@Ruby) Wait to receive a task
+> [  5.100000] (1:sender@Tremblay) Send to receiver-0 Task_1
+> [  5.100000] (2:receiver@Ruby) Received "Task_0"
+> [  5.100000] (2:receiver@Ruby) Processing "Task_0"
+> [  5.609710] (2:receiver@Ruby) "Task_0" done
+> [  5.609710] (2:receiver@Ruby) Wait to receive a task
+> [  5.700000] (1:sender@Tremblay) Send to receiver-0 Task_2
+> [  5.709710] (2:receiver@Ruby) Received "Task_1"
+> [  5.709710] (2:receiver@Ruby) Processing "Task_1"
+> [  6.219420] (2:receiver@Ruby) "Task_1" done
+> [  6.219420] (2:receiver@Ruby) Wait to receive a task
+> [  6.300000] (1:sender@Tremblay) Send to receiver-0 finalize
+> [  6.319420] (2:receiver@Ruby) Received "Task_2"
+> [  6.319420] (2:receiver@Ruby) Processing "Task_2"
+> [  6.829130] (2:receiver@Ruby) "Task_2" done
+> [  6.829130] (2:receiver@Ruby) Wait to receive a task
+> [  6.900000] (1:sender@Tremblay) Goodbye now!
+> [  6.929130] (0:@) Simulation time 6.92913
+> [  6.929130] (2:receiver@Ruby) Received "finalize"
+> [  6.929130] (2:receiver@Ruby) I'm done. See you!
 
-$ ./peer small_platform.xml deployment_peer04.xml 
-> [Tremblay:sender:(1) 0.000000] [msg_test/INFO] sleep_start_time : 1.000000 , sleep_test_time : 0.000000
-> [Ruby:receiver:(2) 0.000000] [msg_test/INFO] sleep_start_time : 5.000000 
-> [Tremblay:sender:(1) 1.000000] [msg_test/INFO] Send to receiver-0 Task_0
-> [Ruby:receiver:(2) 5.000000] [msg_test/INFO] Wait to receive a task
-> [Tremblay:sender:(1) 5.016560] [msg_test/INFO] Send to receiver-0 Task_1
-> [Ruby:receiver:(2) 5.016560] [msg_test/INFO] Received "Task_0"
-> [Ruby:receiver:(2) 5.016560] [msg_test/INFO] Processing "Task_0"
-> [Ruby:receiver:(2) 5.526270] [msg_test/INFO] "Task_0" done
-> [Ruby:receiver:(2) 5.526270] [msg_test/INFO] Wait to receive a task
-> [Tremblay:sender:(1) 5.542830] [msg_test/INFO] Send to receiver-0 Task_2
-> [Ruby:receiver:(2) 5.542830] [msg_test/INFO] Received "Task_1"
-> [Ruby:receiver:(2) 5.542830] [msg_test/INFO] Processing "Task_1"
-> [Ruby:receiver:(2) 6.052540] [msg_test/INFO] "Task_1" done
-> [Ruby:receiver:(2) 6.052540] [msg_test/INFO] Wait to receive a task
-> [Tremblay:sender:(1) 6.069100] [msg_test/INFO] Send to receiver-0 finalize
-> [Ruby:receiver:(2) 6.069100] [msg_test/INFO] Received "Task_2"
-> [Ruby:receiver:(2) 6.069100] [msg_test/INFO] Processing "Task_2"
-> [Ruby:receiver:(2) 6.578810] [msg_test/INFO] "Task_2" done
-> [Ruby:receiver:(2) 6.578810] [msg_test/INFO] Wait to receive a task
-> [Tremblay:sender:(1) 6.580370] [msg_test/INFO] Goodbye now!
-> [Ruby:receiver:(2) 6.580370] [msg_test/INFO] Received "finalize"
-> [Ruby:receiver:(2) 6.580370] [msg_test/INFO] I'm done. See you!
-> [6.580370] [msg_test/INFO] Simulation time 6.58037
\ No newline at end of file
+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"
+> [  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!
+
+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"
+> [  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!
+
+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"
+> [  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!