From: Frederic Suter Date: Sun, 10 Apr 2016 13:35:57 +0000 (+0200) Subject: have uniform log format for the same example X-Git-Tag: v3_13~108 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/ce667fedd3c9c67a4d7c10d658746a45303b7724?ds=sidebyside have uniform log format for the same example --- diff --git a/examples/msg/app-masterworker/app-masterworker-multicore.tesh b/examples/msg/app-masterworker/app-masterworker-multicore.tesh index cce44fe1a9..9f3472bc21 100644 --- a/examples/msg/app-masterworker/app-masterworker-multicore.tesh +++ b/examples/msg/app-masterworker/app-masterworker-multicore.tesh @@ -2,35 +2,35 @@ p Testing a simple master/worker example application -$ $SG_TEST_EXENV ./app-masterworker/app-masterworker ${srcdir:=.}/../platforms/multicore_machine.xml ${srcdir:=.}/app-masterworker/app-masterworker-multicore_d.xml --cfg=cpu/model:Cas01 --cfg=cpu/optim:Full -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/optim' to 'Full' -> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Got 6 workers and 20 tasks to process -> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Sending "Task_0" (of 20) to mailbox "worker-0" -> [Tremblay:master:(1) 0.002203] [msg_test/INFO] Sending "Task_1" (of 20) to mailbox "worker-1" -> [Tremblay:master:(1) 0.004406] [msg_test/INFO] Sending "Task_2" (of 20) to mailbox "worker-2" -> [Tremblay:master:(1) 0.006610] [msg_test/INFO] Sending "Task_3" (of 20) to mailbox "worker-3" -> [Tremblay:master:(1) 0.008813] [msg_test/INFO] Sending "Task_4" (of 20) to mailbox "worker-4" -> [Tremblay:master:(1) 0.011016] [msg_test/INFO] Sending "Task_5" (of 20) to mailbox "worker-5" -> [Tremblay:master:(1) 0.013219] [msg_test/INFO] Sending "Task_6" (of 20) to mailbox "worker-0" -> [Tremblay:master:(1) 0.514116] [msg_test/INFO] Sending "Task_7" (of 20) to mailbox "worker-1" -> [Tremblay:master:(1) 0.516320] [msg_test/INFO] Sending "Task_8" (of 20) to mailbox "worker-2" -> [Tremblay:master:(1) 0.518523] [msg_test/INFO] Sending "Task_9" (of 20) to mailbox "worker-3" -> [Tremblay:master:(1) 0.520726] [msg_test/INFO] Sending "Task_10" (of 20) to mailbox "worker-4" -> [Tremblay:master:(1) 0.522929] [msg_test/INFO] Sending "Task_11" (of 20) to mailbox "worker-5" -> [Tremblay:master:(1) 0.525132] [msg_test/INFO] Sending "Task_12" (of 20) to mailbox "worker-0" -> [Tremblay:master:(1) 1.026029] [msg_test/INFO] Sending "Task_13" (of 20) to mailbox "worker-1" -> [Tremblay:master:(1) 1.028233] [msg_test/INFO] Sending "Task_14" (of 20) to mailbox "worker-2" -> [Tremblay:master:(1) 1.030436] [msg_test/INFO] Sending "Task_15" (of 20) to mailbox "worker-3" -> [Tremblay:master:(1) 1.032639] [msg_test/INFO] Sending "Task_16" (of 20) to mailbox "worker-4" -> [Tremblay:master:(1) 1.034842] [msg_test/INFO] Sending "Task_17" (of 20) to mailbox "worker-5" -> [Tremblay:master:(1) 1.037045] [msg_test/INFO] Sending "Task_18" (of 20) to mailbox "worker-0" -> [Tremblay:master:(1) 1.537943] [msg_test/INFO] Sending "Task_19" (of 20) to mailbox "worker-1" -> [Tremblay:master:(1) 1.540146] [msg_test/INFO] All tasks have been dispatched. Let's tell everybody the computation is over. -> [Tremblay:worker:(2) 2.047848] [msg_test/INFO] I'm done. See you! -> [Tremblay:worker:(3) 2.050051] [msg_test/INFO] I'm done. See you! -> [Tremblay:worker:(4) 2.050246] [msg_test/INFO] I'm done. See you! -> [Tremblay:worker:(5) 2.050441] [msg_test/INFO] I'm done. See you! -> [Tremblay:worker:(6) 2.050636] [msg_test/INFO] I'm done. See you! -> [Tremblay:worker:(7) 2.050832] [msg_test/INFO] I'm done. See you! -> [2.050832] [msg_test/INFO] Simulation time 2.05083 \ No newline at end of file +$ $SG_TEST_EXENV ./app-masterworker/app-masterworker ${srcdir:=.}/../platforms/multicore_machine.xml ${srcdir:=.}/app-masterworker/app-masterworker-multicore_d.xml --cfg=cpu/model:Cas01 --cfg=cpu/optim:Full "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +> [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01' +> [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'Full' +> [ 0.000000] (1:master@Tremblay) Got 6 workers and 20 tasks to process +> [ 0.000000] (1:master@Tremblay) Sending "Task_0" (of 20) to mailbox "worker-0" +> [ 0.002203] (1:master@Tremblay) Sending "Task_1" (of 20) to mailbox "worker-1" +> [ 0.004406] (1:master@Tremblay) Sending "Task_2" (of 20) to mailbox "worker-2" +> [ 0.006610] (1:master@Tremblay) Sending "Task_3" (of 20) to mailbox "worker-3" +> [ 0.008813] (1:master@Tremblay) Sending "Task_4" (of 20) to mailbox "worker-4" +> [ 0.011016] (1:master@Tremblay) Sending "Task_5" (of 20) to mailbox "worker-5" +> [ 0.013219] (1:master@Tremblay) Sending "Task_6" (of 20) to mailbox "worker-0" +> [ 0.514116] (1:master@Tremblay) Sending "Task_7" (of 20) to mailbox "worker-1" +> [ 0.516320] (1:master@Tremblay) Sending "Task_8" (of 20) to mailbox "worker-2" +> [ 0.518523] (1:master@Tremblay) Sending "Task_9" (of 20) to mailbox "worker-3" +> [ 0.520726] (1:master@Tremblay) Sending "Task_10" (of 20) to mailbox "worker-4" +> [ 0.522929] (1:master@Tremblay) Sending "Task_11" (of 20) to mailbox "worker-5" +> [ 0.525132] (1:master@Tremblay) Sending "Task_12" (of 20) to mailbox "worker-0" +> [ 1.026029] (1:master@Tremblay) Sending "Task_13" (of 20) to mailbox "worker-1" +> [ 1.028233] (1:master@Tremblay) Sending "Task_14" (of 20) to mailbox "worker-2" +> [ 1.030436] (1:master@Tremblay) Sending "Task_15" (of 20) to mailbox "worker-3" +> [ 1.032639] (1:master@Tremblay) Sending "Task_16" (of 20) to mailbox "worker-4" +> [ 1.034842] (1:master@Tremblay) Sending "Task_17" (of 20) to mailbox "worker-5" +> [ 1.037045] (1:master@Tremblay) Sending "Task_18" (of 20) to mailbox "worker-0" +> [ 1.537943] (1:master@Tremblay) Sending "Task_19" (of 20) to mailbox "worker-1" +> [ 1.540146] (1:master@Tremblay) All tasks have been dispatched. Let's tell everybody the computation is over. +> [ 2.047848] (2:worker@Tremblay) I'm done. See you! +> [ 2.050051] (3:worker@Tremblay) I'm done. See you! +> [ 2.050246] (4:worker@Tremblay) I'm done. See you! +> [ 2.050441] (5:worker@Tremblay) I'm done. See you! +> [ 2.050636] (6:worker@Tremblay) I'm done. See you! +> [ 2.050832] (7:worker@Tremblay) I'm done. See you! +> [ 2.050832] (0:maestro@) Simulation time 2.05083 diff --git a/examples/msg/app-masterworker/app-masterworker-vivaldi.tesh b/examples/msg/app-masterworker/app-masterworker-vivaldi.tesh index 645e6e8656..f051d982b0 100644 --- a/examples/msg/app-masterworker/app-masterworker-vivaldi.tesh +++ b/examples/msg/app-masterworker/app-masterworker-vivaldi.tesh @@ -2,35 +2,35 @@ p Testing a simple master/worker example application -$ $SG_TEST_EXENV ./app-masterworker/app-masterworker ${srcdir:=.}/../platforms/vivaldi.xml ${srcdir:=.}/app-masterworker/app-masterworker-vivaldi_d.xml --cfg=network/latency_factor:1.0 --cfg=network/bandwidth_factor:1.0 -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/latency_factor' to '1.0' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/bandwidth_factor' to '1.0' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/coordinates' to 'yes' -> [100030591:master:(1) 0.000000] [msg_test/INFO] Got 15 workers and 10 tasks to process -> [100030591:master:(1) 0.000000] [msg_test/INFO] Sending "Task_0" (of 10) to mailbox "worker-0" -> [100030591:master:(1) 0.046299] [msg_test/INFO] Sending "Task_1" (of 10) to mailbox "worker-1" -> [100030591:master:(1) 0.103602] [msg_test/INFO] Sending "Task_2" (of 10) to mailbox "worker-2" -> [100030591:master:(1) 0.126922] [msg_test/INFO] Sending "Task_3" (of 10) to mailbox "worker-3" -> [100030591:master:(1) 0.167282] [msg_test/INFO] Sending "Task_4" (of 10) to mailbox "worker-4" -> [100030591:master:(1) 0.174710] [msg_test/INFO] Sending "Task_5" (of 10) to mailbox "worker-5" -> [100030591:master:(1) 0.307173] [msg_test/INFO] Sending "Task_6" (of 10) to mailbox "worker-6" -> [100030591:master:(1) 0.370794] [msg_test/INFO] Sending "Task_7" (of 10) to mailbox "worker-7" -> [100030591:master:(1) 0.413207] [msg_test/INFO] Sending "Task_8" (of 10) to mailbox "worker-8" -> [100030591:master:(1) 0.452277] [msg_test/INFO] Sending "Task_9" (of 10) to mailbox "worker-9" -> [100030591:master:(1) 0.487205] [msg_test/INFO] All tasks have been dispatched. Let's tell everybody the computation is over. -> [100036570:worker:(2) 0.533504] [msg_test/INFO] I'm done. See you! -> [100041334:worker:(3) 0.590807] [msg_test/INFO] I'm done. See you! -> [100055671:worker:(4) 0.614127] [msg_test/INFO] I'm done. See you! -> [100066658:worker:(5) 0.654487] [msg_test/INFO] I'm done. See you! -> [100090691:worker:(6) 0.661915] [msg_test/INFO] I'm done. See you! -> [100094952:worker:(7) 0.794379] [msg_test/INFO] I'm done. See you! -> [100117943:worker:(8) 0.858000] [msg_test/INFO] I'm done. See you! -> [100126290:worker:(9) 0.900412] [msg_test/INFO] I'm done. See you! -> [100144483:worker:(10) 0.939482] [msg_test/INFO] I'm done. See you! -> [100152889:worker:(11) 0.974410] [msg_test/INFO] I'm done. See you! -> [100178474:worker:(12) 0.990540] [msg_test/INFO] I'm done. See you! -> [100180261:worker:(13) 1.011253] [msg_test/INFO] I'm done. See you! -> [100185883:worker:(14) 1.051440] [msg_test/INFO] I'm done. See you! -> [100186365:worker:(15) 1.268843] [msg_test/INFO] I'm done. See you! -> [100200866:worker:(16) 1.336272] [msg_test/INFO] I'm done. See you! -> [1.336272] [msg_test/INFO] Simulation time 1.33627 +$ $SG_TEST_EXENV ./app-masterworker/app-masterworker ${srcdir:=.}/../platforms/vivaldi.xml ${srcdir:=.}/app-masterworker/app-masterworker-vivaldi_d.xml --cfg=network/latency_factor:1.0 --cfg=network/bandwidth_factor:1.0 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +> [ 0.000000] (0:maestro@) Configuration change: Set 'network/latency_factor' to '1.0' +> [ 0.000000] (0:maestro@) Configuration change: Set 'network/bandwidth_factor' to '1.0' +> [ 0.000000] (0:maestro@) Configuration change: Set 'network/coordinates' to 'yes' +> [ 0.000000] (1:master@100030591) Got 15 workers and 10 tasks to process +> [ 0.000000] (1:master@100030591) Sending "Task_0" (of 10) to mailbox "worker-0" +> [ 0.046299] (1:master@100030591) Sending "Task_1" (of 10) to mailbox "worker-1" +> [ 0.103602] (1:master@100030591) Sending "Task_2" (of 10) to mailbox "worker-2" +> [ 0.126922] (1:master@100030591) Sending "Task_3" (of 10) to mailbox "worker-3" +> [ 0.167282] (1:master@100030591) Sending "Task_4" (of 10) to mailbox "worker-4" +> [ 0.174710] (1:master@100030591) Sending "Task_5" (of 10) to mailbox "worker-5" +> [ 0.307173] (1:master@100030591) Sending "Task_6" (of 10) to mailbox "worker-6" +> [ 0.370794] (1:master@100030591) Sending "Task_7" (of 10) to mailbox "worker-7" +> [ 0.413207] (1:master@100030591) Sending "Task_8" (of 10) to mailbox "worker-8" +> [ 0.452277] (1:master@100030591) Sending "Task_9" (of 10) to mailbox "worker-9" +> [ 0.487205] (1:master@100030591) All tasks have been dispatched. Let's tell everybody the computation is over. +> [ 0.533504] (2:worker@100036570) I'm done. See you! +> [ 0.590807] (3:worker@100041334) I'm done. See you! +> [ 0.614127] (4:worker@100055671) I'm done. See you! +> [ 0.654487] (5:worker@100066658) I'm done. See you! +> [ 0.661915] (6:worker@100090691) I'm done. See you! +> [ 0.794379] (7:worker@100094952) I'm done. See you! +> [ 0.858000] (8:worker@100117943) I'm done. See you! +> [ 0.900412] (9:worker@100126290) I'm done. See you! +> [ 0.939482] (10:worker@100144483) I'm done. See you! +> [ 0.974410] (11:worker@100152889) I'm done. See you! +> [ 0.990540] (12:worker@100178474) I'm done. See you! +> [ 1.011253] (13:worker@100180261) I'm done. See you! +> [ 1.051440] (14:worker@100185883) I'm done. See you! +> [ 1.268843] (15:worker@100186365) I'm done. See you! +> [ 1.336272] (16:worker@100200866) I'm done. See you! +> [ 1.336272] (0:maestro@) Simulation time 1.33627