X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c19a107a096f503e67217fb178fa98eb742ceb4d..447a95c2dd42863dc11b210dd1e1dd857017a954:/examples/c/synchro-semaphore/synchro-semaphore.tesh

diff --git a/examples/c/synchro-semaphore/synchro-semaphore.tesh b/examples/c/synchro-semaphore/synchro-semaphore.tesh
index f6beba53d5..9739ebcf72 100644
--- a/examples/c/synchro-semaphore/synchro-semaphore.tesh
+++ b/examples/c/synchro-semaphore/synchro-semaphore.tesh
@@ -2,40 +2,48 @@
 
 p Testing synchronization with semaphores
 
-! output sort 19
 $ ${bindir:=.}/c-synchro-semaphore ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n"
-> [  0.000000] (1:Alice@Fafard) Trying to acquire 1
-> [  0.000000] (1:Alice@Fafard) Acquired 1
-> [  0.900000] (2:Bob@Fafard) Trying to acquire 1
-> [  1.000000] (1:Alice@Fafard) Releasing 2
-> [  1.000000] (2:Bob@Fafard) Acquired 1
-> [  1.000000] (1:Alice@Fafard) Released 2
-> [  2.000000] (2:Bob@Fafard) Releasing 2
-> [  2.000000] (2:Bob@Fafard) Released 2
-> [  3.000000] (2:Bob@Fafard) Trying to acquire 3
-> [  3.000000] (2:Bob@Fafard) Acquired 3
-> [  4.000000] (1:Alice@Fafard) Trying to acquire 3
-> [  5.000000] (2:Bob@Fafard) Releasing 4
-> [  5.000000] (1:Alice@Fafard) Acquired 3
-> [  5.000000] (2:Bob@Fafard) Released 4
-> [  7.000000] (2:Bob@Fafard) Trying to acquire 5
-> [ 10.000000] (1:Alice@Fafard) Releasing 4
-> [ 10.000000] (2:Bob@Fafard) Acquired 5
-> [ 10.000000] (1:Alice@Fafard) Released 4
-> [ 10.000000] (2:Bob@Fafard) Releasing 6
-> [ 10.000000] (2:Bob@Fafard) Released 6
-> [ 10.000000] (2:Bob@Fafard) Trying to acquire 7
-> [ 10.000000] (2:Bob@Fafard) Acquired 7
-> [ 11.000000] (1:Alice@Fafard) Trying to acquire 5
-> [ 15.000000] (2:Bob@Fafard) Releasing 8
-> [ 15.000000] (1:Alice@Fafard) Acquired 5
-> [ 15.000000] (2:Bob@Fafard) Released 8
-> [ 17.000000] (1:Alice@Fafard) Releasing 6
-> [ 17.000000] (1:Alice@Fafard) Released 6
-> [ 22.000000] (1:Alice@Fafard) Trying to acquire 7
-> [ 22.000000] (1:Alice@Fafard) Acquired 7
-> [ 22.000000] (1:Alice@Fafard) Releasing 8
-> [ 22.000000] (1:Alice@Fafard) Released 8
+> [  0.000000] (0:maestro@) Semaphore initialized with capacity = 1
+> [  0.000000] (1:Alice@Fafard) Acquire #1 (that is free)
+> [  0.000000] (1:Alice@Fafard) Acquired #1
+> [  0.900000] (2:Bob@Fafard) Acquire #1 (that is not free)
+> [  1.000000] (1:Alice@Fafard) Releasing #2
+> [  1.000000] (2:Bob@Fafard) Acquired #1
+> [  1.000000] (1:Alice@Fafard) Released #2
+> [  2.000000] (2:Bob@Fafard) Releasing #2
+> [  2.000000] (2:Bob@Fafard) Released #2
+> [  3.000000] (2:Bob@Fafard) Trying for 1 sec to acquire #3 (that is free)
+> [  3.000000] (2:Bob@Fafard) Acquired #3
+> [  4.000000] (1:Alice@Fafard) Trying for 1 sec to acquire #3 (that is not free)
+> [  5.000000] (2:Bob@Fafard) Releasing #4
+> [  5.000000] (1:Alice@Fafard) Timeout.. Try #3 for another second.
+> [  5.000000] (2:Bob@Fafard) Released #4
+> [  5.000000] (1:Alice@Fafard) Acquired #3
+> [  7.000000] (2:Bob@Fafard) Trying for 1 sec to acquire #5 (that is not free)
+> [  8.000000] (2:Bob@Fafard) Timeout.. Try #5 for another second.
+> [  9.000000] (2:Bob@Fafard) Timeout.. Try #5 for another second.
+> [ 10.000000] (1:Alice@Fafard) Releasing #4
+> [ 10.000000] (2:Bob@Fafard) Timeout.. Try #5 for another second.
+> [ 10.000000] (1:Alice@Fafard) Released #4
+> [ 10.000000] (2:Bob@Fafard) Acquired #5
+> [ 10.000000] (2:Bob@Fafard) Releasing #6
+> [ 10.000000] (2:Bob@Fafard) Released #6
+> [ 10.000000] (2:Bob@Fafard) Trying for 1 sec to acquire #7 (that is free)
+> [ 10.000000] (2:Bob@Fafard) Acquired #7
+> [ 11.000000] (1:Alice@Fafard) Trying for 1 sec to acquire #5 (that is not free)
+> [ 12.000000] (1:Alice@Fafard) Timeout.. Try #5 for another second.
+> [ 13.000000] (1:Alice@Fafard) Timeout.. Try #5 for another second.
+> [ 14.000000] (1:Alice@Fafard) Timeout.. Try #5 for another second.
+> [ 15.000000] (2:Bob@Fafard) Releasing #8
+> [ 15.000000] (1:Alice@Fafard) Timeout.. Try #5 for another second.
+> [ 15.000000] (2:Bob@Fafard) Released #8
+> [ 15.000000] (1:Alice@Fafard) Acquired #5
+> [ 17.000000] (1:Alice@Fafard) Releasing #6
+> [ 17.000000] (1:Alice@Fafard) Released #6
+> [ 22.000000] (1:Alice@Fafard) Trying for 1 sec to acquire #7 (that is free)
+> [ 22.000000] (1:Alice@Fafard) Acquired #7
+> [ 22.000000] (1:Alice@Fafard) Releasing #8
+> [ 22.000000] (1:Alice@Fafard) Released #8
 > [ 65.000000] (2:Bob@Fafard) Done
 > [ 72.000000] (1:Alice@Fafard) Done
 > [ 72.000000] (0:maestro@) Finished