X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1d381feb9b44e9d94e608c9b389c453128d44dff..15b76a8173b81f1cc79b9cc01b9f2b67d59c4e0c:/teshsuite/s4u/concurrent_rw/concurrent_rw.tesh

diff --git a/teshsuite/s4u/concurrent_rw/concurrent_rw.tesh b/teshsuite/s4u/concurrent_rw/concurrent_rw.tesh
index 89e43ce300..593a980a8b 100644
--- a/teshsuite/s4u/concurrent_rw/concurrent_rw.tesh
+++ b/teshsuite/s4u/concurrent_rw/concurrent_rw.tesh
@@ -1,37 +1,76 @@
-$ ./concurrent_rw ${platfdir}/hosts_with_disks.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"
-> [  0.000000] (host@bob) process 1 is writing!
-> [  0.000000] (host@bob) process 2 is writing!
-> [  0.000000] (host@bob) process 3 is writing!
-> [  0.000000] (host@bob) process 4 is writing!
-> [  0.000000] (host@bob) process 5 is writing!
-> [  0.500000] (host@bob) process 1 goes to sleep for 1 seconds
-> [  0.500000] (host@bob) process 2 goes to sleep for 2 seconds
-> [  0.500000] (host@bob) process 3 goes to sleep for 3 seconds
-> [  0.500000] (host@bob) process 4 goes to sleep for 4 seconds
-> [  0.500000] (host@bob) process 5 goes to sleep for 5 seconds
-> [  1.500000] (host@bob) process 1 is writing again!
-> [  1.600000] (host@bob) process 1 goes to sleep for 5 seconds
-> [  2.500000] (host@bob) process 2 is writing again!
-> [  2.600000] (host@bob) process 2 goes to sleep for 4 seconds
-> [  3.500000] (host@bob) process 3 is writing again!
-> [  3.600000] (host@bob) process 3 goes to sleep for 3 seconds
-> [  4.500000] (host@bob) process 4 is writing again!
-> [  4.600000] (host@bob) process 4 goes to sleep for 2 seconds
-> [  5.500000] (host@bob) process 5 is writing again!
-> [  5.600000] (host@bob) process 5 goes to sleep for 1 seconds
-> [  6.600000] (host@bob) process 1 is reading!
-> [  6.600000] (host@bob) process 2 is reading!
-> [  6.600000] (host@bob) process 3 is reading!
-> [  6.600000] (host@bob) process 4 is reading!
-> [  6.600000] (host@bob) process 5 is reading!
-> [  6.800000] (host@bob) process 1 goes to sleep for 1 seconds
-> [  6.800000] (host@bob) process 2 goes to sleep for 2 seconds
-> [  6.800000] (host@bob) process 3 goes to sleep for 3 seconds
-> [  6.800000] (host@bob) process 4 goes to sleep for 4 seconds
-> [  6.800000] (host@bob) process 5 goes to sleep for 5 seconds
-> [  7.800000] (host@bob) process 1 is reading again!
-> [  8.800000] (host@bob) process 2 is reading again!
-> [  9.800000] (host@bob) process 3 is reading again!
-> [ 10.800000] (host@bob) process 4 is reading again!
-> [ 11.800000] (host@bob) process 5 is reading again!
+$ ./concurrent_rw ${platfdir}/hosts_with_disks.xml "--log=root.fmt:[%10.6r]%e(%a@%h)%e%m%n"
+> [  0.000000] (host@bob) actor 1 is writing!
+> [  0.000000] (host@bob) actor 2 is writing!
+> [  0.000000] (host@bob) actor 3 is writing!
+> [  0.000000] (host@bob) actor 4 is writing!
+> [  0.000000] (host@bob) actor 5 is writing!
+> [  0.500000] (host@bob) actor 1 goes to sleep for 1 seconds
+> [  0.500000] (host@bob) actor 2 goes to sleep for 2 seconds
+> [  0.500000] (host@bob) actor 3 goes to sleep for 3 seconds
+> [  0.500000] (host@bob) actor 4 goes to sleep for 4 seconds
+> [  0.500000] (host@bob) actor 5 goes to sleep for 5 seconds
+> [  1.500000] (host@bob) actor 1 is writing again!
+> [  1.600000] (host@bob) actor 1 goes to sleep for 5 seconds
+> [  2.500000] (host@bob) actor 2 is writing again!
+> [  2.600000] (host@bob) actor 2 goes to sleep for 4 seconds
+> [  3.500000] (host@bob) actor 3 is writing again!
+> [  3.600000] (host@bob) actor 3 goes to sleep for 3 seconds
+> [  4.500000] (host@bob) actor 4 is writing again!
+> [  4.600000] (host@bob) actor 4 goes to sleep for 2 seconds
+> [  5.500000] (host@bob) actor 5 is writing again!
+> [  5.600000] (host@bob) actor 5 goes to sleep for 1 seconds
+> [  6.600000] (host@bob) actor 1 is reading!
+> [  6.600000] (host@bob) actor 2 is reading!
+> [  6.600000] (host@bob) actor 3 is reading!
+> [  6.600000] (host@bob) actor 4 is reading!
+> [  6.600000] (host@bob) actor 5 is reading!
+> [  6.800000] (host@bob) actor 1 goes to sleep for 1 seconds
+> [  6.800000] (host@bob) actor 2 goes to sleep for 2 seconds
+> [  6.800000] (host@bob) actor 3 goes to sleep for 3 seconds
+> [  6.800000] (host@bob) actor 4 goes to sleep for 4 seconds
+> [  6.800000] (host@bob) actor 5 goes to sleep for 5 seconds
+> [  7.800000] (host@bob) actor 1 is reading again!
+> [  8.800000] (host@bob) actor 2 is reading again!
+> [  9.800000] (host@bob) actor 3 is reading again!
+> [ 10.800000] (host@bob) actor 4 is reading again!
+> [ 11.800000] (host@bob) actor 5 is reading again!
+> [ 11.840000] (maestro@) Simulation time 11.84
+
+$ ./concurrent_rw ${platfdir}/hosts_with_disks.xml "--log=root.fmt:[%10.6r]%e(%a@%h)%e%m%n" --cfg=disk/solver:bmf
+> [  0.000000] (maestro@) Configuration change: Set 'disk/solver' to 'bmf'
+> [  0.000000] (host@bob) actor 1 is writing!
+> [  0.000000] (host@bob) actor 2 is writing!
+> [  0.000000] (host@bob) actor 3 is writing!
+> [  0.000000] (host@bob) actor 4 is writing!
+> [  0.000000] (host@bob) actor 5 is writing!
+> [  0.500000] (host@bob) actor 1 goes to sleep for 1 seconds
+> [  0.500000] (host@bob) actor 2 goes to sleep for 2 seconds
+> [  0.500000] (host@bob) actor 3 goes to sleep for 3 seconds
+> [  0.500000] (host@bob) actor 4 goes to sleep for 4 seconds
+> [  0.500000] (host@bob) actor 5 goes to sleep for 5 seconds
+> [  1.500000] (host@bob) actor 1 is writing again!
+> [  1.600000] (host@bob) actor 1 goes to sleep for 5 seconds
+> [  2.500000] (host@bob) actor 2 is writing again!
+> [  2.600000] (host@bob) actor 2 goes to sleep for 4 seconds
+> [  3.500000] (host@bob) actor 3 is writing again!
+> [  3.600000] (host@bob) actor 3 goes to sleep for 3 seconds
+> [  4.500000] (host@bob) actor 4 is writing again!
+> [  4.600000] (host@bob) actor 4 goes to sleep for 2 seconds
+> [  5.500000] (host@bob) actor 5 is writing again!
+> [  5.600000] (host@bob) actor 5 goes to sleep for 1 seconds
+> [  6.600000] (host@bob) actor 1 is reading!
+> [  6.600000] (host@bob) actor 2 is reading!
+> [  6.600000] (host@bob) actor 3 is reading!
+> [  6.600000] (host@bob) actor 4 is reading!
+> [  6.600000] (host@bob) actor 5 is reading!
+> [  6.800000] (host@bob) actor 1 goes to sleep for 1 seconds
+> [  6.800000] (host@bob) actor 2 goes to sleep for 2 seconds
+> [  6.800000] (host@bob) actor 3 goes to sleep for 3 seconds
+> [  6.800000] (host@bob) actor 4 goes to sleep for 4 seconds
+> [  6.800000] (host@bob) actor 5 goes to sleep for 5 seconds
+> [  7.800000] (host@bob) actor 1 is reading again!
+> [  8.800000] (host@bob) actor 2 is reading again!
+> [  9.800000] (host@bob) actor 3 is reading again!
+> [ 10.800000] (host@bob) actor 4 is reading again!
+> [ 11.800000] (host@bob) actor 5 is reading again!
 > [ 11.840000] (maestro@) Simulation time 11.84