From: Martin Quinson Date: Sun, 25 Dec 2011 20:52:39 +0000 (+0100) Subject: fix the tests that my cleanups in the config variable broke X-Git-Tag: exp_20120216~225 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/f121073f78d7355aba33a0be821b7d625e8d20a0 fix the tests that my cleanups in the config variable broke --- diff --git a/examples/msg/masterslave/masterslave_cpu_ti.tesh b/examples/msg/masterslave/masterslave_cpu_ti.tesh index 354343d44e..315b43b808 100644 --- a/examples/msg/masterslave/masterslave_cpu_ti.tesh +++ b/examples/msg/masterslave/masterslave_cpu_ti.tesh @@ -3,9 +3,8 @@ 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/model:CpuTI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' -> [ 0.000000] (0:@) Switching workstation model to compound since you changed the network and/or cpu model(s) +$ $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" +> [ 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" > [ 0.165962] (1:master@Tremblay) Sent @@ -128,9 +127,8 @@ $ $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/model:CpuTI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' -> [ 0.000000] (0:@) Switching workstation model to compound since you changed the network and/or cpu model(s) +$ $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" +> [ 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" > [ 4.772530] (1:master@Jacquelin) Sent @@ -279,8 +277,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/model:CpuTI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching workstation model to compound since you changed the network and/or cpu model(s) +$ ${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" > [ 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 @@ -374,10 +371,9 @@ $ ${bindir:=.}/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_ p Testing the bypassing of the flexml parser ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/masterslave_bypass --log=no_loc --cfg=cpu/model:CpuTI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' +$ $SG_TEST_EXENV ${bindir:=.}/masterslave_bypass --log=no_loc --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] (0:@) Bypassing the XML parser since surf_parse_open received a NULL pointer. If it is not what you want, go fix your code. -> [ 0.000000] (0:@) Switching workstation model to compound since you changed the network and/or cpu model(s) > [ 0.000000] (1:master@host A) Got 1 slave(s) : > [ 0.000000] (1:master@host A) host B > [ 0.000000] (1:master@host A) Got 20 task to process : diff --git a/examples/msg/masterslave/masterslave_vivaldi.tesh b/examples/msg/masterslave/masterslave_vivaldi.tesh index 037f150f8e..c1a16d2a8e 100644 --- a/examples/msg/masterslave/masterslave_vivaldi.tesh +++ b/examples/msg/masterslave/masterslave_vivaldi.tesh @@ -5,7 +5,7 @@ p Testing a simple master/slave example application $ $SG_TEST_EXENV ./masterslave/masterslave_mailbox ${srcdir:=.}/../platforms/vivaldi.xml ${srcdir:=.}/masterslave/deployment_masterslave_vivaldi.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 'coordinates' to 'yes' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/coordinates' to 'yes' > [100030591:master:(1) 0.000000] [msg_test/INFO] Got 39 slaves and 20 tasks to process > [100030591:master:(1) 0.000000] [msg_test/INFO] Sending "Task_0" (of 20) to mailbox "slave-0" > [100030591:master:(1) 0.046299] [msg_test/INFO] Sending "Task_1" (of 20) to mailbox "slave-1" diff --git a/examples/msg/sendrecv/sendrecv_CLM03.tesh b/examples/msg/sendrecv/sendrecv_CLM03.tesh index 92296de07f..a5832ef556 100644 --- a/examples/msg/sendrecv/sendrecv_CLM03.tesh +++ b/examples/msg/sendrecv/sendrecv_CLM03.tesh @@ -1,11 +1,13 @@ #! ./tesh -p Testing the surf network maxmin fairness model +p Testing the deprecated CM02 network model ! output sort -$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml --cfg=workstation/model:CLM03 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'CLM03' +$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml --cfg=cpu/model:Cas01 --cfg=network/model:CM02 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +> [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'Cas01' +> [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) test_all +> [ 0.000000] (0:@) Switching workstation model to compound since you changed the network and/or cpu model(s) > [ 0.000000] (1:sender@Inmos) sender > [ 0.000000] (1:sender@Inmos) host = Bellevue > [ 0.000000] (1:sender@Inmos) task_la->data = 0.000000e+00 diff --git a/examples/msg/sendrecv/sendrecv_KCCFLN05.tesh b/examples/msg/sendrecv/sendrecv_KCCFLN05.tesh index 4c2f861048..e58029bd9f 100644 --- a/examples/msg/sendrecv/sendrecv_KCCFLN05.tesh +++ b/examples/msg/sendrecv/sendrecv_KCCFLN05.tesh @@ -2,8 +2,7 @@ p Testing the surf network maxmin fairness model -$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml --cfg=workstation/model:CLM03 -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'CLM03' +$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml > [0.000000] [msg_test/INFO] test_all > [Inmos:sender:(1) 0.000000] [msg_test/INFO] sender > [Inmos:sender:(1) 0.000000] [msg_test/INFO] host = Bellevue diff --git a/examples/msg/token_ring/token_ring.tesh b/examples/msg/token_ring/token_ring.tesh index cd5d17fb26..e66bf68253 100644 --- a/examples/msg/token_ring/token_ring.tesh +++ b/examples/msg/token_ring/token_ring.tesh @@ -24,8 +24,8 @@ $ $SG_TEST_EXENV ${bindir:=.}/token_ring ${srcdir:=.}/two_clusters.xml "--log=ro > [ 1.104000] (1:0@bob1.hamburger.edu) Host "0" received "Token" > [ 1.104000] (0:@) Simulation time 1.104 -$ $SG_TEST_EXENV ${bindir:=.}/token_ring ${srcdir:=.}/two_peers.xml --cfg=coordinates:yes "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Configuration change: Set 'coordinates' to 'yes' +$ $SG_TEST_EXENV ${bindir:=.}/token_ring ${srcdir:=.}/two_peers.xml --cfg=network/coordinates:yes "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" +> [ 0.000000] (0:@) Configuration change: Set 'network/coordinates' to 'yes' > [ 0.000000] (0:@) Number of host '2' > [ 0.000000] (1:0@peer_100030591) Host "0" send 'Token' to Host "1" > [ 5.221778] (2:1@peer_100036570) Host "1" received "Token" diff --git a/examples/msg/trace/trace.tesh b/examples/msg/trace/trace.tesh index acf9a031ac..a1ea5cccb3 100644 --- a/examples/msg/trace/trace.tesh +++ b/examples/msg/trace/trace.tesh @@ -3,10 +3,10 @@ p Testing trace integration using file.trace and test1.xml, a < max(time), b < max(time) ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test1.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test1.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' -> [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' +> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' > [ 0.000000] (0:@) Ignoring redefinition of trace trace/file.trace > [ 10.000000] (1:test_trace@CPU1) Testing the trace integration cpu model: CpuTI > [ 10.000000] (1:test_trace@CPU1) Task size: 400.000000 @@ -16,10 +16,10 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test1. p Testing trace integration using file.trace and test2.xml, a < max(time), max(time) < b < 2 max(time) ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test2.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test2.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' -> [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' +> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' > [ 0.000000] (0:@) Ignoring redefinition of trace trace/file.trace > [ 10.000000] (1:test_trace@CPU1) Testing the trace integration cpu model: CpuTI > [ 10.000000] (1:test_trace@CPU1) Task size: 850.000000 @@ -30,10 +30,10 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test2. p Testing trace integration using file.trace and test3.xml, a < max(time), b > 2 max(time) ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test3.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test3.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' -> [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' +> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' > [ 0.000000] (0:@) Ignoring redefinition of trace trace/file.trace > [ 10.000000] (1:test_trace@CPU1) Testing the trace integration cpu model: CpuTI > [ 10.000000] (1:test_trace@CPU1) Task size: 1980.000000 @@ -43,10 +43,10 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test3. p Testing trace integration using file.trace and test4.xml, max(time) < a < 2max(time), max(time) < b < 2max(time) ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test4.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test4.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' -> [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' +> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' > [ 0.000000] (0:@) Ignoring redefinition of trace trace/file.trace > [ 80.000000] (1:test_trace@CPU1) Testing the trace integration cpu model: CpuTI > [ 80.000000] (1:test_trace@CPU1) Task size: 400.000000 @@ -56,10 +56,10 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test4. p Testing trace integration using file.trace and test5.xml, max(time) < a < 2max(time), 2max(time) < b < 3max(time) ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test5.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test5.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' -> [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' +> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' > [ 0.000000] (0:@) Ignoring redefinition of trace trace/file.trace > [ 90.000000] (1:test_trace@CPU1) Testing the trace integration cpu model: CpuTI > [ 90.000000] (1:test_trace@CPU1) Task size: 850.000000 @@ -69,10 +69,10 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test5. p Testing trace integration using file.trace and test6.xml, max(time) < a < 2max(time), b > 3max(time) ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test6.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test6.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' -> [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' +> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' > [ 0.000000] (0:@) Ignoring redefinition of trace trace/file.trace > [ 80.000000] (1:test_trace@CPU1) Testing the trace integration cpu model: CpuTI > [ 80.000000] (1:test_trace@CPU1) Task size: 1980.000000 @@ -82,10 +82,10 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test6. p Testing trace integration using file.trace and test7.xml, two process with same priority ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test7.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test7.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' -> [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' +> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' > [ 0.000000] (0:@) Ignoring redefinition of trace trace/file.trace > [ 10.000000] (1:test_trace@CPU1) Testing the trace integration cpu model: CpuTI > [ 10.000000] (1:test_trace@CPU1) Task size: 400.000000 @@ -99,10 +99,10 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test7. p Testing trace integration using file.trace and test8.xml, two process with different priority ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test8.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test8.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' -> [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' +> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' > [ 0.000000] (0:@) Ignoring redefinition of trace trace/file.trace > [ 10.000000] (1:test_trace@CPU1) Testing the trace integration cpu model: CpuTI > [ 10.000000] (1:test_trace@CPU1) Task size: 400.000000 @@ -116,10 +116,10 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test8. p Testing trace integration using file.trace and test9.xml, three process with same priority ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test9.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test9.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' -> [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' +> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' > [ 0.000000] (0:@) Ignoring redefinition of trace trace/file.trace > [ 0.000000] (1:test_trace@CPU1) Testing the trace integration cpu model: CpuTI > [ 0.000000] (1:test_trace@CPU1) Task size: 400.000000 @@ -137,10 +137,10 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test9. p Testing trace integration using file.trace and test10.xml, three process with different priority ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test10.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test10.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' -> [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' +> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' > [ 0.000000] (0:@) Ignoring redefinition of trace trace/file.trace > [ 0.000000] (1:test_trace@CPU1) Testing the trace integration cpu model: CpuTI > [ 0.000000] (1:test_trace@CPU1) Task size: 420.000000 @@ -158,10 +158,10 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test10 p Testing trace integration using file.trace and test11.xml, three process with different priority. Changed timestep to 0.1. ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test11.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test11.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' -> [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' +> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' > [ 0.000000] (1:test_trace@CPU1) Testing the trace integration cpu model: CpuTI > [ 0.000000] (1:test_trace@CPU1) Task size: 420.000000 > [ 0.000000] (1:test_trace@CPU1) Task prio: 2.000000 diff --git a/examples/smpi/bcast.tesh b/examples/smpi/bcast.tesh index d1dc7cc912..68aaa81864 100644 --- a/examples/smpi/bcast.tesh +++ b/examples/smpi/bcast.tesh @@ -8,7 +8,7 @@ $ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/ > [rank 2] -> Fafard > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'maxmin/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s) @@ -25,7 +25,7 @@ $ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/ > [rank 5] -> Tremblay > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'maxmin/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s) @@ -47,5 +47,5 @@ $ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/ > [rank 11] -> Jupiter > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'maxmin/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s) diff --git a/examples/smpi/reduce.tesh b/examples/smpi/reduce.tesh index 9a97abc189..12c68f7173 100644 --- a/examples/smpi/reduce.tesh +++ b/examples/smpi/reduce.tesh @@ -8,7 +8,7 @@ $ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/ > [rank 2] -> Fafard > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'maxmin/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s) > ** Scalar Int Test Result: > [0] sum=6 ... validation ok. @@ -31,7 +31,7 @@ $ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/ > [rank 5] -> Tremblay > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'maxmin/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s) > ** Scalar Int Test Result: > [0] sum=21 ... validation ok. @@ -64,7 +64,7 @@ $ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/ > [rank 11] -> Jupiter > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'maxmin/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s) > ** Scalar Int Test Result: > [0] sum=78 ... validation ok. diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in index ec20d10f9f..677f9322dc 100755 --- a/src/smpi/smpirun.in +++ b/src/smpi/smpirun.in @@ -16,7 +16,7 @@ NETWORK_LATENCY="${DEFAULT_NETWORK_LATENCY}" NUMPROCS="${DEFAULT_NUMPROCS}" POWER="${DEFAULT_POWER}" -SIMOPTS="--cfg=maxmin/precision:1e-9 --cfg=network/model:SMPI --cfg=TCP_gamma:4194304" +SIMOPTS="--cfg=maxmin/precision:1e-9 --cfg=network/model:SMPI --cfg=network/TCP_gamma:4194304" #usage to print the way this script should be called function usage () { diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c index 1f3380dd5e..4ae49e11d6 100644 --- a/src/surf/surf_config.c +++ b/src/surf/surf_config.c @@ -366,7 +366,7 @@ void surf_config_init(int *argc, char **argv) surf_workstation_model_description[i].name); sprintf(p, ".\n (use 'help' as a value to see the long description of each model)"); - default_value = xbt_strdup("current_default"); + default_value = xbt_strdup("default"); xbt_cfg_register(&_surf_cfg_set, "workstation/model", description, xbt_cfgelm_string, &default_value, 1, 1, diff --git a/teshsuite/simdag/platforms/basic_parsing_test.tesh b/teshsuite/simdag/platforms/basic_parsing_test.tesh index 207782b0a7..6561fbbde8 100644 --- a/teshsuite/simdag/platforms/basic_parsing_test.tesh +++ b/teshsuite/simdag/platforms/basic_parsing_test.tesh @@ -75,17 +75,17 @@ $ ${bindir:=.}/basic_parsing_test ./four_hosts_floyd_bis.xml > Workstation number: 5, link number: 7 $ ${bindir:=.}/basic_parsing_test ./properties.xml +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/optim' to 'TI' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'maxmin/precision' to '0.000010' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'Vegas' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to '~/' > Workstation number: 1, link number: 1 -$ ${bindir:=.}/basic_parsing_test ./properties.xml --cfg=cpu/model:CpuTI -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI' +$ ${bindir:=.}/basic_parsing_test ./properties.xml --cfg=cpu/optim:TI +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/optim' to 'TI' +> [0.000000] [surf_parse/INFO] The custom configuration 'cpu/optim' is already defined by user! > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'maxmin/precision' to '0.000010' -> [0.000000] [surf_parse/INFO] The custom configuration 'cpu/model' is already defined by user! > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'Vegas' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to '~/' diff --git a/teshsuite/simdag/platforms/properties.xml b/teshsuite/simdag/platforms/properties.xml index abee29765e..d2ba4b3cc1 100644 --- a/teshsuite/simdag/platforms/properties.xml +++ b/teshsuite/simdag/platforms/properties.xml @@ -4,7 +4,7 @@ - + diff --git a/testsuite/surf/surf_usage2.c b/testsuite/surf/surf_usage2.c index a958e39eb3..a30f0e46d4 100644 --- a/testsuite/surf/surf_usage2.c +++ b/testsuite/surf/surf_usage2.c @@ -46,7 +46,8 @@ void test(char *platform) double now = -1.0; int running; - xbt_cfg_set_parse(_surf_cfg_set, "workstation/model:CLM03"); + xbt_cfg_set_parse(_surf_cfg_set, "network/model:CM02"); + xbt_cfg_set_parse(_surf_cfg_set, "cpu/model:Cas01"); parse_platform_file(platform); /*********************** WORKSTATION ***********************************/