merge conflict resolved

[simgrid.git] / examples / msg / masterslave / masterslave_failure_crosstraffic.tesh

diff --git a/examples/msg/masterslave/masterslave_failure_crosstraffic.tesh b/examples/msg/masterslave/masterslave_failure_crosstraffic.tesh
index c753c3c..b445d6b 100644 (file)
--- a/examples/msg/masterslave/masterslave_failure_crosstraffic.tesh
+++ b/examples/msg/masterslave/masterslave_failure_crosstraffic.tesh
@@ -11,84 +11,84 @@ $ masterslave/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_l
 > [  0.000000] (1:master@Tremblay) Bourassa
 > [  0.000000] (1:master@Tremblay) Tremblay
 > [  0.000000] (1:master@Tremblay) Got 20 task to process :
-> [  0.173500] (3:slave@Jupiter) Received "Task"
-> [  0.173500] (3:slave@Jupiter) Communication time : "0.173500"
-> [  0.173500] (3:slave@Jupiter) Processing "Task"
-> [  0.173500] (1:master@Tremblay) Send completed
-> [  0.828842] (3:slave@Jupiter) "Task" done
+> [  0.169155] (3:slave@Jupiter) Received "Task"
+> [  0.169155] (3:slave@Jupiter) Communication time : "0.169155"
+> [  0.169155] (3:slave@Jupiter) Processing "Task"
+> [  0.169155] (1:master@Tremblay) Send completed
+> [  0.824497] (3:slave@Jupiter) "Task" done
 > [  1.100000] (3:slave@Jupiter) Gloups. The cpu on which I'm running just turned off!. See you!
-> [ 10.173500] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
-> [ 10.313960] (4:slave@Ginette) Received "Task"
-> [ 10.313960] (4:slave@Ginette) Communication time : "0.140460"
-> [ 10.313960] (4:slave@Ginette) Processing "Task"
-> [ 10.313960] (1:master@Tremblay) Send completed
-> [ 10.529832] (5:slave@Bourassa) Received "Task"
-> [ 10.529832] (5:slave@Bourassa) Communication time : "0.215872"
-> [ 10.529832] (5:slave@Bourassa) Processing "Task"
-> [ 10.529832] (1:master@Tremblay) Send completed
-> [ 10.532280] (2:slave@Tremblay) Received "Task"
-> [ 10.532280] (2:slave@Tremblay) Communication time : "0.002448"
-> [ 10.532280] (2:slave@Tremblay) Processing "Task"
-> [ 10.532280] (1:master@Tremblay) Send completed
-> [ 11.041990] (2:slave@Tremblay) "Task" done
-> [ 11.345057] (4:slave@Ginette) "Task" done
-> [ 11.560930] (5:slave@Bourassa) "Task" done
-> [ 20.532280] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Jupiter'. Nevermind. Let's keep going!
-> [ 30.532280] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
-> [ 30.532280] (4:slave@Ginette) Mmh. Something went wrong. Nevermind. Let's keep going!
-> [ 30.532280] (1:master@Tremblay) Mmh. Something went wrong with 'Ginette'. Nevermind. Let's keep going!
-> [ 30.748152] (5:slave@Bourassa) Received "Task"
-> [ 30.748152] (5:slave@Bourassa) Communication time : "0.215872"
-> [ 30.748152] (5:slave@Bourassa) Processing "Task"
-> [ 30.748152] (1:master@Tremblay) Send completed
-> [ 30.750600] (2:slave@Tremblay) Received "Task"
-> [ 30.750600] (2:slave@Tremblay) Communication time : "0.002448"
-> [ 30.750600] (2:slave@Tremblay) Processing "Task"
-> [ 30.750600] (1:master@Tremblay) Send completed
-> [ 31.260310] (2:slave@Tremblay) "Task" done
-> [ 31.779250] (5:slave@Bourassa) "Task" done
-> [ 40.750600] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Jupiter'. Nevermind. Let's keep going!
-> [ 50.750600] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
-> [ 50.891059] (4:slave@Ginette) Received "Task"
-> [ 50.891059] (4:slave@Ginette) Communication time : "0.140460"
-> [ 50.891059] (4:slave@Ginette) Processing "Task"
-> [ 50.891059] (1:master@Tremblay) Send completed
-> [ 51.106932] (5:slave@Bourassa) Received "Task"
-> [ 51.106932] (5:slave@Bourassa) Communication time : "0.215872"
-> [ 51.106932] (5:slave@Bourassa) Processing "Task"
-> [ 51.106932] (1:master@Tremblay) Send completed
-> [ 51.109379] (2:slave@Tremblay) Received "Task"
-> [ 51.109379] (2:slave@Tremblay) Communication time : "0.002448"
-> [ 51.109379] (2:slave@Tremblay) Processing "Task"
-> [ 51.109379] (1:master@Tremblay) Send completed
-> [ 51.619089] (2:slave@Tremblay) "Task" done
-> [ 51.922157] (4:slave@Ginette) "Task" done
-> [ 52.138029] (5:slave@Bourassa) "Task" done
-> [ 61.109379] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Jupiter'. Nevermind. Let's keep going!
-> [ 71.109379] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
-> [ 71.249839] (4:slave@Ginette) Received "Task"
-> [ 71.249839] (4:slave@Ginette) Communication time : "0.140460"
-> [ 71.249839] (4:slave@Ginette) Processing "Task"
-> [ 71.249839] (1:master@Tremblay) Send completed
-> [ 71.465711] (5:slave@Bourassa) Received "Task"
-> [ 71.465711] (5:slave@Bourassa) Communication time : "0.215872"
-> [ 71.465711] (5:slave@Bourassa) Processing "Task"
-> [ 71.465711] (1:master@Tremblay) Send completed
-> [ 71.468159] (2:slave@Tremblay) Received "Task"
-> [ 71.468159] (2:slave@Tremblay) Communication time : "0.002448"
-> [ 71.468159] (2:slave@Tremblay) Processing "Task"
-> [ 71.468159] (1:master@Tremblay) Send completed
-> [ 71.468159] (1:master@Tremblay) All tasks have been dispatched. Let's tell everybody the computation is over.
-> [ 71.977869] (2:slave@Tremblay) "Task" done
-> [ 72.280937] (4:slave@Ginette) "Task" done
-> [ 72.468159] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Jupiter'. Nevermind. Let's keep going!
-> [ 72.496809] (5:slave@Bourassa) "Task" done
-> [ 73.468159] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
-> [ 73.481391] (4:slave@Ginette) Received "finalize"
-> [ 73.481391] (4:slave@Ginette) I'm done. See you!
-> [ 73.501726] (5:slave@Bourassa) Received "finalize"
-> [ 73.501726] (5:slave@Bourassa) I'm done. See you!
-> [ 73.501882] (2:slave@Tremblay) Received "finalize"
-> [ 73.501882] (2:slave@Tremblay) I'm done. See you!
-> [ 73.501882] (1:master@Tremblay) Goodbye now!
-> [ 73.501882] (0:@) Simulation time 73.5019
+> [ 10.169155] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
+> [ 10.312935] (4:slave@Ginette) Received "Task"
+> [ 10.312935] (4:slave@Ginette) Communication time : "0.143780"
+> [ 10.312935] (4:slave@Ginette) Processing "Task"
+> [ 10.312935] (1:master@Tremblay) Send completed
+> [ 10.533911] (5:slave@Bourassa) Received "Task"
+> [ 10.533911] (5:slave@Bourassa) Communication time : "0.220976"
+> [ 10.533911] (5:slave@Bourassa) Processing "Task"
+> [ 10.533911] (1:master@Tremblay) Send completed
+> [ 10.536280] (2:slave@Tremblay) Received "Task"
+> [ 10.536280] (2:slave@Tremblay) Communication time : "0.002369"
+> [ 10.536280] (2:slave@Tremblay) Processing "Task"
+> [ 10.536280] (1:master@Tremblay) Send completed
+> [ 11.045989] (2:slave@Tremblay) "Task" done
+> [ 11.344033] (4:slave@Ginette) "Task" done
+> [ 11.565009] (5:slave@Bourassa) "Task" done
+> [ 20.536280] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Jupiter'. Nevermind. Let's keep going!
+> [ 30.536280] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
+> [ 30.536280] (4:slave@Ginette) Mmh. Something went wrong. Nevermind. Let's keep going!
+> [ 30.536280] (1:master@Tremblay) Mmh. Something went wrong with 'Ginette'. Nevermind. Let's keep going!
+> [ 30.757255] (5:slave@Bourassa) Received "Task"
+> [ 30.757255] (5:slave@Bourassa) Communication time : "0.220976"
+> [ 30.757255] (5:slave@Bourassa) Processing "Task"
+> [ 30.757255] (1:master@Tremblay) Send completed
+> [ 30.759624] (2:slave@Tremblay) Received "Task"
+> [ 30.759624] (2:slave@Tremblay) Communication time : "0.002369"
+> [ 30.759624] (2:slave@Tremblay) Processing "Task"
+> [ 30.759624] (1:master@Tremblay) Send completed
+> [ 31.269334] (2:slave@Tremblay) "Task" done
+> [ 31.788353] (5:slave@Bourassa) "Task" done
+> [ 40.759624] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Jupiter'. Nevermind. Let's keep going!
+> [ 50.759624] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
+> [ 50.903404] (4:slave@Ginette) Received "Task"
+> [ 50.903404] (4:slave@Ginette) Communication time : "0.143780"
+> [ 50.903404] (4:slave@Ginette) Processing "Task"
+> [ 50.903404] (1:master@Tremblay) Send completed
+> [ 51.124380] (5:slave@Bourassa) Received "Task"
+> [ 51.124380] (5:slave@Bourassa) Communication time : "0.220976"
+> [ 51.124380] (5:slave@Bourassa) Processing "Task"
+> [ 51.124380] (1:master@Tremblay) Send completed
+> [ 51.126749] (2:slave@Tremblay) Received "Task"
+> [ 51.126749] (2:slave@Tremblay) Communication time : "0.002369"
+> [ 51.126749] (2:slave@Tremblay) Processing "Task"
+> [ 51.126749] (1:master@Tremblay) Send completed
+> [ 51.636459] (2:slave@Tremblay) "Task" done
+> [ 51.934502] (4:slave@Ginette) "Task" done
+> [ 52.155478] (5:slave@Bourassa) "Task" done
+> [ 61.126749] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Jupiter'. Nevermind. Let's keep going!
+> [ 71.126749] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
+> [ 71.270529] (4:slave@Ginette) Received "Task"
+> [ 71.270529] (4:slave@Ginette) Communication time : "0.143780"
+> [ 71.270529] (4:slave@Ginette) Processing "Task"
+> [ 71.270529] (1:master@Tremblay) Send completed
+> [ 71.491505] (5:slave@Bourassa) Received "Task"
+> [ 71.491505] (5:slave@Bourassa) Communication time : "0.220976"
+> [ 71.491505] (5:slave@Bourassa) Processing "Task"
+> [ 71.491505] (1:master@Tremblay) Send completed
+> [ 71.493874] (2:slave@Tremblay) Received "Task"
+> [ 71.493874] (2:slave@Tremblay) Communication time : "0.002369"
+> [ 71.493874] (2:slave@Tremblay) Processing "Task"
+> [ 71.493874] (1:master@Tremblay) Send completed
+> [ 71.493874] (1:master@Tremblay) All tasks have been dispatched. Let's tell everybody the computation is over.
+> [ 72.003584] (2:slave@Tremblay) "Task" done
+> [ 72.301627] (4:slave@Ginette) "Task" done
+> [ 72.493874] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Jupiter'. Nevermind. Let's keep going!
+> [ 72.522603] (5:slave@Bourassa) "Task" done
+> [ 73.493874] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
+> [ 73.510426] (4:slave@Ginette) Received "finalize"
+> [ 73.510426] (4:slave@Ginette) I'm done. See you!
+> [ 73.535865] (5:slave@Bourassa) Received "finalize"
+> [ 73.535865] (5:slave@Bourassa) I'm done. See you!
+> [ 73.536061] (2:slave@Tremblay) Received "finalize"
+> [ 73.536061] (2:slave@Tremblay) I'm done. See you!
+> [ 73.536061] (1:master@Tremblay) Goodbye now!
+> [ 73.536061] (0:@) Simulation time 73.5361