Correct tesh files after patch time commit.

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

diff --git a/examples/amok/saturate/saturate_sg_32.tesh b/examples/amok/saturate/saturate_sg_32.tesh
index 1c62613..ea4ee30 100644 (file)
--- a/examples/amok/saturate/saturate_sg_32.tesh
+++ b/examples/amok/saturate/saturate_sg_32.tesh
@@ -1,17 +1,17 @@
 $ $SG_TEST_EXENV saturate/saturate_simulator${EXEEXT} ${srcdir:=.}/../msg/small_platform.xml ${srcdir:=.}/saturate/saturate.xml
-> [Tremblay:sensor:(1) 0.000000] [saturate/INFO] Sensor starting (on port 3000)
-> [Ginette:sensor:(4) 0.000000] [saturate/INFO] Sensor starting (on port 3000)
-> [Fafard:sensor:(3) 0.000000] [saturate/INFO] Sensor starting (on port 3000)
-> [Jupiter:sensor:(2) 0.000000] [saturate/INFO] Sensor starting (on port 3000)
-> [Jupiter:sensor:(2) 5.035692] [gras/INFO] Exiting GRAS
-> [Bourassa:maestro:(5) 5.041260] [saturate/INFO] Start saturation between Tremblay:3000 and Ginette:3000
-> [Fafard:sensor:(3) 5.041260] [gras/INFO] Exiting GRAS
-> [Bourassa:maestro:(5) 5.082092] [saturate/INFO] Have a rest
-> [Bourassa:maestro:(5) 6.082092] [saturate/INFO] Stop the saturation
-> [Tremblay:sensor:(1) 7.200015] [amok_bw_sat/INFO] Saturation(Tremblay:3000->Ginette:3000) started
-> [Tremblay:sensor:(1) 13.188828] [amok_bw_sat/INFO] Saturation from Tremblay:3000 to Ginette:3000 stopped by Bourassa:4000
-> [Bourassa:maestro:(5) 13.209168] [saturate/INFO] Saturation took 5.99sec, achieving 1280588.867148b/s
-> [Tremblay:sensor:(1) 13.229660] [gras/INFO] Exiting GRAS
-> [Bourassa:maestro:(5) 13.242703] [gras/INFO] Exiting GRAS
-> [Ginette:sensor:(4) 73.188828] [amok_bw_sat/INFO] Saturation comming from Tremblay:3000 stopped on Ginette:3000
-> [Ginette:sensor:(4) 73.188828] [gras/INFO] Exiting GRAS
+> [Tremblay:sensor:(1) 0.000156] [saturate/INFO] Sensor starting (on port 3000)
+> [Ginette:sensor:(4) 0.000156] [saturate/INFO] Sensor starting (on port 3000)
+> [Fafard:sensor:(3) 0.000156] [saturate/INFO] Sensor starting (on port 3000)
+> [Jupiter:sensor:(2) 0.000156] [saturate/INFO] Sensor starting (on port 3000)
+> [Jupiter:sensor:(2) 5.035848] [gras/INFO] Exiting GRAS
+> [Bourassa:maestro:(5) 5.041416] [saturate/INFO] Start saturation between Tremblay:3000 and Ginette:3000
+> [Fafard:sensor:(3) 5.041416] [gras/INFO] Exiting GRAS
+> [Bourassa:maestro:(5) 5.082248] [saturate/INFO] Have a rest
+> [Bourassa:maestro:(5) 6.082248] [saturate/INFO] Stop the saturation
+> [Tremblay:sensor:(1) 7.200177] [amok_bw_sat/INFO] Saturation(Tremblay:3000->Ginette:3000) started
+> [Tremblay:sensor:(1) 13.188990] [amok_bw_sat/INFO] Saturation from Tremblay:3000 to Ginette:3000 stopped by Bourassa:4000
+> [Bourassa:maestro:(5) 13.209330] [saturate/INFO] Saturation took 5.99sec, achieving 1280588.867148b/s
+> [Tremblay:sensor:(1) 13.229822] [gras/INFO] Exiting GRAS
+> [Bourassa:maestro:(5) 13.242866] [gras/INFO] Exiting GRAS
+> [Ginette:sensor:(4) 73.188990] [amok_bw_sat/INFO] Saturation comming from Tremblay:3000 stopped on Ginette:3000
+> [Ginette:sensor:(4) 73.188990] [gras/INFO] Exiting GRAS

diff --git a/examples/amok/saturate/saturate_sg_64.tesh b/examples/amok/saturate/saturate_sg_64.tesh
index d1faea6..ea4ee30 100644 (file)
--- a/examples/amok/saturate/saturate_sg_64.tesh
+++ b/examples/amok/saturate/saturate_sg_64.tesh
@@ -1,17 +1,17 @@
 $ $SG_TEST_EXENV saturate/saturate_simulator${EXEEXT} ${srcdir:=.}/../msg/small_platform.xml ${srcdir:=.}/saturate/saturate.xml
-> [Tremblay:sensor:(1) 0.000000] [saturate/INFO] Sensor starting (on port 3000)
-> [Ginette:sensor:(4) 0.000000] [saturate/INFO] Sensor starting (on port 3000)
-> [Fafard:sensor:(3) 0.000000] [saturate/INFO] Sensor starting (on port 3000)
-> [Jupiter:sensor:(2) 0.000000] [saturate/INFO] Sensor starting (on port 3000)
-> [Jupiter:sensor:(2) 5.035692] [gras/INFO] Exiting GRAS
-> [Bourassa:maestro:(5) 5.041260] [saturate/INFO] Start saturation between Tremblay:3000 and Ginette:3000
-> [Fafard:sensor:(3) 5.041260] [gras/INFO] Exiting GRAS
-> [Bourassa:maestro:(5) 5.082092] [saturate/INFO] Have a rest
-> [Bourassa:maestro:(5) 6.082092] [saturate/INFO] Stop the saturation
-> [Tremblay:sensor:(1) 7.200021] [amok_bw_sat/INFO] Saturation(Tremblay:3000->Ginette:3000) started
-> [Tremblay:sensor:(1) 13.188834] [amok_bw_sat/INFO] Saturation from Tremblay:3000 to Ginette:3000 stopped by Bourassa:4000
-> [Bourassa:maestro:(5) 13.209174] [saturate/INFO] Saturation took 5.99sec, achieving 1280588.867148b/s
-> [Tremblay:sensor:(1) 13.229666] [gras/INFO] Exiting GRAS
-> [Bourassa:maestro:(5) 13.242710] [gras/INFO] Exiting GRAS
-> [Ginette:sensor:(4) 73.188834] [amok_bw_sat/INFO] Saturation comming from Tremblay:3000 stopped on Ginette:3000
-> [Ginette:sensor:(4) 73.188834] [gras/INFO] Exiting GRAS
+> [Tremblay:sensor:(1) 0.000156] [saturate/INFO] Sensor starting (on port 3000)
+> [Ginette:sensor:(4) 0.000156] [saturate/INFO] Sensor starting (on port 3000)
+> [Fafard:sensor:(3) 0.000156] [saturate/INFO] Sensor starting (on port 3000)
+> [Jupiter:sensor:(2) 0.000156] [saturate/INFO] Sensor starting (on port 3000)
+> [Jupiter:sensor:(2) 5.035848] [gras/INFO] Exiting GRAS
+> [Bourassa:maestro:(5) 5.041416] [saturate/INFO] Start saturation between Tremblay:3000 and Ginette:3000
+> [Fafard:sensor:(3) 5.041416] [gras/INFO] Exiting GRAS
+> [Bourassa:maestro:(5) 5.082248] [saturate/INFO] Have a rest
+> [Bourassa:maestro:(5) 6.082248] [saturate/INFO] Stop the saturation
+> [Tremblay:sensor:(1) 7.200177] [amok_bw_sat/INFO] Saturation(Tremblay:3000->Ginette:3000) started
+> [Tremblay:sensor:(1) 13.188990] [amok_bw_sat/INFO] Saturation from Tremblay:3000 to Ginette:3000 stopped by Bourassa:4000
+> [Bourassa:maestro:(5) 13.209330] [saturate/INFO] Saturation took 5.99sec, achieving 1280588.867148b/s
+> [Tremblay:sensor:(1) 13.229822] [gras/INFO] Exiting GRAS
+> [Bourassa:maestro:(5) 13.242866] [gras/INFO] Exiting GRAS
+> [Ginette:sensor:(4) 73.188990] [amok_bw_sat/INFO] Saturation comming from Tremblay:3000 stopped on Ginette:3000
+> [Ginette:sensor:(4) 73.188990] [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 326cd73..365c57c 100755 (executable)
--- a/examples/gras/mutual_exclusion/simple_token/test_sg_32
+++ b/examples/gras/mutual_exclusion/simple_token/test_sg_32
@@ -1,11 +1,11 @@
 $ $SG_TEST_EXENV ./simple_token_simulator$EXEEXT ${srcdir:=.}/../../../msg/small_platform.xml ${srcdir:=.}/simple_token.xml 
-> [Tremblay:node:(1) 0.000000] [SimpleToken/INFO] Create the token (with value 0) and send it to Fafard:4000
-> [Tremblay:node:(1) 0.117961] [SimpleToken/INFO] Begin a new loop. Still to do: 2
-> [Tremblay:node:(1) 0.235922] [SimpleToken/INFO] Begin a new loop. Still to do: 1
-> [Tremblay:node:(1) 0.353882] [SimpleToken/INFO] Begin a new loop. Still to do: 0
-> [Tremblay:node:(1) 0.353882] [SimpleToken/INFO] Shut down the token-ring. There was 14 hops.
-> [Fafard:node:(2) 1.292225] [gras/INFO] Exiting GRAS
-> [Jupiter:node:(3) 1.320657] [gras/INFO] Exiting GRAS
-> [Ginette:node:(4) 1.333546] [gras/INFO] Exiting GRAS
-> [Bourassa:node:(5) 1.353882] [gras/INFO] Exiting GRAS
-> [Tremblay:node:(1) 1.353882] [gras/INFO] Exiting GRAS
+> [Tremblay:node:(1) 1.000312] [SimpleToken/INFO] Create the token (with value 0) and send it to Fafard:4000
+> [Tremblay:node:(1) 1.118273] [SimpleToken/INFO] Begin a new loop. Still to do: 2
+> [Tremblay:node:(1) 1.236234] [SimpleToken/INFO] Begin a new loop. Still to do: 1
+> [Tremblay:node:(1) 1.354194] [SimpleToken/INFO] Begin a new loop. Still to do: 0
+> [Tremblay:node:(1) 1.354194] [SimpleToken/INFO] Shut down the token-ring. There was 14 hops.
+> [Fafard:node:(2) 2.292537] [gras/INFO] Exiting GRAS
+> [Jupiter:node:(3) 2.320969] [gras/INFO] Exiting GRAS
+> [Ginette:node:(4) 2.333858] [gras/INFO] Exiting GRAS
+> [Bourassa:node:(5) 2.354194] [gras/INFO] Exiting GRAS
+> [Tremblay:node:(1) 2.354194] [gras/INFO] Exiting GRAS

diff --git a/examples/gras/mutual_exclusion/simple_token/test_sg_64 b/examples/gras/mutual_exclusion/simple_token/test_sg_64
index e33cd31..9ff73b0 100755 (executable)
--- a/examples/gras/mutual_exclusion/simple_token/test_sg_64
+++ b/examples/gras/mutual_exclusion/simple_token/test_sg_64
@@ -1,12 +1,12 @@
 $ $SG_TEST_EXENV ./simple_token_simulator$EXEEXT ${srcdir:=.}/../../../msg/small_platform.xml ${srcdir:=.}/simple_token.xml 
-> [Tremblay:node:(1) 0.000000] [SimpleToken/INFO] Create the token (with value 0) and send it to Fafard:4000
-> [Tremblay:node:(1) 0.117961] [SimpleToken/INFO] Begin a new loop. Still to do: 2
-> [Tremblay:node:(1) 0.235922] [SimpleToken/INFO] Begin a new loop. Still to do: 1
-> [Tremblay:node:(1) 0.353882] [SimpleToken/INFO] Begin a new loop. Still to do: 0
-> [Tremblay:node:(1) 0.353882] [SimpleToken/INFO] Shut down the token-ring. There was 14 hops.
-> [Fafard:node:(2) 1.292225] [gras/INFO] Exiting GRAS
-> [Jupiter:node:(3) 1.320657] [gras/INFO] Exiting GRAS
-> [Ginette:node:(4) 1.333546] [gras/INFO] Exiting GRAS
-> [Bourassa:node:(5) 1.353882] [gras/INFO] Exiting GRAS
-> [Tremblay:node:(1) 1.353882] [gras/INFO] Exiting GRAS
+> [Tremblay:node:(1) 1.000312] [SimpleToken/INFO] Create the token (with value 0) and send it to Fafard:4000
+> [Tremblay:node:(1) 1.118273] [SimpleToken/INFO] Begin a new loop. Still to do: 2
+> [Tremblay:node:(1) 1.236234] [SimpleToken/INFO] Begin a new loop. Still to do: 1
+> [Tremblay:node:(1) 1.354194] [SimpleToken/INFO] Begin a new loop. Still to do: 0
+> [Tremblay:node:(1) 1.354194] [SimpleToken/INFO] Shut down the token-ring. There was 14 hops.
+> [Fafard:node:(2) 2.292537] [gras/INFO] Exiting GRAS
+> [Jupiter:node:(3) 2.320969] [gras/INFO] Exiting GRAS
+> [Ginette:node:(4) 2.333858] [gras/INFO] Exiting GRAS
+> [Bourassa:node:(5) 2.354194] [gras/INFO] Exiting GRAS
+> [Tremblay:node:(1) 2.354194] [gras/INFO] Exiting GRAS
 

diff --git a/examples/gras/pmm/test_sg_32 b/examples/gras/pmm/test_sg_32
index e4a2074..70a6783 100755 (executable)
--- a/examples/gras/pmm/test_sg_32
+++ b/examples/gras/pmm/test_sg_32
@@ -1,43 +1,43 @@
 $ $SG_TEST_EXENV ./pmm_simulator$EXEEXT ${srcdir:=.}/../../msg/msg_platform.xml ${srcdir:=.}/pmm.xml
-> [Jacquelin:master:(1) 0.000000] [pmm/INFO] Wait for peers for 2 sec
-> [Laroche:slave:(10) 0.000000] [pmm/INFO] Sensor 8 starting
-> [Gatien:slave:(9) 0.000000] [pmm/INFO] Sensor 7 starting
-> [McGee:slave:(8) 0.000000] [pmm/INFO] Sensor 6 starting
-> [iRMX:slave:(7) 0.000000] [pmm/INFO] Sensor 5 starting
-> [Disney:slave:(6) 0.000000] [pmm/INFO] Sensor 4 starting
-> [Geoff:slave:(5) 0.000000] [pmm/INFO] Sensor 3 starting
-> [TeX:slave:(4) 0.000000] [pmm/INFO] Sensor 2 starting
-> [Jean_Yves:slave:(3) 0.000000] [pmm/INFO] Sensor 1 starting
-> [Boivin:slave:(2) 0.000000] [pmm/INFO] Sensor 0 starting
-> [Jacquelin:master:(1) 2.879074] [pmm/INFO] Got only 1 pals. Wait 2 more seconds
-> [Jacquelin:master:(1) 4.879074] [pmm/INFO] Got only 3 pals. Wait 2 more seconds
-> [Jacquelin:master:(1) 8.034879] [pmm/INFO] Got only 4 pals. Wait 2 more seconds
-> [Jacquelin:master:(1) 10.945925] [pmm/INFO] Got only 7 pals. Wait 2 more seconds
-> [Jacquelin:master:(1) 12.945925] [pmm/INFO] Good. Got 9 pals
-> [Jacquelin:master:(1) 12.947329] [pmm/INFO] XXXXXXXXXXXXXXXXXXXXXX begin Multiplication
-> [Laroche:slave:(10) 15.395784] [pmm/INFO] Receive my pos (0,0) and assignment
-> [iRMX:slave:(7) 16.396219] [gras_msg/INFO] No callback for message 'dataB' (type:ONEWAY) from Laroche:3000. Queue it for later gras_msg_wait() use.
-> [Gatien:slave:(9) 16.421044] [pmm/INFO] Receive my pos (0,1) and assignment
-> [McGee:slave:(8) 17.135686] [pmm/INFO] Receive my pos (0,2) and assignment
-> [Disney:slave:(6) 17.504922] [gras_msg/INFO] No callback for message 'dataB' (type:ONEWAY) from Gatien:3000. Queue it for later gras_msg_wait() use.
-> [Geoff:slave:(5) 17.844240] [gras_msg/INFO] No callback for message 'dataB' (type:ONEWAY) from McGee:3000. Queue it for later gras_msg_wait() use.
-> [Boivin:slave:(2) 17.928262] [gras_msg/INFO] No callback for message 'dataB' (type:ONEWAY) from McGee:3000. Queue it for later gras_msg_wait() use.
-> [TeX:slave:(4) 17.959150] [gras_msg/INFO] No callback for message 'dataB' (type:ONEWAY) from Laroche:3000. Queue it for later gras_msg_wait() use.
-> [Jean_Yves:slave:(3) 19.252031] [gras_msg/INFO] No callback for message 'dataB' (type:ONEWAY) from Gatien:3000. Queue it for later gras_msg_wait() use.
-> [iRMX:slave:(7) 19.844644] [pmm/INFO] Receive my pos (1,0) and assignment
-> [Disney:slave:(6) 21.311603] [pmm/INFO] Receive my pos (1,1) and assignment
-> [Geoff:slave:(5) 21.316148] [pmm/INFO] Receive my pos (1,2) and assignment
-> [TeX:slave:(4) 22.774326] [pmm/INFO] Receive my pos (2,0) and assignment
-> [Jean_Yves:slave:(3) 23.518499] [pmm/INFO] Receive my pos (2,1) and assignment
-> [Boivin:slave:(2) 24.362265] [pmm/INFO] Receive my pos (2,2) and assignment
-> [Jacquelin:master:(1) 43.579911] [pmm/INFO] XXXXXXXXXXXXXXXXXXXXXX Ok, the result matches expectations
-> [Laroche:slave:(10) 45.019471] [gras/INFO] Exiting GRAS
-> [Gatien:slave:(9) 46.038393] [gras/INFO] Exiting GRAS
-> [McGee:slave:(8) 46.748684] [gras/INFO] Exiting GRAS
-> [iRMX:slave:(7) 49.181895] [gras/INFO] Exiting GRAS
-> [Disney:slave:(6) 50.639759] [gras/INFO] Exiting GRAS
-> [Geoff:slave:(5) 50.644184] [gras/INFO] Exiting GRAS
-> [TeX:slave:(4) 52.093295] [gras/INFO] Exiting GRAS
-> [Jean_Yves:slave:(3) 52.832953] [gras/INFO] Exiting GRAS
-> [Jacquelin:master:(1) 53.671569] [gras/INFO] Exiting GRAS
-> [Boivin:slave:(2) 53.671569] [gras/INFO] Exiting GRAS
+> [Jacquelin:master:(1) 0.000156] [pmm/INFO] Wait for peers for 2 sec
+> [Laroche:slave:(10) 0.000156] [pmm/INFO] Sensor 8 starting
+> [Gatien:slave:(9) 0.000156] [pmm/INFO] Sensor 7 starting
+> [McGee:slave:(8) 0.000156] [pmm/INFO] Sensor 6 starting
+> [iRMX:slave:(7) 0.000156] [pmm/INFO] Sensor 5 starting
+> [Disney:slave:(6) 0.000156] [pmm/INFO] Sensor 4 starting
+> [Geoff:slave:(5) 0.000156] [pmm/INFO] Sensor 3 starting
+> [TeX:slave:(4) 0.000156] [pmm/INFO] Sensor 2 starting
+> [Jean_Yves:slave:(3) 0.000156] [pmm/INFO] Sensor 1 starting
+> [Boivin:slave:(2) 0.000156] [pmm/INFO] Sensor 0 starting
+> [Jacquelin:master:(1) 2.879230] [pmm/INFO] Got only 1 pals. Wait 2 more seconds
+> [Jacquelin:master:(1) 4.879230] [pmm/INFO] Got only 3 pals. Wait 2 more seconds
+> [Jacquelin:master:(1) 8.035035] [pmm/INFO] Got only 4 pals. Wait 2 more seconds
+> [Jacquelin:master:(1) 10.946081] [pmm/INFO] Got only 7 pals. Wait 2 more seconds
+> [Jacquelin:master:(1) 12.946081] [pmm/INFO] Good. Got 9 pals
+> [Jacquelin:master:(1) 12.947485] [pmm/INFO] XXXXXXXXXXXXXXXXXXXXXX begin Multiplication
+> [Laroche:slave:(10) 15.396161] [pmm/INFO] Receive my pos (0,0) and assignment
+> [iRMX:slave:(7) 16.396673] [gras_msg/INFO] No callback for message 'dataB' (type:ONEWAY) from Laroche:3000. Queue it for later gras_msg_wait() use.
+> [Gatien:slave:(9) 16.421579] [pmm/INFO] Receive my pos (0,1) and assignment
+> [McGee:slave:(8) 17.136330] [pmm/INFO] Receive my pos (0,2) and assignment
+> [Disney:slave:(6) 17.505539] [gras_msg/INFO] No callback for message 'dataB' (type:ONEWAY) from Gatien:3000. Queue it for later gras_msg_wait() use.
+> [Geoff:slave:(5) 17.844938] [gras_msg/INFO] No callback for message 'dataB' (type:ONEWAY) from McGee:3000. Queue it for later gras_msg_wait() use.
+> [Boivin:slave:(2) 17.928966] [gras_msg/INFO] No callback for message 'dataB' (type:ONEWAY) from McGee:3000. Queue it for later gras_msg_wait() use.
+> [TeX:slave:(4) 17.959724] [gras_msg/INFO] No callback for message 'dataB' (type:ONEWAY) from Laroche:3000. Queue it for later gras_msg_wait() use.
+> [Jean_Yves:slave:(3) 19.252782] [gras_msg/INFO] No callback for message 'dataB' (type:ONEWAY) from Gatien:3000. Queue it for later gras_msg_wait() use.
+> [iRMX:slave:(7) 19.845472] [pmm/INFO] Receive my pos (1,0) and assignment
+> [Disney:slave:(6) 21.312656] [pmm/INFO] Receive my pos (1,1) and assignment
+> [Geoff:slave:(5) 21.317208] [pmm/INFO] Receive my pos (1,2) and assignment
+> [TeX:slave:(4) 22.775609] [pmm/INFO] Receive my pos (2,0) and assignment
+> [Jean_Yves:slave:(3) 23.519896] [pmm/INFO] Receive my pos (2,1) and assignment
+> [Boivin:slave:(2) 24.363790] [pmm/INFO] Receive my pos (2,2) and assignment
+> [Jacquelin:master:(1) 43.582752] [pmm/INFO] XXXXXXXXXXXXXXXXXXXXXX Ok, the result matches expectations
+> [Laroche:slave:(10) 45.022312] [gras/INFO] Exiting GRAS
+> [Gatien:slave:(9) 46.041233] [gras/INFO] Exiting GRAS
+> [McGee:slave:(8) 46.751525] [gras/INFO] Exiting GRAS
+> [iRMX:slave:(7) 49.184735] [gras/INFO] Exiting GRAS
+> [Disney:slave:(6) 50.642600] [gras/INFO] Exiting GRAS
+> [Geoff:slave:(5) 50.647025] [gras/INFO] Exiting GRAS
+> [TeX:slave:(4) 52.096135] [gras/INFO] Exiting GRAS
+> [Jean_Yves:slave:(3) 52.835793] [gras/INFO] Exiting GRAS
+> [Jacquelin:master:(1) 53.674409] [gras/INFO] Exiting GRAS
+> [Boivin:slave:(2) 53.674409] [gras/INFO] Exiting GRAS

diff --git a/examples/gras/pmm/test_sg_64 b/examples/gras/pmm/test_sg_64
index 8816f2a..d545d8e 100755 (executable)
--- a/examples/gras/pmm/test_sg_64
+++ b/examples/gras/pmm/test_sg_64
@@ -1,44 +1,44 @@
 ! timeout 30
 $ $SG_TEST_EXENV ./pmm_simulator$EXEEXT ${srcdir:=.}/../../msg/msg_platform.xml ${srcdir:=.}/pmm.xml
-> [Jacquelin:master:(1) 0.000000] [pmm/INFO] Wait for peers for 2 sec
-> [Laroche:slave:(10) 0.000000] [pmm/INFO] Sensor 8 starting
-> [Gatien:slave:(9) 0.000000] [pmm/INFO] Sensor 7 starting
-> [McGee:slave:(8) 0.000000] [pmm/INFO] Sensor 6 starting
-> [iRMX:slave:(7) 0.000000] [pmm/INFO] Sensor 5 starting
-> [Disney:slave:(6) 0.000000] [pmm/INFO] Sensor 4 starting
-> [Geoff:slave:(5) 0.000000] [pmm/INFO] Sensor 3 starting
-> [TeX:slave:(4) 0.000000] [pmm/INFO] Sensor 2 starting
-> [Jean_Yves:slave:(3) 0.000000] [pmm/INFO] Sensor 1 starting
-> [Boivin:slave:(2) 0.000000] [pmm/INFO] Sensor 0 starting
-> [Jacquelin:master:(1) 2.879074] [pmm/INFO] Got only 1 pals. Wait 2 more seconds
-> [Jacquelin:master:(1) 4.879074] [pmm/INFO] Got only 3 pals. Wait 2 more seconds
-> [Jacquelin:master:(1) 8.034879] [pmm/INFO] Got only 4 pals. Wait 2 more seconds
-> [Jacquelin:master:(1) 10.945925] [pmm/INFO] Got only 7 pals. Wait 2 more seconds
-> [Jacquelin:master:(1) 12.945925] [pmm/INFO] Good. Got 9 pals
-> [Jacquelin:master:(1) 12.947329] [pmm/INFO] XXXXXXXXXXXXXXXXXXXXXX begin Multiplication
-> [Laroche:slave:(10) 15.396005] [pmm/INFO] Receive my pos (0,0) and assignment
-> [iRMX:slave:(7) 16.396517] [gras_msg/INFO] No callback for message 'dataB' (type:ONEWAY) from Laroche:3000. Queue it for later gras_msg_wait() use.
-> [Gatien:slave:(9) 16.421423] [pmm/INFO] Receive my pos (0,1) and assignment
-> [McGee:slave:(8) 17.136174] [pmm/INFO] Receive my pos (0,2) and assignment
-> [Disney:slave:(6) 17.505383] [gras_msg/INFO] No callback for message 'dataB' (type:ONEWAY) from Gatien:3000. Queue it for later gras_msg_wait() use.
-> [Geoff:slave:(5) 17.844782] [gras_msg/INFO] No callback for message 'dataB' (type:ONEWAY) from McGee:3000. Queue it for later gras_msg_wait() use.
-> [Boivin:slave:(2) 17.928810] [gras_msg/INFO] No callback for message 'dataB' (type:ONEWAY) from McGee:3000. Queue it for later gras_msg_wait() use.
-> [TeX:slave:(4) 17.959568] [gras_msg/INFO] No callback for message 'dataB' (type:ONEWAY) from Laroche:3000. Queue it for later gras_msg_wait() use.
-> [Jean_Yves:slave:(3) 19.252626] [gras_msg/INFO] No callback for message 'dataB' (type:ONEWAY) from Gatien:3000. Queue it for later gras_msg_wait() use.
-> [iRMX:slave:(7) 19.845316] [pmm/INFO] Receive my pos (1,0) and assignment
-> [Disney:slave:(6) 21.312500] [pmm/INFO] Receive my pos (1,1) and assignment
-> [Geoff:slave:(5) 21.317052] [pmm/INFO] Receive my pos (1,2) and assignment
-> [TeX:slave:(4) 22.775453] [pmm/INFO] Receive my pos (2,0) and assignment
-> [Jean_Yves:slave:(3) 23.519740] [pmm/INFO] Receive my pos (2,1) and assignment
-> [Boivin:slave:(2) 24.363634] [pmm/INFO] Receive my pos (2,2) and assignment
-> [Jacquelin:master:(1) 43.582596] [pmm/INFO] XXXXXXXXXXXXXXXXXXXXXX Ok, the result matches expectations
-> [Laroche:slave:(10) 45.022156] [gras/INFO] Exiting GRAS
-> [Gatien:slave:(9) 46.041077] [gras/INFO] Exiting GRAS
-> [McGee:slave:(8) 46.751369] [gras/INFO] Exiting GRAS
-> [iRMX:slave:(7) 49.184579] [gras/INFO] Exiting GRAS
-> [Disney:slave:(6) 50.642444] [gras/INFO] Exiting GRAS
-> [Geoff:slave:(5) 50.646869] [gras/INFO] Exiting GRAS
-> [TeX:slave:(4) 52.095979] [gras/INFO] Exiting GRAS
-> [Jean_Yves:slave:(3) 52.835637] [gras/INFO] Exiting GRAS
-> [Jacquelin:master:(1) 53.674253] [gras/INFO] Exiting GRAS
-> [Boivin:slave:(2) 53.674253] [gras/INFO] Exiting GRAS
+> [Jacquelin:master:(1) 0.000156] [pmm/INFO] Wait for peers for 2 sec
+> [Laroche:slave:(10) 0.000156] [pmm/INFO] Sensor 8 starting
+> [Gatien:slave:(9) 0.000156] [pmm/INFO] Sensor 7 starting
+> [McGee:slave:(8) 0.000156] [pmm/INFO] Sensor 6 starting
+> [iRMX:slave:(7) 0.000156] [pmm/INFO] Sensor 5 starting
+> [Disney:slave:(6) 0.000156] [pmm/INFO] Sensor 4 starting
+> [Geoff:slave:(5) 0.000156] [pmm/INFO] Sensor 3 starting
+> [TeX:slave:(4) 0.000156] [pmm/INFO] Sensor 2 starting
+> [Jean_Yves:slave:(3) 0.000156] [pmm/INFO] Sensor 1 starting
+> [Boivin:slave:(2) 0.000156] [pmm/INFO] Sensor 0 starting
+> [Jacquelin:master:(1) 2.879230] [pmm/INFO] Got only 1 pals. Wait 2 more seconds
+> [Jacquelin:master:(1) 4.879230] [pmm/INFO] Got only 3 pals. Wait 2 more seconds
+> [Jacquelin:master:(1) 8.035035] [pmm/INFO] Got only 4 pals. Wait 2 more seconds
+> [Jacquelin:master:(1) 10.946081] [pmm/INFO] Got only 7 pals. Wait 2 more seconds
+> [Jacquelin:master:(1) 12.946081] [pmm/INFO] Good. Got 9 pals
+> [Jacquelin:master:(1) 12.947485] [pmm/INFO] XXXXXXXXXXXXXXXXXXXXXX begin Multiplication
+> [Laroche:slave:(10) 15.396161] [pmm/INFO] Receive my pos (0,0) and assignment
+> [iRMX:slave:(7) 16.396673] [gras_msg/INFO] No callback for message 'dataB' (type:ONEWAY) from Laroche:3000. Queue it for later gras_msg_wait() use.
+> [Gatien:slave:(9) 16.421579] [pmm/INFO] Receive my pos (0,1) and assignment
+> [McGee:slave:(8) 17.136330] [pmm/INFO] Receive my pos (0,2) and assignment
+> [Disney:slave:(6) 17.505539] [gras_msg/INFO] No callback for message 'dataB' (type:ONEWAY) from Gatien:3000. Queue it for later gras_msg_wait() use.
+> [Geoff:slave:(5) 17.844938] [gras_msg/INFO] No callback for message 'dataB' (type:ONEWAY) from McGee:3000. Queue it for later gras_msg_wait() use.
+> [Boivin:slave:(2) 17.928966] [gras_msg/INFO] No callback for message 'dataB' (type:ONEWAY) from McGee:3000. Queue it for later gras_msg_wait() use.
+> [TeX:slave:(4) 17.959724] [gras_msg/INFO] No callback for message 'dataB' (type:ONEWAY) from Laroche:3000. Queue it for later gras_msg_wait() use.
+> [Jean_Yves:slave:(3) 19.252782] [gras_msg/INFO] No callback for message 'dataB' (type:ONEWAY) from Gatien:3000. Queue it for later gras_msg_wait() use.
+> [iRMX:slave:(7) 19.845472] [pmm/INFO] Receive my pos (1,0) and assignment
+> [Disney:slave:(6) 21.312656] [pmm/INFO] Receive my pos (1,1) and assignment
+> [Geoff:slave:(5) 21.317208] [pmm/INFO] Receive my pos (1,2) and assignment
+> [TeX:slave:(4) 22.775609] [pmm/INFO] Receive my pos (2,0) and assignment
+> [Jean_Yves:slave:(3) 23.519896] [pmm/INFO] Receive my pos (2,1) and assignment
+> [Boivin:slave:(2) 24.363790] [pmm/INFO] Receive my pos (2,2) and assignment
+> [Jacquelin:master:(1) 43.582752] [pmm/INFO] XXXXXXXXXXXXXXXXXXXXXX Ok, the result matches expectations
+> [Laroche:slave:(10) 45.022312] [gras/INFO] Exiting GRAS
+> [Gatien:slave:(9) 46.041233] [gras/INFO] Exiting GRAS
+> [McGee:slave:(8) 46.751525] [gras/INFO] Exiting GRAS
+> [iRMX:slave:(7) 49.184735] [gras/INFO] Exiting GRAS
+> [Disney:slave:(6) 50.642600] [gras/INFO] Exiting GRAS
+> [Geoff:slave:(5) 50.647025] [gras/INFO] Exiting GRAS
+> [TeX:slave:(4) 52.096135] [gras/INFO] Exiting GRAS
+> [Jean_Yves:slave:(3) 52.835793] [gras/INFO] Exiting GRAS
+> [Jacquelin:master:(1) 53.674409] [gras/INFO] Exiting GRAS
+> [Boivin:slave:(2) 53.674409] [gras/INFO] Exiting GRAS

diff --git a/examples/gras/spawn/test_sg_32 b/examples/gras/spawn/test_sg_32
index 96758b4..4467b1e 100755 (executable)
--- a/examples/gras/spawn/test_sg_32
+++ b/examples/gras/spawn/test_sg_32
@@ -1,31 +1,31 @@
 p Runs the 'spawn' test within the simulator (simulation times valid for 32bits architectures)
 
 $ $SG_TEST_EXENV ./spawn_simulator${EXEEXT:=} ${srcdir:=.}/../../msg/small_platform.xml ${srcdir:=.}/spawn.xml
-> [Tremblay:father:(1) 0.000000] [Spawn/INFO] Spawn the kids
-> [Tremblay:child:(2) 0.000312] [Spawn/INFO] I (Tremblay:4001) have found my dady on Tremblay:4000.
-> [Tremblay:child:(6) 0.000312] [Spawn/INFO] I (Tremblay:4002) have found my dady on Tremblay:4000.
-> [Tremblay:child:(3) 0.000312] [Spawn/INFO] I (Tremblay:4003) have found my dady on Tremblay:4000.
-> [Tremblay:child:(4) 0.000312] [Spawn/INFO] I (Tremblay:4004) have found my dady on Tremblay:4000.
-> [Tremblay:child:(5) 0.000312] [Spawn/INFO] I (Tremblay:4005) have found my dady on Tremblay:4000.
-> [Tremblay:father:(1) 0.000468] [Spawn/INFO] Kid Tremblay:4001 pinged me with 1234
-> [Tremblay:father:(1) 0.000624] [Spawn/INFO] Answered to Tremblay:4001's request
-> [Tremblay:father:(1) 0.000624] [Spawn/INFO] Kid Tremblay:4002 pinged me with 1234
-> [Tremblay:child:(2) 0.000624] [Spawn/INFO] Pinged dad with 1234, he answered with 4321; leaving now.
-> [Tremblay:child:(2) 0.000624] [gras/INFO] Exiting GRAS
-> [Tremblay:father:(1) 0.000780] [Spawn/INFO] Answered to Tremblay:4002's request
-> [Tremblay:father:(1) 0.000780] [Spawn/INFO] Kid Tremblay:4003 pinged me with 1234
-> [Tremblay:child:(6) 0.000780] [Spawn/INFO] Pinged dad with 1234, he answered with 4321; leaving now.
-> [Tremblay:child:(6) 0.000780] [gras/INFO] Exiting GRAS
-> [Tremblay:father:(1) 0.000936] [Spawn/INFO] Answered to Tremblay:4003's request
-> [Tremblay:father:(1) 0.000936] [Spawn/INFO] Kid Tremblay:4004 pinged me with 1234
-> [Tremblay:child:(3) 0.000936] [Spawn/INFO] Pinged dad with 1234, he answered with 4321; leaving now.
-> [Tremblay:child:(3) 0.000936] [gras/INFO] Exiting GRAS
-> [Tremblay:father:(1) 0.001092] [Spawn/INFO] Answered to Tremblay:4004's request
-> [Tremblay:father:(1) 0.001092] [Spawn/INFO] Kid Tremblay:4005 pinged me with 1234
-> [Tremblay:child:(4) 0.001092] [Spawn/INFO] Pinged dad with 1234, he answered with 4321; leaving now.
-> [Tremblay:child:(4) 0.001092] [gras/INFO] Exiting GRAS
-> [Tremblay:father:(1) 0.001248] [Spawn/INFO] Answered to Tremblay:4005's request
-> [Tremblay:father:(1) 0.001248] [Spawn/INFO] All kids gone. Leave now.
-> [Tremblay:father:(1) 0.001248] [gras/INFO] Exiting GRAS
-> [Tremblay:child:(5) 0.001248] [Spawn/INFO] Pinged dad with 1234, he answered with 4321; leaving now.
-> [Tremblay:child:(5) 0.001248] [gras/INFO] Exiting GRAS
+> [Tremblay:father:(1) 0.000156] [Spawn/INFO] Spawn the kids
+> [Tremblay:child:(2) 0.000468] [Spawn/INFO] I (Tremblay:4001) have found my dady on Tremblay:4000.
+> [Tremblay:child:(6) 0.000468] [Spawn/INFO] I (Tremblay:4002) have found my dady on Tremblay:4000.
+> [Tremblay:child:(3) 0.000468] [Spawn/INFO] I (Tremblay:4003) have found my dady on Tremblay:4000.
+> [Tremblay:child:(4) 0.000468] [Spawn/INFO] I (Tremblay:4004) have found my dady on Tremblay:4000.
+> [Tremblay:child:(5) 0.000468] [Spawn/INFO] I (Tremblay:4005) have found my dady on Tremblay:4000.
+> [Tremblay:father:(1) 0.000624] [Spawn/INFO] Kid Tremblay:4001 pinged me with 1234
+> [Tremblay:father:(1) 0.000780] [Spawn/INFO] Answered to Tremblay:4001's request
+> [Tremblay:father:(1) 0.000780] [Spawn/INFO] Kid Tremblay:4002 pinged me with 1234
+> [Tremblay:child:(2) 0.000780] [Spawn/INFO] Pinged dad with 1234, he answered with 4321; leaving now.
+> [Tremblay:child:(2) 0.000780] [gras/INFO] Exiting GRAS
+> [Tremblay:father:(1) 0.000936] [Spawn/INFO] Answered to Tremblay:4002's request
+> [Tremblay:father:(1) 0.000936] [Spawn/INFO] Kid Tremblay:4003 pinged me with 1234
+> [Tremblay:child:(6) 0.000936] [Spawn/INFO] Pinged dad with 1234, he answered with 4321; leaving now.
+> [Tremblay:child:(6) 0.000936] [gras/INFO] Exiting GRAS
+> [Tremblay:father:(1) 0.001092] [Spawn/INFO] Answered to Tremblay:4003's request
+> [Tremblay:father:(1) 0.001092] [Spawn/INFO] Kid Tremblay:4004 pinged me with 1234
+> [Tremblay:child:(3) 0.001092] [Spawn/INFO] Pinged dad with 1234, he answered with 4321; leaving now.
+> [Tremblay:child:(3) 0.001092] [gras/INFO] Exiting GRAS
+> [Tremblay:father:(1) 0.001248] [Spawn/INFO] Answered to Tremblay:4004's request
+> [Tremblay:father:(1) 0.001248] [Spawn/INFO] Kid Tremblay:4005 pinged me with 1234
+> [Tremblay:child:(4) 0.001248] [Spawn/INFO] Pinged dad with 1234, he answered with 4321; leaving now.
+> [Tremblay:child:(4) 0.001248] [gras/INFO] Exiting GRAS
+> [Tremblay:father:(1) 0.001404] [Spawn/INFO] Answered to Tremblay:4005's request
+> [Tremblay:father:(1) 0.001404] [Spawn/INFO] All kids gone. Leave now.
+> [Tremblay:father:(1) 0.001404] [gras/INFO] Exiting GRAS
+> [Tremblay:child:(5) 0.001404] [Spawn/INFO] Pinged dad with 1234, he answered with 4321; leaving now.
+> [Tremblay:child:(5) 0.001404] [gras/INFO] Exiting GRAS

diff --git a/examples/gras/spawn/test_sg_64 b/examples/gras/spawn/test_sg_64
index a679fba..fd526f3 100755 (executable)
--- a/examples/gras/spawn/test_sg_64
+++ b/examples/gras/spawn/test_sg_64
@@ -1,32 +1,33 @@
 p Runs the 'spawn' test within the simulator (simulation times valid for 64bits architectures)
 
 $ $SG_TEST_EXENV ./spawn_simulator${EXEEXT:=} ${srcdir:=.}/../../msg/small_platform.xml ${srcdir:=.}/spawn.xml
-> [Tremblay:father:(1) 0.000000] [Spawn/INFO] Spawn the kids
-> [Tremblay:child:(2) 0.000312] [Spawn/INFO] I (Tremblay:4001) have found my dady on Tremblay:4000.
-> [Tremblay:child:(6) 0.000312] [Spawn/INFO] I (Tremblay:4002) have found my dady on Tremblay:4000.
-> [Tremblay:child:(3) 0.000312] [Spawn/INFO] I (Tremblay:4003) have found my dady on Tremblay:4000.
-> [Tremblay:child:(4) 0.000312] [Spawn/INFO] I (Tremblay:4004) have found my dady on Tremblay:4000.
-> [Tremblay:child:(5) 0.000312] [Spawn/INFO] I (Tremblay:4005) have found my dady on Tremblay:4000.
-> [Tremblay:father:(1) 0.000468] [Spawn/INFO] Kid Tremblay:4001 pinged me with 1234
-> [Tremblay:father:(1) 0.000624] [Spawn/INFO] Answered to Tremblay:4001's request
-> [Tremblay:father:(1) 0.000624] [Spawn/INFO] Kid Tremblay:4002 pinged me with 1234
-> [Tremblay:child:(2) 0.000624] [Spawn/INFO] Pinged dad with 1234, he answered with 4321; leaving now.
-> [Tremblay:child:(2) 0.000624] [gras/INFO] Exiting GRAS
-> [Tremblay:father:(1) 0.000780] [Spawn/INFO] Answered to Tremblay:4002's request
-> [Tremblay:father:(1) 0.000780] [Spawn/INFO] Kid Tremblay:4003 pinged me with 1234
-> [Tremblay:child:(6) 0.000780] [Spawn/INFO] Pinged dad with 1234, he answered with 4321; leaving now.
-> [Tremblay:child:(6) 0.000780] [gras/INFO] Exiting GRAS
-> [Tremblay:father:(1) 0.000936] [Spawn/INFO] Answered to Tremblay:4003's request
-> [Tremblay:father:(1) 0.000936] [Spawn/INFO] Kid Tremblay:4004 pinged me with 1234
-> [Tremblay:child:(3) 0.000936] [Spawn/INFO] Pinged dad with 1234, he answered with 4321; leaving now.
-> [Tremblay:child:(3) 0.000936] [gras/INFO] Exiting GRAS
-> [Tremblay:father:(1) 0.001092] [Spawn/INFO] Answered to Tremblay:4004's request
-> [Tremblay:father:(1) 0.001092] [Spawn/INFO] Kid Tremblay:4005 pinged me with 1234
-> [Tremblay:child:(4) 0.001092] [Spawn/INFO] Pinged dad with 1234, he answered with 4321; leaving now.
-> [Tremblay:child:(4) 0.001092] [gras/INFO] Exiting GRAS
-> [Tremblay:father:(1) 0.001248] [Spawn/INFO] Answered to Tremblay:4005's request
-> [Tremblay:father:(1) 0.001248] [Spawn/INFO] All kids gone. Leave now.
-> [Tremblay:father:(1) 0.001248] [gras/INFO] Exiting GRAS
-> [Tremblay:child:(5) 0.001248] [Spawn/INFO] Pinged dad with 1234, he answered with 4321; leaving now.
-> [Tremblay:child:(5) 0.001248] [gras/INFO] Exiting GRAS
+> [Tremblay:father:(1) 0.000156] [Spawn/INFO] Spawn the kids
+> [Tremblay:child:(2) 0.000468] [Spawn/INFO] I (Tremblay:4001) have found my dady on Tremblay:4000.
+> [Tremblay:child:(6) 0.000468] [Spawn/INFO] I (Tremblay:4002) have found my dady on Tremblay:4000.
+> [Tremblay:child:(3) 0.000468] [Spawn/INFO] I (Tremblay:4003) have found my dady on Tremblay:4000.
+> [Tremblay:child:(4) 0.000468] [Spawn/INFO] I (Tremblay:4004) have found my dady on Tremblay:4000.
+> [Tremblay:child:(5) 0.000468] [Spawn/INFO] I (Tremblay:4005) have found my dady on Tremblay:4000.
+> [Tremblay:father:(1) 0.000624] [Spawn/INFO] Kid Tremblay:4001 pinged me with 1234
+> [Tremblay:father:(1) 0.000780] [Spawn/INFO] Answered to Tremblay:4001's request
+> [Tremblay:father:(1) 0.000780] [Spawn/INFO] Kid Tremblay:4002 pinged me with 1234
+> [Tremblay:child:(2) 0.000780] [Spawn/INFO] Pinged dad with 1234, he answered with 4321; leaving now.
+> [Tremblay:child:(2) 0.000780] [gras/INFO] Exiting GRAS
+> [Tremblay:father:(1) 0.000936] [Spawn/INFO] Answered to Tremblay:4002's request
+> [Tremblay:father:(1) 0.000936] [Spawn/INFO] Kid Tremblay:4003 pinged me with 1234
+> [Tremblay:child:(6) 0.000936] [Spawn/INFO] Pinged dad with 1234, he answered with 4321; leaving now.
+> [Tremblay:child:(6) 0.000936] [gras/INFO] Exiting GRAS
+> [Tremblay:father:(1) 0.001092] [Spawn/INFO] Answered to Tremblay:4003's request
+> [Tremblay:father:(1) 0.001092] [Spawn/INFO] Kid Tremblay:4004 pinged me with 1234
+> [Tremblay:child:(3) 0.001092] [Spawn/INFO] Pinged dad with 1234, he answered with 4321; leaving now.
+> [Tremblay:child:(3) 0.001092] [gras/INFO] Exiting GRAS
+> [Tremblay:father:(1) 0.001248] [Spawn/INFO] Answered to Tremblay:4004's request
+> [Tremblay:father:(1) 0.001248] [Spawn/INFO] Kid Tremblay:4005 pinged me with 1234
+> [Tremblay:child:(4) 0.001248] [Spawn/INFO] Pinged dad with 1234, he answered with 4321; leaving now.
+> [Tremblay:child:(4) 0.001248] [gras/INFO] Exiting GRAS
+> [Tremblay:father:(1) 0.001404] [Spawn/INFO] Answered to Tremblay:4005's request
+> [Tremblay:father:(1) 0.001404] [Spawn/INFO] All kids gone. Leave now.
+> [Tremblay:father:(1) 0.001404] [gras/INFO] Exiting GRAS
+> [Tremblay:child:(5) 0.001404] [Spawn/INFO] Pinged dad with 1234, he answered with 4321; leaving now.
+> [Tremblay:child:(5) 0.001404] [gras/INFO] Exiting GRAS
+
 

diff --git a/examples/msg/tracing/categories.tesh b/examples/msg/tracing/categories.tesh
index 0a6640a..ffc6016 100644 (file)
--- a/examples/msg/tracing/categories.tesh
+++ b/examples/msg/tracing/categories.tesh
@@ -3,9 +3,9 @@
 p Tracing multiple categories master/slave application
 
 $ $SG_TEST_EXENV tracing/categories$EXEEXT ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/deployment.xml
-> [0.000000] [msg_test/INFO] Simulation time 4.01888
+> [4.018878] [msg_test/INFO] Simulation time 4.01888
 
-$ $SG_TEST_EXENV cat$EXEEXT ${srcdir:=.}/tracing/categories.trace
+$ $SG_TEST_EXENV cat$EXEEXT ${srcdir:=.}/tracing/../categories.trace
 > %EventDef PajeDefineContainerType 0 
 > %       Alias string 
 > %       ContainerType string 

diff --git a/examples/msg/tracing/ms.tesh b/examples/msg/tracing/ms.tesh
index 5d125eb..75e2144 100644 (file)
--- a/examples/msg/tracing/ms.tesh
+++ b/examples/msg/tracing/ms.tesh
@@ -3,9 +3,9 @@
 p Tracing master/slave application
 
 $ $SG_TEST_EXENV tracing/ms$EXEEXT ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/deployment.xml
-> [0.000000] [msg_test/INFO] Simulation time 4.4416
+> [4.441598] [msg_test/INFO] Simulation time 4.4416
 
-$ $SG_TEST_EXENV cat$EXEEXT ${srcdir:=.}/tracing/simulation.trace
+$ $SG_TEST_EXENV cat$EXEEXT ${srcdir:=.}/tracing/../simulation.trace
 > %EventDef PajeDefineContainerType 0 
 > %       Alias string 
 > %       ContainerType string 

diff --git a/examples/smpi/bcast.tesh b/examples/smpi/bcast.tesh
index 4a5ebe4..7356cee 100644 (file)
--- a/examples/smpi/bcast.tesh
+++ b/examples/smpi/bcast.tesh
@@ -8,9 +8,9 @@ $ ../../src/smpi/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir
 > [rank 0] -> Tremblay
 > [rank 1] -> Jupiter
 > [rank 2] -> Fafard
-> node 0 has value 17 before broadcast
 > node 1 has value 3 before broadcast
 > node 2 has value 3 before broadcast
+> node 0 has value 17 before broadcast
 > node 1 has value 17 after broadcast
 > node 2 has value 17 after broadcast
 > node 0 has value 17 after broadcast
@@ -27,12 +27,12 @@ $ ../../src/smpi/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir
 > [rank 3] -> Ginette
 > [rank 4] -> Bourassa
 > [rank 5] -> Tremblay
-> node 0 has value 17 before broadcast
 > node 1 has value 3 before broadcast
 > node 2 has value 3 before broadcast
 > node 3 has value 3 before broadcast
 > node 4 has value 3 before broadcast
 > node 5 has value 3 before broadcast
+> node 0 has value 17 before broadcast
 > node 3 has value 17 after broadcast
 > node 4 has value 17 after broadcast
 > node 2 has value 17 after broadcast
@@ -57,7 +57,6 @@ $ ../../src/smpi/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir
 > [rank 9] -> Bourassa
 > [rank 10] -> Tremblay
 > [rank 11] -> Jupiter
-> node 0 has value 17 before broadcast
 > node 1 has value 3 before broadcast
 > node 2 has value 3 before broadcast
 > node 3 has value 3 before broadcast
@@ -69,6 +68,7 @@ $ ../../src/smpi/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir
 > node 9 has value 3 before broadcast
 > node 10 has value 3 before broadcast
 > node 11 has value 3 before broadcast
+> node 0 has value 17 before broadcast
 > node 3 has value 17 after broadcast
 > node 6 has value 17 after broadcast
 > node 4 has value 17 after broadcast

diff --git a/examples/smpi/reduce.tesh b/examples/smpi/reduce.tesh
index 2f2145d..5d3aa69 100644 (file)
--- a/examples/smpi/reduce.tesh
+++ b/examples/smpi/reduce.tesh
@@ -8,9 +8,9 @@ $ ../../src/smpi/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir
 > [rank 0] -> Tremblay
 > [rank 1] -> Jupiter
 > [rank 2] -> Fafard
-> [0] has value 1
 > [1] has value 2
 > [2] has value 3
+> [0] has value 1
 > ** Scalar Int Test Result:
 >      [0] sum=6 ... validation ok.
 >      [0] min=1 ... validation ok.
@@ -30,12 +30,12 @@ $ ../../src/smpi/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir
 > [rank 3] -> Ginette
 > [rank 4] -> Bourassa
 > [rank 5] -> Tremblay
-> [0] has value 1
 > [1] has value 2
 > [2] has value 3
 > [3] has value 4
 > [4] has value 5
 > [5] has value 6
+> [0] has value 1
 > ** Scalar Int Test Result:
 >      [0] sum=21 ... validation ok.
 >      [0] min=1 ... validation ok.
@@ -65,7 +65,6 @@ $ ../../src/smpi/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir
 > [rank 9] -> Bourassa
 > [rank 10] -> Tremblay
 > [rank 11] -> Jupiter
-> [0] has value 1
 > [1] has value 2
 > [2] has value 3
 > [3] has value 4
@@ -77,6 +76,7 @@ $ ../../src/smpi/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir
 > [9] has value 10
 > [10] has value 11
 > [11] has value 12
+> [0] has value 1
 > ** Scalar Int Test Result:
 >      [0] sum=78 ... validation ok.
 >      [0] min=1 ... validation ok.

diff --git a/teshsuite/gras/small_sleep/test_sg_32 b/teshsuite/gras/small_sleep/test_sg_32
index 1e35fb3..c5c4d55 100755 (executable)
--- a/teshsuite/gras/small_sleep/test_sg_32
+++ b/teshsuite/gras/small_sleep/test_sg_32
@@ -1,9 +1,9 @@
 p Runs the 'small_sleep' test within the simulator
 
 $ $SG_TEST_EXENV ./gras/small_sleep/small_sleep_simulator${EXEEXT:=} ${srcdir:=.}/../examples/msg/small_platform.xml ${srcdir:=.}/gras/small_sleep/small_sleep.xml
-> [Tremblay:function:(1) 0.000000] [test/INFO] Let's go 1E-5
-> [Tremblay:function:(1) 0.000010] [test/INFO] Let's go 1E-10
-> [Tremblay:function:(1) 0.000020] [test/INFO] Let's go 1E-15
-> [Tremblay:function:(1) 0.000030] [test/INFO] Let's go 1E-20
-> [Tremblay:function:(1) 0.000030] [test/INFO] done
-> [Tremblay:function:(1) 0.000030] [gras/INFO] Exiting GRAS
+> [Tremblay:function:(1) 100.000000] [test/INFO] Let's go 1E-5
+> [Tremblay:function:(1) 100.000010] [test/INFO] Let's go 1E-10
+> [Tremblay:function:(1) 100.000020] [test/INFO] Let's go 1E-15
+> [Tremblay:function:(1) 100.000020] [test/INFO] Let's go 1E-20
+> [Tremblay:function:(1) 100.000020] [test/INFO] done
+> [Tremblay:function:(1) 100.000020] [gras/INFO] Exiting GRAS

diff --git a/teshsuite/gras/small_sleep/test_sg_64 b/teshsuite/gras/small_sleep/test_sg_64
index e62d782..f7c3169 100755 (executable)
--- a/teshsuite/gras/small_sleep/test_sg_64
+++ b/teshsuite/gras/small_sleep/test_sg_64
@@ -1,9 +1,9 @@
 p Runs the 'empty_main' test within the simulator
 
 $ $SG_TEST_EXENV ./gras/small_sleep/small_sleep_simulator${EXEEXT:=} ${srcdir:=.}/../examples/msg/small_platform.xml ${srcdir:=.}/gras/small_sleep/small_sleep.xml
-> [Tremblay:function:(1) 0.000000] [test/INFO] Let's go 1E-5
-> [Tremblay:function:(1) 0.000010] [test/INFO] Let's go 1E-10
-> [Tremblay:function:(1) 0.000020] [test/INFO] Let's go 1E-15
-> [Tremblay:function:(1) 0.000020] [test/INFO] Let's go 1E-20
-> [Tremblay:function:(1) 0.000020] [test/INFO] done
-> [Tremblay:function:(1) 0.000020] [gras/INFO] Exiting GRAS
+> [Tremblay:function:(1) 100.000000] [test/INFO] Let's go 1E-5
+> [Tremblay:function:(1) 100.000010] [test/INFO] Let's go 1E-10
+> [Tremblay:function:(1) 100.000020] [test/INFO] Let's go 1E-15
+> [Tremblay:function:(1) 100.000020] [test/INFO] Let's go 1E-20
+> [Tremblay:function:(1) 100.000020] [test/INFO] done
+> [Tremblay:function:(1) 100.000020] [gras/INFO] Exiting GRAS

diff --git a/teshsuite/msg/CMakeLists.txt b/teshsuite/msg/CMakeLists.txt
index 637a256..39bbf50 100644 (file)
--- a/teshsuite/msg/CMakeLists.txt
+++ b/teshsuite/msg/CMakeLists.txt
@@ -1,9 +1,8 @@
 cmake_minimum_required(VERSION 2.6)
 
-set(EXECUTABLE_OUTPUT_PATH "./")
-set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
+set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/teshsuite/msg/")      
 
-add_executable(get_sender get_sender.c)
+add_executable(get_sender ${PROJECT_DIRECTORY}/teshsuite/msg/get_sender.c)
 
 ### Add definitions for compile
 target_link_libraries(get_sender simgrid m pthread -fprofile-arcs)