Merge pull request #17 from mpoquet/master

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

diff --git a/examples/msg/masterslave/masterslave_cpu_ti_crosstraffic.tesh b/examples/msg/masterslave/masterslave_cpu_ti_crosstraffic.tesh
index 27ea53a..94063db 100644 (file)
--- a/examples/msg/masterslave/masterslave_cpu_ti_crosstraffic.tesh
+++ b/examples/msg/masterslave/masterslave_cpu_ti_crosstraffic.tesh
@@ -3,7 +3,7 @@
 p Testing a simple master/slave example application
 
 ! output sort
-$ $SG_TEST_EXENV ${bindir:=.}/masterslave_forwarder$EXEEXT small_platform.xml masterslave/deployment_masterslave.xml --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/masterslave_forwarder$EXEEXT ${srcdir:=.}/../platforms/small_platform.xml masterslave/deployment_masterslave.xml --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI'
 > [  0.000000] (1:master@Tremblay) Got 5 slaves and 20 tasks to process
 > [  0.000000] (1:master@Tremblay) Sending "Task_0" to "Jupiter"
@@ -128,7 +128,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/masterslave_forwarder$EXEEXT small_platform.xml ma
 p Testing a master/slave example application with a forwarder module
 
 ! output sort
-$ $SG_TEST_EXENV ${bindir:=.}/masterslave_forwarder$EXEEXT msg_platform.xml masterslave/deployment_masterslave_forwarder.xml --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/masterslave_forwarder$EXEEXT ${srcdir:=.}/../platforms/platform.xml masterslave/deployment_masterslave_forwarder.xml --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI'
 > [  0.000000] (1:master@Jacquelin) Got 5 slaves and 20 tasks to process
 > [  0.000000] (1:master@Jacquelin) Sending "Task_0" to "iRMX"
@@ -279,7 +279,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/masterslave_forwarder$EXEEXT msg_platform.xml mast
 p Testing a simple master/slave example application handling failures
 
 ! output sort
-$ ${bindir:=.}/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_loc small_platform_with_failures.xml masterslave/deployment_masterslave.xml --cfg=path:${srcdir} --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${bindir:=.}/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_loc ${srcdir:=.}/../platforms/small_platform_with_failures.xml masterslave/deployment_masterslave.xml --cfg=path:${srcdir} --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:@) Cannot launch process 'slave' on failed host 'Fafard'
 > [  0.000000] (1:master@Tremblay) Got 5 slave(s) :
 > [  0.000000] (1:master@Tremblay) Jupiter
@@ -290,6 +290,7 @@ $ ${bindir:=.}/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_
 > [  0.000000] (1:master@Tremblay) Got 20 task to process :
 > [  1.000000] (0:@) Restart processes on host: Fafard
 > [  1.000000] (1:master@Tremblay) Mmh. Something went wrong with 'Jupiter'. Nevermind. Let's keep going!
+> [  1.000000] (3:slave@Jupiter) Gloups. The cpu on which I'm running just turned off!. See you!
 > [  2.000000] (0:@) Restart processes on host: Jupiter
 > [ 11.000000] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [ 12.082474] (1:master@Tremblay) Send completed
@@ -409,105 +410,105 @@ $ $SG_TEST_EXENV ${bindir:=.}/masterslave_bypass --log=no_loc --cfg=cpu/optim:TI
 > [  0.000000] (2:slave@host B) I'm a slave
 > [  2.612825] (1:master@host A) Send completed
 > [  2.612825] (1:master@host A) Sending "Task_1" to "host B"
-> [  2.612825] (2:slave@host B) Received "Task_0" 
-> [  2.612825] (2:slave@host B) Processing "Task_0" 
-> [  2.662825] (2:slave@host B) "Task_0" done 
+> [  2.612825] (2:slave@host B) Received "Task_0"
+> [  2.612825] (2:slave@host B) Processing "Task_0"
+> [  2.662825] (2:slave@host B) "Task_0" done
 > [  5.275649] (1:master@host A) Send completed
 > [  5.275649] (1:master@host A) Sending "Task_2" to "host B"
-> [  5.275649] (2:slave@host B) Received "Task_1" 
-> [  5.275649] (2:slave@host B) Processing "Task_1" 
-> [  5.325649] (2:slave@host B) "Task_1" done 
+> [  5.275649] (2:slave@host B) Received "Task_1"
+> [  5.275649] (2:slave@host B) Processing "Task_1"
+> [  5.325649] (2:slave@host B) "Task_1" done
 > [  7.938474] (1:master@host A) Send completed
 > [  7.938474] (1:master@host A) Sending "Task_3" to "host B"
-> [  7.938474] (2:slave@host B) Received "Task_2" 
-> [  7.938474] (2:slave@host B) Processing "Task_2" 
-> [  7.988474] (2:slave@host B) "Task_2" done 
+> [  7.938474] (2:slave@host B) Received "Task_2"
+> [  7.938474] (2:slave@host B) Processing "Task_2"
+> [  7.988474] (2:slave@host B) "Task_2" done
 > [ 10.601299] (1:master@host A) Send completed
 > [ 10.601299] (1:master@host A) Sending "Task_4" to "host B"
-> [ 10.601299] (2:slave@host B) Received "Task_3" 
-> [ 10.601299] (2:slave@host B) Processing "Task_3" 
-> [ 10.651299] (2:slave@host B) "Task_3" done 
+> [ 10.601299] (2:slave@host B) Received "Task_3"
+> [ 10.601299] (2:slave@host B) Processing "Task_3"
+> [ 10.651299] (2:slave@host B) "Task_3" done
 > [ 13.264124] (1:master@host A) Send completed
 > [ 13.264124] (1:master@host A) Sending "Task_5" to "host B"
-> [ 13.264124] (2:slave@host B) Received "Task_4" 
-> [ 13.264124] (2:slave@host B) Processing "Task_4" 
-> [ 13.314124] (2:slave@host B) "Task_4" done 
+> [ 13.264124] (2:slave@host B) Received "Task_4"
+> [ 13.264124] (2:slave@host B) Processing "Task_4"
+> [ 13.314124] (2:slave@host B) "Task_4" done
 > [ 15.926948] (1:master@host A) Send completed
 > [ 15.926948] (1:master@host A) Sending "Task_6" to "host B"
-> [ 15.926948] (2:slave@host B) Received "Task_5" 
-> [ 15.926948] (2:slave@host B) Processing "Task_5" 
-> [ 15.976948] (2:slave@host B) "Task_5" done 
+> [ 15.926948] (2:slave@host B) Received "Task_5"
+> [ 15.926948] (2:slave@host B) Processing "Task_5"
+> [ 15.976948] (2:slave@host B) "Task_5" done
 > [ 18.589773] (1:master@host A) Send completed
 > [ 18.589773] (1:master@host A) Sending "Task_7" to "host B"
-> [ 18.589773] (2:slave@host B) Received "Task_6" 
-> [ 18.589773] (2:slave@host B) Processing "Task_6" 
-> [ 18.639773] (2:slave@host B) "Task_6" done 
+> [ 18.589773] (2:slave@host B) Received "Task_6"
+> [ 18.589773] (2:slave@host B) Processing "Task_6"
+> [ 18.639773] (2:slave@host B) "Task_6" done
 > [ 21.252598] (1:master@host A) Send completed
 > [ 21.252598] (1:master@host A) Sending "Task_8" to "host B"
-> [ 21.252598] (2:slave@host B) Received "Task_7" 
-> [ 21.252598] (2:slave@host B) Processing "Task_7" 
-> [ 21.302598] (2:slave@host B) "Task_7" done 
+> [ 21.252598] (2:slave@host B) Received "Task_7"
+> [ 21.252598] (2:slave@host B) Processing "Task_7"
+> [ 21.302598] (2:slave@host B) "Task_7" done
 > [ 23.915423] (1:master@host A) Send completed
 > [ 23.915423] (1:master@host A) Sending "Task_9" to "host B"
-> [ 23.915423] (2:slave@host B) Received "Task_8" 
-> [ 23.915423] (2:slave@host B) Processing "Task_8" 
-> [ 23.965423] (2:slave@host B) "Task_8" done 
+> [ 23.915423] (2:slave@host B) Received "Task_8"
+> [ 23.915423] (2:slave@host B) Processing "Task_8"
+> [ 23.965423] (2:slave@host B) "Task_8" done
 > [ 26.578247] (1:master@host A) Send completed
 > [ 26.578247] (1:master@host A) Sending "Task_10" to "host B"
-> [ 26.578247] (2:slave@host B) Received "Task_9" 
-> [ 26.578247] (2:slave@host B) Processing "Task_9" 
-> [ 26.628247] (2:slave@host B) "Task_9" done 
+> [ 26.578247] (2:slave@host B) Received "Task_9"
+> [ 26.578247] (2:slave@host B) Processing "Task_9"
+> [ 26.628247] (2:slave@host B) "Task_9" done
 > [ 29.241072] (1:master@host A) Send completed
 > [ 29.241072] (1:master@host A) Sending "Task_11" to "host B"
-> [ 29.241072] (2:slave@host B) Received "Task_10" 
-> [ 29.241072] (2:slave@host B) Processing "Task_10" 
-> [ 29.291072] (2:slave@host B) "Task_10" done 
+> [ 29.241072] (2:slave@host B) Received "Task_10"
+> [ 29.241072] (2:slave@host B) Processing "Task_10"
+> [ 29.291072] (2:slave@host B) "Task_10" done
 > [ 31.903897] (1:master@host A) Send completed
 > [ 31.903897] (1:master@host A) Sending "Task_12" to "host B"
-> [ 31.903897] (2:slave@host B) Received "Task_11" 
-> [ 31.903897] (2:slave@host B) Processing "Task_11" 
-> [ 31.953897] (2:slave@host B) "Task_11" done 
+> [ 31.903897] (2:slave@host B) Received "Task_11"
+> [ 31.903897] (2:slave@host B) Processing "Task_11"
+> [ 31.953897] (2:slave@host B) "Task_11" done
 > [ 34.566722] (1:master@host A) Send completed
 > [ 34.566722] (1:master@host A) Sending "Task_13" to "host B"
-> [ 34.566722] (2:slave@host B) Received "Task_12" 
-> [ 34.566722] (2:slave@host B) Processing "Task_12" 
-> [ 34.616722] (2:slave@host B) "Task_12" done 
+> [ 34.566722] (2:slave@host B) Received "Task_12"
+> [ 34.566722] (2:slave@host B) Processing "Task_12"
+> [ 34.616722] (2:slave@host B) "Task_12" done
 > [ 37.229546] (1:master@host A) Send completed
 > [ 37.229546] (1:master@host A) Sending "Task_14" to "host B"
-> [ 37.229546] (2:slave@host B) Received "Task_13" 
-> [ 37.229546] (2:slave@host B) Processing "Task_13" 
-> [ 37.279546] (2:slave@host B) "Task_13" done 
+> [ 37.229546] (2:slave@host B) Received "Task_13"
+> [ 37.229546] (2:slave@host B) Processing "Task_13"
+> [ 37.279546] (2:slave@host B) "Task_13" done
 > [ 39.892371] (1:master@host A) Send completed
 > [ 39.892371] (1:master@host A) Sending "Task_15" to "host B"
-> [ 39.892371] (2:slave@host B) Received "Task_14" 
-> [ 39.892371] (2:slave@host B) Processing "Task_14" 
-> [ 39.942371] (2:slave@host B) "Task_14" done 
+> [ 39.892371] (2:slave@host B) Received "Task_14"
+> [ 39.892371] (2:slave@host B) Processing "Task_14"
+> [ 39.942371] (2:slave@host B) "Task_14" done
 > [ 42.555196] (1:master@host A) Send completed
 > [ 42.555196] (1:master@host A) Sending "Task_16" to "host B"
-> [ 42.555196] (2:slave@host B) Received "Task_15" 
-> [ 42.555196] (2:slave@host B) Processing "Task_15" 
-> [ 42.605196] (2:slave@host B) "Task_15" done 
+> [ 42.555196] (2:slave@host B) Received "Task_15"
+> [ 42.555196] (2:slave@host B) Processing "Task_15"
+> [ 42.605196] (2:slave@host B) "Task_15" done
 > [ 45.218021] (1:master@host A) Send completed
 > [ 45.218021] (1:master@host A) Sending "Task_17" to "host B"
-> [ 45.218021] (2:slave@host B) Received "Task_16" 
-> [ 45.218021] (2:slave@host B) Processing "Task_16" 
-> [ 45.268021] (2:slave@host B) "Task_16" done 
+> [ 45.218021] (2:slave@host B) Received "Task_16"
+> [ 45.218021] (2:slave@host B) Processing "Task_16"
+> [ 45.268021] (2:slave@host B) "Task_16" done
 > [ 47.880845] (1:master@host A) Send completed
 > [ 47.880845] (1:master@host A) Sending "Task_18" to "host B"
-> [ 47.880845] (2:slave@host B) Received "Task_17" 
-> [ 47.880845] (2:slave@host B) Processing "Task_17" 
-> [ 47.930845] (2:slave@host B) "Task_17" done 
+> [ 47.880845] (2:slave@host B) Received "Task_17"
+> [ 47.880845] (2:slave@host B) Processing "Task_17"
+> [ 47.930845] (2:slave@host B) "Task_17" done
 > [ 50.543670] (1:master@host A) Send completed
 > [ 50.543670] (1:master@host A) Sending "Task_19" to "host B"
-> [ 50.543670] (2:slave@host B) Received "Task_18" 
-> [ 50.543670] (2:slave@host B) Processing "Task_18" 
-> [ 50.593670] (2:slave@host B) "Task_18" done 
+> [ 50.543670] (2:slave@host B) Received "Task_18"
+> [ 50.543670] (2:slave@host B) Processing "Task_18"
+> [ 50.593670] (2:slave@host B) "Task_18" done
 > [ 53.206495] (1:master@host A) Send completed
 > [ 53.206495] (1:master@host A) All tasks have been dispatched. Let's tell everybody the computation is over.
-> [ 53.206495] (2:slave@host B) Received "Task_19" 
-> [ 53.206495] (2:slave@host B) Processing "Task_19" 
-> [ 53.256495] (2:slave@host B) "Task_19" done 
+> [ 53.206495] (2:slave@host B) Received "Task_19"
+> [ 53.206495] (2:slave@host B) Processing "Task_19"
+> [ 53.256495] (2:slave@host B) "Task_19" done
 > [ 55.858495] (0:@) Simulation time 55.8585
 > [ 55.858495] (1:master@host A) Goodbye now!
-> [ 55.858495] (2:slave@host B) Received "finalize" 
+> [ 55.858495] (2:slave@host B) Received "finalize"
 > [ 55.858495] (2:slave@host B) I'm done. See you!