X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3b7e5f4b4d7c87ee3e8827313ec966ea8fc8387..1c3328f8047e2e5602ed3cd87044ce274e9ff978:/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 e800832b3c..42b97b3d85 100644
--- a/examples/c/synchro-semaphore/synchro-semaphore.tesh
+++ b/examples/c/synchro-semaphore/synchro-semaphore.tesh
@@ -3,36 +3,39 @@
 p Testing synchronization with semaphores
 
 ! output sort 19
-$ ${bindir:=.}/c-synchro-semaphore ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (1:Alice@Fafard) Trying to acquire 1
+$ ${bindir:=.}/c-synchro-semaphore ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n"
+> [  0.000000] (0:maestro@) Semaphore initialized with capacity = 1
+> [  0.000000] (1:Alice@Fafard) Trying to acquire 1 (not blocking)
 > [  0.000000] (1:Alice@Fafard) Acquired 1
-> [  0.900000] (2:Bob@Fafard) Trying to acquire 1
+> [  0.900000] (2:Bob@Fafard) Trying to acquire 1 (blocking)
 > [  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) Trying to acquire 3 (not blocking)
 > [  3.000000] (2:Bob@Fafard) Acquired 3
-> [  4.000000] (1:Alice@Fafard) Trying to acquire 3
+> [  4.000000] (1:Alice@Fafard) Trying to acquire 3 (blocking)
 > [  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
+> [  7.000000] (2:Bob@Fafard) Trying to acquire 5 (blocking)
 > [ 10.000000] (1:Alice@Fafard) Releasing 4
+> [ 10.000000] (2:Bob@Fafard) Timeout.. Try again 5
 > [ 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) Trying to acquire 7 (not blocking)
 > [ 10.000000] (2:Bob@Fafard) Acquired 7
-> [ 11.000000] (1:Alice@Fafard) Trying to acquire 5
+> [ 11.000000] (1:Alice@Fafard) Trying to acquire 5 (blocking)
+> [ 14.000000] (1:Alice@Fafard) Timeout.. Try again 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) Trying to acquire 7 (not blocking)
 > [ 22.000000] (1:Alice@Fafard) Acquired 7
 > [ 22.000000] (1:Alice@Fafard) Releasing 8
 > [ 22.000000] (1:Alice@Fafard) Released 8