woops revalidate some tesh files

diff --git a/examples/msg/energy/consumption/energy_consumption.tesh b/examples/msg/energy/consumption/energy_consumption.tesh
index 8cd12b6..4f91d8d 100644 (file)
--- a/examples/msg/energy/consumption/energy_consumption.tesh
+++ b/examples/msg/energy/consumption/energy_consumption.tesh
@@ -21,26 +21,3 @@ $ $SG_TEST_EXENV energy/consumption/energy_consumption$EXEEXT ${srcdir:=.}/../pl
 > [ 30.000000] (0:@) Total energy of host MyHost2: 2100.000000 Joules
 > [ 30.000000] (0:@) Total energy of host MyHost3: 3000.000000 Joules
 > [ 30.000000] (1:dvfs_test@MyHost1) Done sleeping (duration: 10.00 s). Current peak speed=2E+07 flop/s; Energy dissipated=3210 J
-
-p Test the same with the ptask model
-
-$ $SG_TEST_EXENV energy/consumption/energy_consumption$EXEEXT ${srcdir:=.}/../platforms/energy_platform.xml ${srcdir:=.}/energy/consumption/deployment_consumption.xml --cfg=host/model:ptask_L07 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:@) Configuration change: Set 'host/model' to 'ptask_L07'
-> [  0.000000] (0:@) Switching to the L07 model to handle parallel tasks.
-> [  0.000000] (1:dvfs_test@MyHost1) Energetic profile: 100.0:200.0, 93.0:170.0, 90.0:150.0
-> [  0.000000] (1:dvfs_test@MyHost1) Initial peak speed=1E+08 flop/s; Energy dissipated =0E+00 J
-> [  0.000000] (1:dvfs_test@MyHost1) Sleep for 10 seconds
-> [ 10.000000] (1:dvfs_test@MyHost1) Done sleeping (duration: 10.00 s). Current peak speed=1E+08; Energy dissipated=1000.00 J
-> [ 10.000000] (1:dvfs_test@MyHost1) Run a task of 1E+08 flops
-> [ 11.000000] (1:dvfs_test@MyHost1) Task done (duration: 1.00 s). Current peak speed=1E+08 flop/s; Current consumption: from 100W to 200W depending on load; Energy dissipated=1200 J
-> [ 11.000000] (1:dvfs_test@MyHost1) ========= Requesting pstate 2 (speed should be of 2E+07 flop/s and is of 2E+07 flop/s)
-> [ 11.000000] (1:dvfs_test@MyHost1) Run a task of 1E+08 flops
-> [ 16.000000] (1:dvfs_test@MyHost1) Task done (duration: 5.00 s). Current peak speed=2E+07 flop/s; Energy dissipated=1950 J
-> [ 16.000000] (1:dvfs_test@MyHost1) Sleep for 4 seconds
-> [ 20.000000] (1:dvfs_test@MyHost1) Done sleeping (duration: 4.00 s). Current peak speed=2E+07 flop/s; Energy dissipated=2310 J
-> [ 20.000000] (1:dvfs_test@MyHost1) Turning MyHost2 off, and sleeping another 10 seconds. MyHost2 dissipated 2000 J so far.
-> [ 30.000000] (1:dvfs_test@MyHost1) Done sleeping (duration: 10.00 s). Current peak speed=2E+07 flop/s; Energy dissipated=3210 J
-> [ 30.000000] (0:@) Total simulation time: 30.00
-> [ 30.000000] (0:@) Total energy of host MyHost1: 3210.000000 Joules
-> [ 30.000000] (0:@) Total energy of host MyHost2: 2100.000000 Joules
-> [ 30.000000] (0:@) Total energy of host MyHost3: 3000.000000 Joules

diff --git a/examples/simdag/dax/simple_dax_with_cycle.tesh b/examples/simdag/dax/simple_dax_with_cycle.tesh
index 2878170..8617ae4 100644 (file)
--- a/examples/simdag/dax/simple_dax_with_cycle.tesh
+++ b/examples/simdag/dax/simple_dax_with_cycle.tesh
@@ -3,7 +3,7 @@ p Test the DAX loader with a DAX comprising a cycle.
 
 ! expect return 255
 $ $SG_TEST_EXENV ./dax_test --log=no_loc ${srcdir:=.}/../2clusters.xml ${srcdir:=.}/simple_dax_with_cycle.xml
-> [0.000000] [surf_host/INFO] Switching to the L07 model to handle parallel tasks.
+> [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [0.000000] [sd_daxparse/WARNING] the task root is not marked
 > [0.000000] [sd_daxparse/WARNING] the task 1@task1 is in a cycle
 > [0.000000] [sd_daxparse/WARNING] the task 2@task2 is in a cycle

diff --git a/examples/simdag/dax/smalldax.tesh b/examples/simdag/dax/smalldax.tesh
index 712f8b1..9dd4acf 100644 (file)
--- a/examples/simdag/dax/smalldax.tesh
+++ b/examples/simdag/dax/smalldax.tesh
@@ -2,7 +2,7 @@
 p Test the DAX loader on a small DAX instance
 
 $ $SG_TEST_EXENV ${bindir:=.}/dax_test --log=no_loc ../2clusters.xml ./smalldax.xml
-> [0.000000] [surf_host/INFO] Switching to the L07 model to handle parallel tasks.
+> [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [0.000000] [sd_daxparse/WARNING] Ignoring file o1 size redefinition from 1000000 to 304
 > [0.000000] [sd_daxparse/WARNING] Ignoring file o2 size redefinition from 1000000 to 304
 > [0.000000] [test/INFO] ------------------- Display all tasks of the loaded DAG ---------------------------

diff --git a/examples/simdag/dot/test_simdag_dotload.tesh b/examples/simdag/dot/test_simdag_dotload.tesh
index b4993c1..75d0846 100644 (file)
--- a/examples/simdag/dot/test_simdag_dotload.tesh
+++ b/examples/simdag/dot/test_simdag_dotload.tesh
@@ -2,7 +2,7 @@
 p Test the loader of DAG written in the DOT format
 
 $ $SG_TEST_EXENV ./dot_test --log=no_loc ${srcdir:=.}/../2clusters.xml ${srcdir:=.}/dag.dot
-> [0.000000] [surf_host/INFO] Switching to the L07 model to handle parallel tasks.
+> [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [0.000000] [test/INFO] ------------------- Display all tasks of the loaded DAG ---------------------------
 > [0.000000] [sd_task/INFO] Displaying task root
 > [0.000000] [sd_task/INFO]   - state: schedulable not runnable
@@ -235,7 +235,7 @@ $ rm -f dag.trace
 
 ! expect return 2
 $ $SG_TEST_EXENV ./simulate_dot --log=no_loc  "--log=sd_dotparse.thres:verbose" ${srcdir:=.}/../2clusters.xml ${srcdir:=.}/dag_with_bad_schedule.dot
-> [0.000000] [surf_host/INFO] Switching to the L07 model to handle parallel tasks.
+> [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [0.000000] [sd_dotparse/VERBOSE] The schedule is ignored, the task end is not correctly scheduled
 > [0.000000] [sd_dotparse/VERBOSE] The schedule is ignored, the task 1 is not correctly scheduled
 > [0.000000] [sd_dotparse/VERBOSE] The task 0 starts on the computer 1 at the position : 1 like the task 2
@@ -245,7 +245,7 @@ $ $SG_TEST_EXENV ./simulate_dot --log=no_loc  "--log=sd_dotparse.thres:verbose"
 > [0.000000] [test/CRITICAL] The dot file with the provided scheduling is wrong, more information with the option : --log=sd_dotparse.thres:verbose
 
 $ $SG_TEST_EXENV ./simulate_dot --log=no_loc ${srcdir:=.}/../2clusters.xml ${srcdir:=.}/dag_with_good_schedule.dot
-> [0.000000] [surf_host/INFO] Switching to the L07 model to handle parallel tasks.
+> [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [0.000000] [test/INFO] ------------------- Display all tasks of the loaded DAG ---------------------------
 > [0.000000] [sd_task/INFO] Displaying task root
 > [0.000000] [sd_task/INFO]   - state: runnable
@@ -493,7 +493,7 @@ $ rm -f ${srcdir:=.}/dag_with_good_schedule.trace
 
 ! expect return 2
 $ $SG_TEST_EXENV ./dot_test --log=no_loc ${srcdir:=.}/../2clusters.xml ${srcdir:=.}/dag_with_cycle.dot
-> [0.000000] [surf_host/INFO] Switching to the L07 model to handle parallel tasks.
+> [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [0.000000] [sd_daxparse/WARNING] the task root is not marked
 > [0.000000] [sd_daxparse/WARNING] the task 0 is in a cycle
 > [0.000000] [sd_daxparse/WARNING] the task 1 is in a cycle

diff --git a/examples/simdag/properties/test_prop.tesh b/examples/simdag/properties/test_prop.tesh
index e554251..5e3323e 100755 (executable)
--- a/examples/simdag/properties/test_prop.tesh
+++ b/examples/simdag/properties/test_prop.tesh
@@ -3,7 +3,7 @@
 p Simple test of simdag with properties
 
 $ $SG_TEST_EXENV properties/sd_prop ${srcdir:=.}/../platforms/prop.xml
-> [0.000000] [surf_host/INFO] Switching to the L07 model to handle parallel tasks.
+> [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [0.000000] [test/INFO] Property list for workstation host1
 > [0.000000] [test/INFO]       Property: mem has value: 4
 > [0.000000] [test/INFO]       Property: NewProp has value: newValue

diff --git a/examples/simdag/scheduling/test_minmin.tesh b/examples/simdag/scheduling/test_minmin.tesh
index 4c51b10..7a04cd3 100644 (file)
--- a/examples/simdag/scheduling/test_minmin.tesh
+++ b/examples/simdag/scheduling/test_minmin.tesh
@@ -3,7 +3,7 @@
 p Simple test of simdag
 
 $ $SG_TEST_EXENV ${bindir:=.}/minmin_test --log=sd_daxparse.thresh:critical ${srcdir:=.}/simulacrum_7_hosts.xml ${srcdir:=.}/Montage_25.xml
-> [0.000000] [surf_host/INFO] Switching to the L07 model to handle parallel tasks.
+> [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [0.000000] [test/INFO] Schedule ID00002@mProjectPP on Host 27
 > [0.000105] [test/INFO] Schedule ID00000@mProjectPP on Host 26
 > [0.000120] [test/INFO] Schedule ID00003@mProjectPP on Host 30

diff --git a/examples/simdag/test_simdag.tesh b/examples/simdag/test_simdag.tesh
index d81c786..02e2a74 100644 (file)
--- a/examples/simdag/test_simdag.tesh
+++ b/examples/simdag/test_simdag.tesh
@@ -3,7 +3,7 @@
 p Simple test of simdag
 
 $ $SG_TEST_EXENV ./sd_test ${srcdir:=.}/../platforms/platform.xml
-> [0.000000] [surf_host/INFO] Switching to the L07 model to handle parallel tasks.
+> [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [0.000000] [sd_test/INFO] Computation time for 2000000.000000 flops on Jacquelin: 0.014563
 > [0.000000] [sd_test/INFO] Computation time for 1000000.000000 flops on Intel: 0.007282
 > [0.000000] [sd_test/INFO] Route between Jacquelin and Intel:

diff --git a/examples/simdag/test_simdag2.tesh b/examples/simdag/test_simdag2.tesh
index 471e20e..fd8d8cb 100644 (file)
--- a/examples/simdag/test_simdag2.tesh
+++ b/examples/simdag/test_simdag2.tesh
@@ -3,5 +3,5 @@
 p Simple test of simdag
 
 $ $SG_TEST_EXENV ./sd_test2 ${srcdir:=.}/2clusters.xml
-> [0.000000] [surf_host/INFO] Switching to the L07 model to handle parallel tasks.
+> [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [3.251960] [sd_test/INFO] Simulation time: 3.251960

diff --git a/examples/simdag/test_simdag_avail.tesh b/examples/simdag/test_simdag_avail.tesh
index c4591ba..42e8ffd 100644 (file)
--- a/examples/simdag/test_simdag_avail.tesh
+++ b/examples/simdag/test_simdag_avail.tesh
@@ -3,7 +3,7 @@
 p Test of the management of availability traces with simdag
 
 $ $SG_TEST_EXENV ${bindir:=.}/sd_avail two_hosts.xml
-> [0.000000] [surf_host/INFO] Switching to the L07 model to handle parallel tasks.
+> [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [1.000000] [sd_avail/INFO] link1: bw=125000000, lat=0.000100
 > [1.000000] [sd_avail/INFO] Jupiter: speed=12500000
 > [1.000000] [sd_avail/INFO] Tremblay: speed=12500000

diff --git a/examples/simdag/test_simdag_comm_throttling.tesh b/examples/simdag/test_simdag_comm_throttling.tesh
index 9136658..fe2dd56 100644 (file)
--- a/examples/simdag/test_simdag_comm_throttling.tesh
+++ b/examples/simdag/test_simdag_comm_throttling.tesh
@@ -3,7 +3,7 @@ p Modify the rate of communication tasks even when they are auto-scheduled
 
 $ $SG_TEST_EXENV ./sd_comm_throttling --cfg=network/TCP_gamma:4194304 ${srcdir:=.}/2clusters.xml
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304'
-> [0.000000] [surf_host/INFO] Switching to the L07 model to handle parallel tasks.
+> [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [1.000000] [sd_comm_throttling/INFO] Simulation stopped after 1.0000 seconds
 > [1.000000] [sd_comm_throttling/INFO] Task 'Task A' start time: 0.000000, finish time: 1.000000
 > [2.080300] [sd_comm_throttling/INFO] Simulation stopped after 2.0803 seconds

diff --git a/examples/simdag/test_simdag_fail.tesh b/examples/simdag/test_simdag_fail.tesh
index 324a4f2..b48924b 100644 (file)
--- a/examples/simdag/test_simdag_fail.tesh
+++ b/examples/simdag/test_simdag_fail.tesh
@@ -3,7 +3,7 @@
 p Test of the management of failed tasks simdag
 
 $ $SG_TEST_EXENV ${bindir:=.}/sd_fail
-> [0.000000] [surf_host/INFO] Switching to the L07 model to handle parallel tasks.
+> [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [0.000000] [sd_fail/INFO] First test: COMP_SEQ task
 > [0.000000] [sd_fail/INFO] Schedule task 'Poor task' on workstation 'Faulty Host'
 > [10.000000] [sd_task/INFO] Displaying task Poor task

diff --git a/examples/simdag/test_simdag_tracing.tesh b/examples/simdag/test_simdag_tracing.tesh
index 0ed15bb..ad92e31 100644 (file)
--- a/examples/simdag/test_simdag_tracing.tesh
+++ b/examples/simdag/test_simdag_tracing.tesh
@@ -6,7 +6,7 @@ p Simple test of simdag
 $ $SG_TEST_EXENV ./simdag_tracing --cfg=tracing:yes --cfg=tracing/categorized:yes ${srcdir:=.}/2clusters.xml
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes'
-> [0.000000] [surf_host/INFO] Switching to the L07 model to handle parallel tasks.
+> [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 
 $ tail -n +3 ./simgrid.trace
 > %EventDef PajeDefineContainerType 0

diff --git a/examples/simdag/test_simdag_typed_tasks.tesh b/examples/simdag/test_simdag_typed_tasks.tesh
index 69a2b64..e9bc8fb 100644 (file)
--- a/examples/simdag/test_simdag_typed_tasks.tesh
+++ b/examples/simdag/test_simdag_typed_tasks.tesh
@@ -3,7 +3,7 @@ p Usage test of simdag's typed tasks
 
 $ $SG_TEST_EXENV ./sd_typed_tasks_test --cfg=network/TCP_gamma:4194304 ${srcdir:=.}/2clusters.xml
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304'
-> [0.000000] [surf_host/INFO] Switching to the L07 model to handle parallel tasks.
+> [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [2.080300] [sd_typed_tasks_test/INFO] Task 'Seq. comp. 1' start time: 0.000000, finish time: 1.000000
 > [2.080300] [sd_typed_tasks_test/INFO] Task 'Par. Comp. 1' start time: 0.000000, finish time: 0.080000
 > [2.080300] [sd_typed_tasks_test/INFO] Task 'Par. Comp. 3' start time: 0.000000, finish time: 0.400000

diff --git a/teshsuite/simdag/availability/availability_test.tesh b/teshsuite/simdag/availability/availability_test.tesh
index e7cee69..1db14b1 100644 (file)
--- a/teshsuite/simdag/availability/availability_test.tesh
+++ b/teshsuite/simdag/availability/availability_test.tesh
@@ -2,7 +2,7 @@
 
 $ simdag/availability/availability_test ${srcdir:=.}/simdag/availability/simulacrum_7_hosts.xml --cfg=path:${srcdir:=.}/simdag/availability/ ${srcdir:=.}/../examples/simdag/scheduling/Montage_25.xml --cfg=network/TCP_gamma:4194304 --log=sd_daxparse.thresh:critical
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304'
-> [0.000000] [surf_host/INFO] Switching to the L07 model to handle parallel tasks.
+> [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > Scheduling DAX...
 > Scheduling root to node: Host 26
 > Scheduling ID00000@mProjectPP to node: Host 27

diff --git a/teshsuite/simdag/platforms/basic_parsing_test.tesh b/teshsuite/simdag/platforms/basic_parsing_test.tesh
index 636b553..3f8e691 100644 (file)
--- a/teshsuite/simdag/platforms/basic_parsing_test.tesh
+++ b/teshsuite/simdag/platforms/basic_parsing_test.tesh
@@ -69,11 +69,11 @@ $ ${bindir:=.}/basic_parsing_test two_hosts_one_link.xml "--log=root.fmt:[%10.6r
 > Workstation number: 2, link number: 2
 
 $ ${bindir:=.}/basic_parsing_test ./four_hosts_floyd.xml
-> [0.000000] [surf_host/INFO] Switching to the L07 model to handle parallel tasks.
+> [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > Workstation number: 4, link number: 5
 
 $ ${bindir:=.}/basic_parsing_test ./four_hosts_floyd_bis.xml
-> [0.000000] [surf_host/INFO] Switching to the L07 model to handle parallel tasks.
+> [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > Workstation number: 5, link number: 7
 
 $ ${bindir:=.}/basic_parsing_test ./properties.xml
@@ -92,11 +92,11 @@ $ ${bindir:=.}/basic_parsing_test ./properties.xml --cfg=cpu/optim:TI
 > Workstation number: 1, link number: 1
 
 $ ${bindir:=.}/basic_parsing_test ./one_cluster_file.xml
-> [0.000000] [surf_host/INFO] Switching to the L07 model to handle parallel tasks.
+> [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > Workstation number: 2, link number: 6
 
 $ ${bindir:=.}/is_router_test ./test_of_is_router.xml
-> [0.000000] [surf_host/INFO] Switching to the L07 model to handle parallel tasks.
+> [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > Workstation number: 10, link number: 1, elmts number: 21
 >    - Seen: "host01" is type : 1
 >    - Seen: "host02" is type : 1

diff --git a/teshsuite/simdag/platforms/basic_parsing_test_bypass.tesh b/teshsuite/simdag/platforms/basic_parsing_test_bypass.tesh
index ff96505..8e91ed5 100644 (file)
--- a/teshsuite/simdag/platforms/basic_parsing_test_bypass.tesh
+++ b/teshsuite/simdag/platforms/basic_parsing_test_bypass.tesh
@@ -3,7 +3,7 @@
 p Testing a bypass ASroute
 ! output sort
 $ ${bindir:=.}/basic_parsing_test ${srcdir:=.}/examples/platforms/bypassASroute.xml FULL_LINK
-> [0.000000] [surf_host/INFO] Switching to the L07 model to handle parallel tasks.
+> [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > Workstation number: 3, link number: 11
 > Route between 1 and 1
 >   Route size 2
@@ -63,7 +63,7 @@ $ ${bindir:=.}/basic_parsing_test ${srcdir:=.}/examples/platforms/bypassASroute.
 p Testing a bypass route
 
 $ ${bindir:=.}/basic_parsing_test ${srcdir:=.}/examples/platforms/bypassRoute.xml FULL_LINK
-> [0.000000] [surf_host/INFO] Switching to the L07 model to handle parallel tasks.
+> [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > Workstation number: 4, link number: 10
 > Route between AS_2_host1 and AS_2_host1
 >   Route size 1

diff --git a/teshsuite/simdag/platforms/get_full_link.tesh b/teshsuite/simdag/platforms/get_full_link.tesh
index a105727..17b7ad4 100644 (file)
--- a/teshsuite/simdag/platforms/get_full_link.tesh
+++ b/teshsuite/simdag/platforms/get_full_link.tesh
@@ -2,7 +2,7 @@
 ! output sort
 
 $ ${bindir:=.}/basic_parsing_test ./four_hosts_floyd.xml FULL_LINK
-> [0.000000] [surf_host/INFO] Switching to the L07 model to handle parallel tasks.
+> [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > Workstation number: 4, link number: 5
 > Route between host1 and host1
 >   Route size 1
@@ -74,7 +74,7 @@ $ ${bindir:=.}/basic_parsing_test ./four_hosts_floyd.xml FULL_LINK
 >   Route latency = 0.000015, route bandwidth = 498000000.000000
 
 $ ${bindir:=.}/basic_parsing_test ./four_hosts_floyd_bis.xml FULL_LINK
-> [0.000000] [surf_host/INFO] Switching to the L07 model to handle parallel tasks.
+> [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > Workstation number: 5, link number: 7
 > Route between host1 and host1
 >   Route size 1