* Add a MSG_task_set_data() function
SIMIX:
* add a SIMIX_sem_get_capacity() function
+ SURF:
+ * Rename configuration variables to start a hierarchy:
+ o cpu_model -> cpu/model
+ o network_model -> network/model
+ o workstation_model -> workstation/model
SMPI:
* Implement MPI_Get_count, MPI_MAXLOC, MPI_MINLOC
XBT:
ADD_TEST(memcheck-gras-properties-rl-1 /bin/sh -c "cd ~/Developments/simgrid/examples/gras/properties/ && ./properties_bob --log=root.fmt=%P:%t%e%m%n")
# MSG examples
-ADD_TEST(memcheck-msg-sendrecv_CLM03-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && sendrecv/sendrecv ./sendrecv/platform_sendrecv.xml ./sendrecv/deployment_sendrecv.xml --cfg=workstation_model:CLM03 --cfg=cpu_model:Cas01 --cfg=network_model:CM02")
-ADD_TEST(memcheck-msg-sendrecv_Vegas-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && sendrecv/sendrecv ./sendrecv/platform_sendrecv.xml ./sendrecv/deployment_sendrecv.xml "--cfg=workstation_model:compound cpu_model:Cas01 network_model:Vegas"")
-ADD_TEST(memcheck-msg-sendrecv_Reno-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && sendrecv/sendrecv ./sendrecv/platform_sendrecv.xml ./sendrecv/deployment_sendrecv.xml "--cfg=workstation_model:compound cpu_model:Cas01 network_model:Reno" --log=surf_lagrange.thres=critical")
+ADD_TEST(memcheck-msg-sendrecv_CLM03-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && sendrecv/sendrecv ./sendrecv/platform_sendrecv.xml ./sendrecv/deployment_sendrecv.xml --cfg=workstation/model:CLM03 --cfg=cpu_model:Cas01 --cfg=network_model:CM02")
+ADD_TEST(memcheck-msg-sendrecv_Vegas-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && sendrecv/sendrecv ./sendrecv/platform_sendrecv.xml ./sendrecv/deployment_sendrecv.xml "--cfg=workstation/model:compound cpu_model:Cas01 network_model:Vegas"")
+ADD_TEST(memcheck-msg-sendrecv_Reno-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && sendrecv/sendrecv ./sendrecv/platform_sendrecv.xml ./sendrecv/deployment_sendrecv.xml "--cfg=workstation/model:compound cpu_model:Cas01 network_model:Reno" --log=surf_lagrange.thres=critical")
ADD_TEST(memcheck-msg-suspend-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && suspend/suspend ./msg_platform.xml ./suspend/deployment_suspend.xml ")
ADD_TEST(memcheck-msg-masterslave-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && masterslave/masterslave_forwarder ./small_platform.xml ./masterslave/deployment_masterslave.xml")
ADD_TEST(memcheck-msg-masterslave-forwarder-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && masterslave/masterslave_forwarder ./msg_platform.xml ./masterslave/deployment_masterslave_forwarder.xml ")
ADD_TEST(memcheck-msg-ptask-1 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && parallel_task/test_ptask ./parallel_task/test_ptask_platform.xml ./parallel_task/test_ptask_deployment.xml")
ADD_TEST(memcheck-msg-priority-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && priority/priority ./small_platform.xml ./priority/deployment_priority.xml")
ADD_TEST(memcheck-msg-properties-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && properties/msg_prop ./../platforms/prop.xml ./properties/deployment_properties.xml ")
-ADD_TEST(memcheck-msg-trace-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test1.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-1 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test2.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-2 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test3.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-3 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test4.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-4 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test5.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-5 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test6.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-6 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test7.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-7 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test8.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-8 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test9.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-9 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test10.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-10 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test11.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test1.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-1 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test2.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-2 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test3.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-3 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test4.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-4 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test5.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-5 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test6.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-6 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test7.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-7 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test8.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-8 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test9.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-9 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test10.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-10 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test11.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
ADD_TEST(memcheck-msg-masterslave_cpu_ti-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && masterslave/masterslave_forwarder ./small_platform.xml ./masterslave/deployment_masterslave.xml --cfg=cpu_model:CpuTI")
ADD_TEST(memcheck-msg-masterslave_cpu_ti-1 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && masterslave/masterslave_forwarder ./msg_platform.xml ./masterslave/deployment_masterslave_forwarder.xml --cfg=cpu_model:CpuTI")
ADD_TEST(memcheck-msg-masterslave_cpu_ti-2 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && masterslave/masterslave_failure --log=xbt_cfg.thres:critical --log=no_loc ./small_platform_with_failures.xml ./masterslave/deployment_masterslave.xml --cfg=path:${PROJECT_DIRECTORY}/src --cfg=cpu_model:CpuTI")
ADD_TEST(memcheck-smpi-reduce-1 /bin/sh -c "cd ~/Developments/simgrid/examples/smpi/ && ../../src/smpi/smpirun -map -hostfile ./hostfile -platform ./../msg/small_platform.xml -np 6 ./reduce -q")
ADD_TEST(memcheck-smpi-reduce-2 /bin/sh -c "cd ~/Developments/simgrid/examples/smpi/ && ../../src/smpi/smpirun -map -hostfile ./hostfile -platform ./../msg/small_platform.xml -np 12 ./reduce -q ")
if(HAVE_GTNETS)
-ADD_TEST(memcheck-msg-gtnets1-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && gtnets/gtnets gtnets/waxman-p.xml gtnets/waxman-d.xml --cfg=workstation_model:compound --cfg=cpu_model:Cas01 --cfg=network_model:GTNets")
-ADD_TEST(memcheck-msg-gtnets2-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=workstation_model:compound --cfg=cpu_model:Cas01 --cfg=network_model:GTNets")
-ADD_TEST(memcheck-msg-gtnets3-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=workstation_model:compound --cfg=cpu_model:Cas01 --cfg=network_model:GTNets")
-ADD_TEST(memcheck-msg-gtnets4-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=workstation_model:compound --cfg=cpu_model:Cas01 --cfg=network_model:LV08")
-ADD_TEST(memcheck-msg-gtnets5-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=workstation_model:compound --cfg=cpu_model:Cas01 --cfg=network_model:LV08 2>&1 | grep --color=auto -v root/INFO | grep -v simix_network/INFO")
+ADD_TEST(memcheck-msg-gtnets1-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && gtnets/gtnets gtnets/waxman-p.xml gtnets/waxman-d.xml --cfg=workstation/model:compound --cfg=cpu_model:Cas01 --cfg=network_model:GTNets")
+ADD_TEST(memcheck-msg-gtnets2-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=workstation/model:compound --cfg=cpu_model:Cas01 --cfg=network_model:GTNets")
+ADD_TEST(memcheck-msg-gtnets3-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=workstation/model:compound --cfg=cpu_model:Cas01 --cfg=network_model:GTNets")
+ADD_TEST(memcheck-msg-gtnets4-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=workstation/model:compound --cfg=cpu_model:Cas01 --cfg=network_model:LV08")
+ADD_TEST(memcheck-msg-gtnets5-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=workstation/model:compound --cfg=cpu_model:Cas01 --cfg=network_model:LV08 2>&1 | grep --color=auto -v root/INFO | grep -v simix_network/INFO")
endif(HAVE_GTNETS)
set(MEMCHECK_LIST
make sendrecv/sendrecv
- Execute:
- sendrecv/sendrecv <platformfile.xml> <deploymentfile.xml> --cfg=workstation_model:<networkmodel>
+ sendrecv/sendrecv <platformfile.xml> <deploymentfile.xml> --cfg=workstation/model:<networkmodel>
where networkmodel can be one of the following:
1) CLM03 - Simple fairness model
2) KFCCNL05 - Maxmin fairness
p Testing dogbone communication pattern with GTNets model
-$ gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=workstation_model:compound --cfg=cpu_model:Cas01 --cfg=network_model:GTNets
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'Cas01'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'GTNets'
+$ gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'GTNets'
> [S1:master:(1) 0.300171] [msg_test/INFO] Send completed (to C1). Transfer time: 0.300171 Agregate bandwidth: 33314.335278
> [S1:master:(1) 0.300171] [msg_test/INFO] Completed peer: C1 time: 0.300171
> [C1:slave:(3) 0.300171] [msg_test/INFO] ===> Estimated Bw of FLOW[0] : 33314.335278 ; message from S1 to C1 with remaining : 0.000000
p Testing dogbone communication pattern with LV08 model
-$ gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=workstation_model:compound --cfg=cpu_model:Cas01 --cfg=network_model:LV08
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'Cas01'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'LV08'
+$ gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:LV08
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'LV08'
> [S1:master:(1) 0.342000] [msg_test/INFO] Send completed (to C1). Transfer time: 0.342000 Agregate bandwidth: 29239.766082
> [S1:master:(1) 0.342000] [msg_test/INFO] Completed peer: C1 time: 0.342000
> [S2:master:(2) 0.342000] [msg_test/INFO] Send completed (to C2). Transfer time: 0.342000 Agregate bandwidth: 29239.766082
p Testing onelink communication pattern with GTNets model
-$ gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=workstation_model:compound --cfg=cpu_model:Cas01 --cfg=network_model:GTNets
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'Cas01'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'GTNets'
+$ gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'GTNets'
> [S1:master:(1) 106.291000] [msg_test/INFO] Send completed (to C1). Transfer time: 106.291000 Agregate bandwidth: 9408.134273
> [S1:master:(1) 106.291000] [msg_test/INFO] Completed peer: C1 time: 106.291000
> [C1:slave:(2) 106.291000] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 9408.134273 ; message from S1 to C1 with remaining : 0.000000
p Testing onelink communication pattern with LV08 model
-$ gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=workstation_model:compound --cfg=cpu_model:Cas01 --cfg=network_model:LV08 2>&1 | grep --color=auto -v root/INFO | grep -v simix_network/INFO
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'Cas01'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'LV08'
+$ gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:LV08 2>&1 | grep --color=auto -v root/INFO | grep -v simix_network/INFO
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'LV08'
> [S1:master:(1) 108.799652] [msg_test/INFO] Send completed (to C1). Transfer time: 108.799652 Agregate bandwidth: 9191.205854
> [S1:master:(1) 108.799652] [msg_test/INFO] Completed peer: C1 time: 108.799652
> [C1:slave:(2) 108.799652] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 9191.205854 ; message from S1 to C1 with remaining : 0.000000
p Testing waxman radom communication pattern with GTNets model, 200 nodes, 200 flows
-$ gtnets/gtnets gtnets/waxman-p.xml gtnets/waxman-d.xml --cfg=workstation_model:compound --cfg=cpu_model:Cas01 --cfg=network_model:GTNets
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'Cas01'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'GTNets'
+$ gtnets/gtnets gtnets/waxman-p.xml gtnets/waxman-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'GTNets'
> [Gavrel:master:(245) 0.016724] [msg_test/INFO] Send completed (to Lafontaine). Transfer time: 0.016724 Agregate bandwidth: 5979535.896806
> [Gavrel:master:(245) 0.016724] [msg_test/INFO] Completed peer: Lafontaine time: 0.016724
> [Lafontaine:slave:(246) 0.016724] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 59795.358968 ; message from Ouellet to Amadeus with remaining : 99000.000000
{
MSG_error_t res = MSG_OK;
- /* MSG_config("workstation_model", "GTNETS"); */
- /* MSG_config("workstation_model","KCCFLN05"); */
+ /* MSG_config("workstation/model", "GTNETS"); */
+ /* MSG_config("workstation/model","KCCFLN05"); */
{ /* Simulation setting */
MSG_set_channel_number(MAX_CHANNEL);
- //MSG_paje_output("msg_test.trace");
MSG_create_environment(platform_file);
}
{ /* Application deployment */
p Testing a simple master/slave example application
-$ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/small_platform.xml ${srcdir:=.}/masterslave/deployment_masterslave.xml --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/small_platform.xml ${srcdir:=.}/masterslave/deployment_masterslave.xml --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
> [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Got 5 slaves and 20 tasks to process
> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Sending "Task_0" to "Jupiter"
p Testing a master/slave example application with a forwarder module
-$ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/msg_platform.xml ${srcdir:=.}/masterslave/deployment_masterslave_forwarder.xml --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/msg_platform.xml ${srcdir:=.}/masterslave/deployment_masterslave_forwarder.xml --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
> [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
> [Jacquelin:master:(1) 0.000000] [msg_test/INFO] Got 5 slaves and 20 tasks to process
> [Jacquelin:master:(1) 0.000000] [msg_test/INFO] Sending "Task_0" to "iRMX"
p Testing a simple master/slave example application handling failures
-$ masterslave/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_loc ${srcdir:=.}/small_platform_with_failures.xml ${srcdir:=.}/masterslave/deployment_masterslave.xml --cfg=path:${srcdir} --cfg=cpu_model:CpuTI
+$ masterslave/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_loc ${srcdir:=.}/small_platform_with_failures.xml ${srcdir:=.}/masterslave/deployment_masterslave.xml --cfg=path:${srcdir} --cfg=cpu/model:CpuTI
> [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
> [0.000000] [simix_process/WARNING] Cannot launch process 'slave' on failed host 'Fafard'
> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Got 5 slave(s) :
p Testing the bypassing of the flexml parser
-$ $SG_TEST_EXENV masterslave/masterslave_bypass --log=no_loc --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV masterslave/masterslave_bypass --log=no_loc --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
> [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
> [0.000000] [surf_parse/WARNING] Bypassing the XML parser since surf_parse_open received a NULL pointer. If it is not what you want, go fix your code.
> [host A:master:(1) 0.000000] [msg_test/INFO] Got 1 slave(s) :
{
MSG_error_t res = MSG_OK;
- /* MSG_config("workstation_model","KCCFLN05"); */
+ /* MSG_config("workstation/model","KCCFLN05"); */
{ /* Simulation setting */
MSG_set_channel_number(MAX_CHANNEL);
MSG_create_environment(platform_file);
{
MSG_error_t res = MSG_OK;
- /* MSG_config("surf_workstation_model","KCCFLN05"); */
+ /* MSG_config("workstation/model","KCCFLN05"); */
{ /* Simulation setting */
MSG_set_channel_number(MAX_CHANNEL);
MSG_create_environment(platform_file);
{
MSG_error_t res = MSG_OK;
- /* MSG_config("surf_workstation_model","KCCFLN05"); */
+ /* MSG_config("workstation/model","KCCFLN05"); */
{ /* Simulation setting */
MSG_set_channel_number(0);
MSG_create_environment(platform_file);
{
MSG_error_t res = MSG_OK;
- MSG_config("workstation_model", "ptask_L07");
+ MSG_config("workstation/model", "ptask_L07");
MSG_set_channel_number(1);
MSG_create_environment(platform_file);
MSG_error_t res = MSG_OK;
- MSG_config("workstation_model", "ptask_L07");
+ MSG_config("workstation/model", "ptask_L07");
/* Simulation setting */
MSG_set_channel_number(MAX_CHANNEL);
exit(1);
}
- /* Options for the workstation_model:
+ /* Options for the workstation/model:
KCCFLN05 => for maxmin
KCCFLN05_proportional => for proportional (Vegas)
KCCFLN05_Vegas => for TCP Vegas
KCCFLN05_Reno => for TCP Reno
*/
- //MSG_config("workstation_model", argv[3]);
+ //MSG_config("workstation/model", argv[3]);
res = test_all(argv[1], argv[2]);
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 --cfg=cpu_model:Cas01 --cfg=network_model:CM02
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'CLM03'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'Cas01'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'CM02'
+$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml --cfg=workstation/model:CLM03 --cfg=cpu/model:Cas01 --cfg=network/model:CM02
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'CLM03'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
> [0.000000] [msg_test/INFO] test_all
> [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
> [Inmos:sender:(1) 0.000000] [msg_test/INFO] sender
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 --cfg=workstation/model:CLM03
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'CLM03'
> [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
p Testing the surf network Reno fairness model using lagrangian approach
-$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml "--cfg=workstation_model:compound cpu_model:Cas01 network_model:Reno" --log=surf_lagrange.thres=critical
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'Cas01'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'Reno'
+$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml "--cfg=workstation/model:compound cpu/model:Cas01 network/model:Reno" --log=surf_lagrange.thres=critical
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'Reno'
> [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
p Testing the surf network Vegas fairness model using lagrangian approach
-$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml "--cfg=workstation_model:compound cpu_model:Cas01 network_model:Vegas"
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'Cas01'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'Vegas'
+$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml "--cfg=workstation/model:compound cpu/model:Cas01 network/model:Vegas"
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'Vegas'
> [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
p Testing trace integration using file.trace and test1.xml, a < max(time), b < max(time)
-$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test1.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'CM02'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test1.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
> [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Testing the trace integration cpu model: CpuTI
> [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Task size: 400.000000
> [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Task prio: 1.000000
p Testing trace integration using file.trace and test2.xml, a < max(time), max(time) < b < 2 max(time)
-$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test2.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'CM02'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test2.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
> [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Testing the trace integration cpu model: CpuTI
> [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Task size: 850.000000
> [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Task prio: 1.000000
p Testing trace integration using file.trace and test3.xml, a < max(time), b > 2 max(time)
-$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test3.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'CM02'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test3.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
> [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Testing the trace integration cpu model: CpuTI
> [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Task size: 1980.000000
> [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Task prio: 1.000000
p Testing trace integration using file.trace and test4.xml, max(time) < a < 2max(time), max(time) < b < 2max(time)
-$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test4.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'CM02'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test4.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
> [CPU1:test_trace:(1) 80.000000] [test_trace_integration/INFO] Testing the trace integration cpu model: CpuTI
> [CPU1:test_trace:(1) 80.000000] [test_trace_integration/INFO] Task size: 400.000000
> [CPU1:test_trace:(1) 80.000000] [test_trace_integration/INFO] Task prio: 1.000000
p Testing trace integration using file.trace and test5.xml, max(time) < a < 2max(time), 2max(time) < b < 3max(time)
-$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test5.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'CM02'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test5.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
> [CPU1:test_trace:(1) 90.000000] [test_trace_integration/INFO] Testing the trace integration cpu model: CpuTI
> [CPU1:test_trace:(1) 90.000000] [test_trace_integration/INFO] Task size: 850.000000
> [CPU1:test_trace:(1) 90.000000] [test_trace_integration/INFO] Task prio: 1.000000
p Testing trace integration using file.trace and test6.xml, max(time) < a < 2max(time), b > 3max(time)
-$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test6.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'CM02'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test6.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
> [CPU1:test_trace:(1) 80.000000] [test_trace_integration/INFO] Testing the trace integration cpu model: CpuTI
> [CPU1:test_trace:(1) 80.000000] [test_trace_integration/INFO] Task size: 1980.000000
> [CPU1:test_trace:(1) 80.000000] [test_trace_integration/INFO] Task prio: 1.000000
p Testing trace integration using file.trace and test7.xml, two process with same priority
-$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test7.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'CM02'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test7.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
> [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Testing the trace integration cpu model: CpuTI
> [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Task size: 400.000000
> [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Task prio: 1.500000
p Testing trace integration using file.trace and test8.xml, two process with different priority
-$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test8.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'CM02'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test8.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
> [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Testing the trace integration cpu model: CpuTI
> [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Task size: 400.000000
> [CPU1:test_trace:(1) 10.000000] [test_trace_integration/INFO] Task prio: 2.500000
p Testing trace integration using file.trace and test9.xml, three process with same priority
-$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test9.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'CM02'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test9.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
> [CPU1:test_trace:(1) 0.000000] [test_trace_integration/INFO] Testing the trace integration cpu model: CpuTI
> [CPU1:test_trace:(1) 0.000000] [test_trace_integration/INFO] Task size: 400.000000
> [CPU1:test_trace:(1) 0.000000] [test_trace_integration/INFO] Task prio: 1.000000
p Testing trace integration using file.trace and test10.xml, three process with different priority
-$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test10.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'CM02'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test10.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
> [CPU1:test_trace:(1) 0.000000] [test_trace_integration/INFO] Testing the trace integration cpu model: CpuTI
> [CPU1:test_trace:(1) 0.000000] [test_trace_integration/INFO] Task size: 420.000000
> [CPU1:test_trace:(1) 0.000000] [test_trace_integration/INFO] Task prio: 2.000000
p Testing trace integration using file.trace and test11.xml, three process with different priority. Changed timestep to 0.1.
-$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test11.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation_model' to 'compound'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network_model' to 'CM02'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'CpuTI'
+$ $SG_TEST_EXENV trace/test_trace_integration$EXEEXT ${srcdir:=.}/trace/test11.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
> [CPU1:test_trace:(1) 0.000000] [test_trace_integration/INFO] Testing the trace integration cpu model: CpuTI
> [CPU1:test_trace:(1) 0.000000] [test_trace_integration/INFO] Task size: 420.000000
> [CPU1:test_trace:(1) 0.000000] [test_trace_integration/INFO] Task prio: 2.000000
/** \brief set a configuration variable
*
* Currently existing configuation variable:
- * - workstation_model (string): Model of workstation to use.
+ * - workstation/model (string): Model of workstation to use.
* Possible values (defaults to "KCCFLN05"):
* - "CLM03": realistic TCP behavior + basic CPU model (see [CML03 at CCGrid03]) + support for parallel tasks
* - "KCCFLN05": realistic TCP behavior + basic CPU model (see [CML03 at CCGrid03]) + failure handling + interference between communications and computations if precised in the platform file.
* - "KCCFLN05_Reno": realistic TCP behavior + basic CPU model (see [CML03 at CCGrid03]) + failure handling + interference between communications and computations if precised in the platform file. Uses the fairness adapted to the TCP Reno flow control.
*
* Example:
- * MSG_config("workstation_model","KCCFLN05");
+ * MSG_config("workstation/model","KCCFLN05");
*/
void MSG_config(const char *name, ...)
{
sd_global->task_number = 0;
surf_init(argc, argv);
- xbt_cfg_set_string(_surf_cfg_set, "workstation_model", "ptask_L07");
+ xbt_cfg_set_string(_surf_cfg_set, "workstation/model", "ptask_L07");
}
/**
1: pre-inited (cfg_set created);
2: inited (running) */
-/* callback of the workstation_model variable */
+/* callback of the workstation/model variable */
static void _surf_cfg_cb__workstation_model(const char *name, int pos)
{
char *val;
find_model_description(surf_workstation_model_description, val);
}
-/* callback of the cpu_model variable */
+/* callback of the cpu/model variable */
static void _surf_cfg_cb__cpu_model(const char *name, int pos)
{
char *val;
surf_cpu_model_description[i].name);
default_value = xbt_strdup("Cas01");
xbt_cfg_register(&_surf_cfg_set,
- "cpu_model", description, xbt_cfgelm_string,
+ "cpu/model", description, xbt_cfgelm_string,
&default_value, 1, 1, &_surf_cfg_cb__cpu_model, NULL);
sprintf(description,
surf_network_model_description[i].name);
default_value = xbt_strdup("LV08");
xbt_cfg_register(&_surf_cfg_set,
- "network_model", description, xbt_cfgelm_string,
+ "network/model", description, xbt_cfgelm_string,
&default_value, 1, 1, &_surf_cfg_cb__network_model,
NULL);
surf_workstation_model_description[i].name);
default_value = xbt_strdup("CLM03");
xbt_cfg_register(&_surf_cfg_set,
- "workstation_model", description, xbt_cfgelm_string,
+ "workstation/model", description, xbt_cfgelm_string,
&default_value, 1, 1, &_surf_cfg_cb__workstation_model,
NULL);
surf_timer_model_init(platform_file);
workstation_model_name =
- xbt_cfg_get_string(_surf_cfg_set, "workstation_model");
- char *network_model_name = xbt_cfg_get_string(_surf_cfg_set, "network_model");
- char *cpu_model_name = xbt_cfg_get_string(_surf_cfg_set, "cpu_model");
+ xbt_cfg_get_string(_surf_cfg_set, "workstation/model");
+ char *network_model_name = xbt_cfg_get_string(_surf_cfg_set, "network/model");
+ char *cpu_model_name = xbt_cfg_get_string(_surf_cfg_set, "cpu/model");
if ((strcmp(network_model_name,"LV08") || strcmp(cpu_model_name,"Cas01"))
&& !strcmp(workstation_model_name, "CLM03")){
const char *val = "compound";
INFO0("Switching workstation model to compound since you changed the network and/or cpu model(s)");
- xbt_cfg_set_string(_surf_cfg_set,"workstation_model",val);
+ xbt_cfg_set_string(_surf_cfg_set,"workstation/model",val);
workstation_model_name = (char*)"compound";
}
void surf_config_models_create_elms(void)
{
char *workstation_model_name =
- xbt_cfg_get_string(_surf_cfg_set, "workstation_model");
+ xbt_cfg_get_string(_surf_cfg_set, "workstation/model");
int workstation_id =
find_model_description(surf_workstation_model_description,
workstation_model_name);