Revalidate the output, which order changed when introducing the listener thread

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4035 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/examples/gras/all2all/test_sg_32 b/examples/gras/all2all/test_sg_32
index 22bf4db..2d22c74 100755 (executable)
--- a/examples/gras/all2all/test_sg_32
+++ b/examples/gras/all2all/test_sg_32
@@ -9,53 +9,53 @@ $ $SG_TEST_EXENV ./all2all_simulator$EXEEXT ${srcdir:=.}/../../msg/small_platfor
 > [Ginette:receiver:(8) 0.000000] [all2all/INFO] Listening on port 4000 (expecting 4 messages)
 > [Bourassa:sender:(9) 0.000000] [all2all/INFO] Launch current node
 > [Bourassa:receiver:(10) 0.000000] [all2all/INFO] Listening on port 4000 (expecting 4 messages)
-> [Tremblay:receiver:(2) 0.001536] [all2all/INFO] Got Data from Jupiter:0 (still 3 to go)
 > [Jupiter:sender:(3) 0.001536] [all2all/INFO]   Sent Data from Jupiter to Tremblay
-> [Tremblay:receiver:(2) 0.003614] [all2all/INFO] Got Data from Fafard:0 (still 2 to go)
+> [Tremblay:receiver:(2) 0.001536] [all2all/INFO] Got Data from Jupiter:0 (still 3 to go)
 > [Fafard:sender:(5) 0.003614] [all2all/INFO]   Sent Data from Fafard to Tremblay
-> [Tremblay:receiver:(2) 0.004951] [all2all/INFO] Got Data from Ginette:0 (still 1 to go)
+> [Tremblay:receiver:(2) 0.003614] [all2all/INFO] Got Data from Fafard:0 (still 2 to go)
 > [Ginette:sender:(7) 0.004951] [all2all/INFO]   Sent Data from Ginette to Tremblay
-> [Fafard:receiver:(6) 0.005150] [all2all/INFO] Got Data from Jupiter:0 (still 3 to go)
+> [Tremblay:receiver:(2) 0.004951] [all2all/INFO] Got Data from Ginette:0 (still 1 to go)
 > [Jupiter:sender:(3) 0.005150] [all2all/INFO]   Sent Data from Jupiter to Fafard
+> [Fafard:receiver:(6) 0.005150] [all2all/INFO] Got Data from Jupiter:0 (still 3 to go)
+> [Bourassa:sender:(9) 0.007007] [all2all/INFO]   Sent Data from Bourassa to Tremblay
 > [Tremblay:receiver:(2) 0.007007] [all2all/INFO] Got Data from Bourassa:0 (still 0 to go)
 > [Tremblay:receiver:(2) 0.007007] [gras/INFO] Exiting GRAS
-> [Bourassa:sender:(9) 0.007007] [all2all/INFO]   Sent Data from Bourassa to Tremblay
-> [Jupiter:receiver:(4) 0.007228] [all2all/INFO] Got Data from Fafard:0 (still 3 to go)
 > [Fafard:sender:(5) 0.007228] [all2all/INFO]   Sent Data from Fafard to Jupiter
-> [Ginette:receiver:(8) 0.008024] [all2all/INFO] Got Data from Jupiter:0 (still 3 to go)
+> [Jupiter:receiver:(4) 0.007228] [all2all/INFO] Got Data from Fafard:0 (still 3 to go)
 > [Jupiter:sender:(3) 0.008024] [all2all/INFO]   Sent Data from Jupiter to Ginette
-> [Ginette:receiver:(8) 0.009349] [all2all/INFO] Got Data from Fafard:0 (still 2 to go)
+> [Ginette:receiver:(8) 0.008024] [all2all/INFO] Got Data from Jupiter:0 (still 3 to go)
 > [Fafard:sender:(5) 0.009349] [all2all/INFO]   Sent Data from Fafard to Ginette
-> [Jupiter:receiver:(4) 0.010102] [all2all/INFO] Got Data from Ginette:0 (still 2 to go)
+> [Ginette:receiver:(8) 0.009349] [all2all/INFO] Got Data from Fafard:0 (still 2 to go)
 > [Ginette:sender:(7) 0.010102] [all2all/INFO]   Sent Data from Ginette to Jupiter
-> [Fafard:receiver:(6) 0.011426] [all2all/INFO] Got Data from Ginette:0 (still 2 to go)
+> [Jupiter:receiver:(4) 0.010102] [all2all/INFO] Got Data from Ginette:0 (still 2 to go)
 > [Ginette:sender:(7) 0.011426] [all2all/INFO]   Sent Data from Ginette to Fafard
-> [Bourassa:receiver:(10) 0.011617] [all2all/INFO] Got Data from Jupiter:0 (still 3 to go)
+> [Fafard:receiver:(6) 0.011426] [all2all/INFO] Got Data from Ginette:0 (still 2 to go)
 > [Jupiter:sender:(3) 0.011617] [all2all/INFO]   Sent Data from Jupiter to Bourassa
 > [Jupiter:sender:(3) 0.011617] [gras/INFO] Exiting GRAS
-> [Bourassa:receiver:(10) 0.012200] [all2all/INFO] Got Data from Fafard:0 (still 2 to go)
+> [Bourassa:receiver:(10) 0.011617] [all2all/INFO] Got Data from Jupiter:0 (still 3 to go)
 > [Fafard:sender:(5) 0.012200] [all2all/INFO]   Sent Data from Fafard to Bourassa
 > [Fafard:sender:(5) 0.012200] [gras/INFO] Exiting GRAS
-> [Bourassa:receiver:(10) 0.013503] [all2all/INFO] Got Data from Ginette:0 (still 1 to go)
+> [Bourassa:receiver:(10) 0.012200] [all2all/INFO] Got Data from Fafard:0 (still 2 to go)
 > [Ginette:sender:(7) 0.013503] [all2all/INFO]   Sent Data from Ginette to Bourassa
 > [Ginette:sender:(7) 0.013503] [gras/INFO] Exiting GRAS
-> [Jupiter:receiver:(4) 0.013694] [all2all/INFO] Got Data from Bourassa:0 (still 1 to go)
+> [Bourassa:receiver:(10) 0.013503] [all2all/INFO] Got Data from Ginette:0 (still 1 to go)
 > [Bourassa:sender:(9) 0.013694] [all2all/INFO]   Sent Data from Bourassa to Jupiter
-> [Fafard:receiver:(6) 0.014277] [all2all/INFO] Got Data from Bourassa:0 (still 1 to go)
+> [Jupiter:receiver:(4) 0.013694] [all2all/INFO] Got Data from Bourassa:0 (still 1 to go)
 > [Bourassa:sender:(9) 0.014277] [all2all/INFO]   Sent Data from Bourassa to Fafard
+> [Fafard:receiver:(6) 0.014277] [all2all/INFO] Got Data from Bourassa:0 (still 1 to go)
+> [Tremblay:sender:(1) 0.015230] [all2all/INFO]   Sent Data from Tremblay to Jupiter
 > [Jupiter:receiver:(4) 0.015230] [all2all/INFO] Got Data from Tremblay:0 (still 0 to go)
 > [Jupiter:receiver:(4) 0.015230] [gras/INFO] Exiting GRAS
-> [Tremblay:sender:(1) 0.015230] [all2all/INFO]   Sent Data from Tremblay to Jupiter
-> [Ginette:receiver:(8) 0.015580] [all2all/INFO] Got Data from Bourassa:0 (still 1 to go)
 > [Bourassa:sender:(9) 0.015580] [all2all/INFO]   Sent Data from Bourassa to Ginette
 > [Bourassa:sender:(9) 0.015580] [gras/INFO] Exiting GRAS
+> [Ginette:receiver:(8) 0.015580] [all2all/INFO] Got Data from Bourassa:0 (still 1 to go)
+> [Tremblay:sender:(1) 0.017308] [all2all/INFO]   Sent Data from Tremblay to Fafard
 > [Fafard:receiver:(6) 0.017308] [all2all/INFO] Got Data from Tremblay:0 (still 0 to go)
 > [Fafard:receiver:(6) 0.017308] [gras/INFO] Exiting GRAS
-> [Tremblay:sender:(1) 0.017308] [all2all/INFO]   Sent Data from Tremblay to Fafard
+> [Tremblay:sender:(1) 0.018645] [all2all/INFO]   Sent Data from Tremblay to Ginette
 > [Ginette:receiver:(8) 0.018645] [all2all/INFO] Got Data from Tremblay:0 (still 0 to go)
 > [Ginette:receiver:(8) 0.018645] [gras/INFO] Exiting GRAS
-> [Tremblay:sender:(1) 0.018645] [all2all/INFO]   Sent Data from Tremblay to Ginette
-> [Bourassa:receiver:(10) 0.020701] [all2all/INFO] Got Data from Tremblay:0 (still 0 to go)
-> [Bourassa:receiver:(10) 0.020701] [gras/INFO] Exiting GRAS
 > [Tremblay:sender:(1) 0.020701] [all2all/INFO]   Sent Data from Tremblay to Bourassa
 > [Tremblay:sender:(1) 0.020701] [gras/INFO] Exiting GRAS
+> [Bourassa:receiver:(10) 0.020701] [all2all/INFO] Got Data from Tremblay:0 (still 0 to go)
+> [Bourassa:receiver:(10) 0.020701] [gras/INFO] Exiting GRAS

diff --git a/examples/gras/mmrpc/test_sg_32 b/examples/gras/mmrpc/test_sg_32
index 215cd2e..7c5f44b 100755 (executable)
--- a/examples/gras/mmrpc/test_sg_32
+++ b/examples/gras/mmrpc/test_sg_32
@@ -4,7 +4,7 @@ $ $SG_TEST_EXENV ./mmrpc_simulator$EXEEXT ${srcdir:=.}/../../msg/small_platform.
 > [Fafard:client:(2) 0.000000] [MatMult/INFO] Connected to Tremblay:4000.
 > [Fafard:client:(2) 0.000000] [MatMult/INFO] >>>>>>>> Connected to server which is on Tremblay:4000 <<<<<<<<
 > [Fafard:client:(2) 0.053783] [MatMult/INFO] >>>>>>>> Request sent to Tremblay:4000 <<<<<<<<
+> [Tremblay:server:(1) 0.081662] [gras/INFO] Exiting GRAS
 > [Fafard:client:(2) 0.081662] [MatMult/INFO] >>>>>>>> Got answer from Tremblay:4000 (values are right) <<<<<<<<
 > [Fafard:client:(2) 0.081662] [gras/INFO] Exiting GRAS
-> [Tremblay:server:(1) 0.081662] [gras/INFO] Exiting GRAS
 

diff --git a/examples/gras/mutual_exclusion/simple_token/test_sg_32 b/examples/gras/mutual_exclusion/simple_token/test_sg_32
index 752400c..9a01787 100755 (executable)
--- a/examples/gras/mutual_exclusion/simple_token/test_sg_32
+++ b/examples/gras/mutual_exclusion/simple_token/test_sg_32
@@ -7,6 +7,6 @@ $ $SG_TEST_EXENV ./simple_token_simulator$EXEEXT ${srcdir:=.}/../../../msg/small
 > [Fafard:node:(2) 1.028109] [gras/INFO] Exiting GRAS
 > [Jupiter:node:(3) 1.030844] [gras/INFO] Exiting GRAS
 > [Ginette:node:(4) 1.032083] [gras/INFO] Exiting GRAS
-> [Tremblay:node:(1) 1.034039] [gras/INFO] Exiting GRAS
 > [Bourassa:node:(5) 1.034039] [gras/INFO] Exiting GRAS
+> [Tremblay:node:(1) 1.034039] [gras/INFO] Exiting GRAS