From a2ccb4c7cab4de936283e30beced5b49e519bb41 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 20 Jul 2015 12:10:05 +0200 Subject: [PATCH] cosmetics in the info message of L07 model starting up --- examples/msg/parallel_task/parallel_task.tesh | 4 +- .../simdag/dax/simple_dax_with_cycle.tesh | 2 +- examples/simdag/dax/smalldax.tesh | 2 +- examples/simdag/dot/test_simdag_dotload.tesh | 8 ++-- examples/simdag/properties/test_prop.tesh | 2 +- examples/simdag/scheduling/test_minmin.tesh | 2 +- examples/simdag/test_simdag.tesh | 2 +- examples/simdag/test_simdag2.tesh | 2 +- examples/simdag/test_simdag_avail.tesh | 2 +- .../simdag/test_simdag_comm_throttling.tesh | 2 +- examples/simdag/test_simdag_fail.tesh | 2 +- examples/simdag/test_simdag_seq_access.tesh | 2 +- examples/simdag/test_simdag_tracing.tesh | 2 +- examples/simdag/test_simdag_typed_tasks.tesh | 2 +- src/surf/host_ptask_L07.cpp | 14 +++---- .../availability/availability_test.tesh | 2 +- teshsuite/simdag/basic/basic0.tesh | 2 +- teshsuite/simdag/basic/basic1.tesh | 2 +- teshsuite/simdag/basic/basic2.tesh | 2 +- teshsuite/simdag/basic/basic3.tesh | 2 +- teshsuite/simdag/basic/basic4.tesh | 2 +- teshsuite/simdag/basic/basic5.tesh | 2 +- teshsuite/simdag/basic/basic6.tesh | 2 +- teshsuite/simdag/incomplete/incomplete.tesh | 2 +- .../network/mxn/test_intra_all2all.tesh | 2 +- .../mxn/test_intra_independent_comm.tesh | 2 +- .../network/mxn/test_intra_scatter.tesh | 2 +- .../simdag/network/p2p/test_latency1.tesh | 6 +-- .../simdag/network/p2p/test_latency2.tesh | 6 +-- .../simdag/network/p2p/test_latency3.tesh | 6 +-- .../network/p2p/test_latency_bound.tesh | 2 +- .../simdag/network/test_reinit_costs.tesh | 4 +- .../simdag/partask/test_comp_only_par.tesh | 4 +- .../simdag/partask/test_comp_only_seq.tesh | 2 +- .../simdag/platforms/basic_link_test.tesh | 2 +- .../simdag/platforms/basic_parsing_test.tesh | 42 +++++++++---------- .../platforms/basic_parsing_test_bypass.tesh | 4 +- .../basic_parsing_test_sym_full.tesh | 10 ++--- .../platforms/bogus_disk_attachment.tesh | 2 +- .../platforms/bogus_missing_gateway.tesh | 4 +- .../platforms/bogus_two_hosts_asymetric.tesh | 4 +- teshsuite/simdag/platforms/flatifier.tesh | 40 +++++++++--------- teshsuite/simdag/platforms/get_full_link.tesh | 4 +- 43 files changed, 107 insertions(+), 109 deletions(-) diff --git a/examples/msg/parallel_task/parallel_task.tesh b/examples/msg/parallel_task/parallel_task.tesh index e54ff4a4e8..81e0febdd3 100644 --- a/examples/msg/parallel_task/parallel_task.tesh +++ b/examples/msg/parallel_task/parallel_task.tesh @@ -4,13 +4,13 @@ p Testing a simple master/slave example application ! output sort $ $SG_TEST_EXENV parallel_task/parallel_task$EXEEXT ${srcdir:=.}/../platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > [ 0.009378] (1:test@Fafard) Goodbye now! > [ 0.009378] (0:@) Simulation time 0.00937836 ! output sort $ $SG_TEST_EXENV parallel_task/test_ptask$EXEEXT ${srcdir:=.}/../platforms/small_platform.xml ${srcdir:=.}/parallel_task/test_ptask_deployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > [ 20.625396] (1:execute@Ginette) execution_time=20.6254 > [ 83.232398] (2:redistribute@Ginette) redistribution_time=83.2324 > [ 83.232398] (0:@) Simulation time 83.2324 diff --git a/examples/simdag/dax/simple_dax_with_cycle.tesh b/examples/simdag/dax/simple_dax_with_cycle.tesh index 5af0a7000f..287817017f 100644 --- 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] surf_host_model_init_ptask_L07 +> [0.000000] [surf_host/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 57297a48c5..92908c92c0 100644 --- 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] surf_host_model_init_ptask_L07 +> [0.000000] [surf_host/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 79b64fd7de..2b8a811081 100644 --- 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] surf_host_model_init_ptask_L07 +> [0.000000] [surf_host/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] surf_host_model_init_ptask_L07 +> [0.000000] [surf_host/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] surf_host_model_init_ptask_L07 +> [0.000000] [surf_host/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] surf_host_model_init_ptask_L07 +> [0.000000] [surf_host/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 1a7eca65bf..7c969a52d1 100755 --- 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] surf_host_model_init_ptask_L07 +> [0.000000] [surf_host/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 5734d51ba2..4c51b10a4a 100644 --- 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] surf_host_model_init_ptask_L07 +> [0.000000] [surf_host/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 0ad23c98fd..d81c7868bd 100644 --- 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] surf_host_model_init_ptask_L07 +> [0.000000] [surf_host/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 3c7bad84a7..471e20e6a3 100644 --- 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] surf_host_model_init_ptask_L07 +> [0.000000] [surf_host/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 f2782ac2f0..87134ead5b 100644 --- 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] surf_host_model_init_ptask_L07 +> [0.000000] [surf_host/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: power=12500000 > [1.000000] [sd_avail/INFO] Tremblay: power=12500000 diff --git a/examples/simdag/test_simdag_comm_throttling.tesh b/examples/simdag/test_simdag_comm_throttling.tesh index e36f2c79db..91366589c7 100644 --- 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] surf_host_model_init_ptask_L07 +> [0.000000] [surf_host/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 77ca4cc250..69900106ce 100644 --- 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] surf_host_model_init_ptask_L07 +> [0.000000] [surf_host/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_seq_access.tesh b/examples/simdag/test_simdag_seq_access.tesh index 0c9e7dbb9c..6b6eb66e08 100644 --- a/examples/simdag/test_simdag_seq_access.tesh +++ b/examples/simdag/test_simdag_seq_access.tesh @@ -3,7 +3,7 @@ p Simple test of simdag $ $SG_TEST_EXENV ./sd_seq_access ${srcdir:=.}/2clusters.xml -> [0.000000] [surf_host/INFO] surf_host_model_init_ptask_L07 +> [0.000000] [surf_host/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [sd_workstation/INFO] Displaying workstation C2-05 > [0.000000] [sd_workstation/INFO] - power: 5000000000 > [0.000000] [sd_workstation/INFO] - available power: 1.00 diff --git a/examples/simdag/test_simdag_tracing.tesh b/examples/simdag/test_simdag_tracing.tesh index e9da6761e8..8c50b9fe8d 100644 --- 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] surf_host_model_init_ptask_L07 +> [0.000000] [surf_host/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [sd_seq_access/INFO] Access mode of C2-05 is sequential > [0.000000] [sd_seq_access/INFO] Access mode of C2-06 is sequential > [0.000000] [sd_seq_access/INFO] Task A is currently running on C2-05 (SD_TASK_COMP_SEQ) diff --git a/examples/simdag/test_simdag_typed_tasks.tesh b/examples/simdag/test_simdag_typed_tasks.tesh index 3199f80eda..69a2b6414c 100644 --- 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] surf_host_model_init_ptask_L07 +> [0.000000] [surf_host/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/src/surf/host_ptask_L07.cpp b/src/surf/host_ptask_L07.cpp index 634fd2aac5..53e594bd9f 100644 --- a/src/surf/host_ptask_L07.cpp +++ b/src/surf/host_ptask_L07.cpp @@ -26,20 +26,18 @@ static void ptask_netlink_parse_init(sg_platf_link_cbarg_t link) current_property_set = NULL; } -static void ptask_define_callbacks() +void surf_host_model_init_ptask_L07(void) { + XBT_INFO("Switching to the L07 model to handle parallel tasks."); + xbt_assert(!surf_cpu_model_pm, "CPU model type already defined"); + xbt_assert(!surf_network_model, "network model type already defined"); + + // Define the callbacks to parse the XML sg_platf_host_add_cb(cpu_parse_init); sg_platf_host_add_cb(host_parse_init); sg_platf_link_add_cb(ptask_netlink_parse_init); sg_platf_postparse_add_cb(host_add_traces); -} -void surf_host_model_init_ptask_L07(void) -{ - XBT_INFO("surf_host_model_init_ptask_L07"); - xbt_assert(!surf_cpu_model_pm, "CPU model type already defined"); - xbt_assert(!surf_network_model, "network model type already defined"); - ptask_define_callbacks(); surf_host_model = new HostL07Model(); Model *model = surf_host_model; xbt_dynar_push(model_list, &model); diff --git a/teshsuite/simdag/availability/availability_test.tesh b/teshsuite/simdag/availability/availability_test.tesh index e8458b1df7..e7cee6920d 100644 --- 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] surf_host_model_init_ptask_L07 +> [0.000000] [surf_host/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/basic/basic0.tesh b/teshsuite/simdag/basic/basic0.tesh index 07e39661a3..183303b531 100644 --- a/teshsuite/simdag/basic/basic0.tesh +++ b/teshsuite/simdag/basic/basic0.tesh @@ -1,3 +1,3 @@ $ ${bindir:=.}/basic0 ../../../examples/platforms/two_hosts_platform_shared.xml "--log=root.fmt:[%10.6r]%e%m%n" -> [ 0.000000] surf_host_model_init_ptask_L07 +> [ 0.000000] Switching to the L07 model to handle parallel tasks. > [ 0.800100] Simulation time: 0.800100 diff --git a/teshsuite/simdag/basic/basic1.tesh b/teshsuite/simdag/basic/basic1.tesh index b87dc1faae..1e251eb505 100644 --- a/teshsuite/simdag/basic/basic1.tesh +++ b/teshsuite/simdag/basic/basic1.tesh @@ -1,3 +1,3 @@ $ ${bindir:=.}/basic1 ../../../examples/platforms/two_hosts_platform_shared.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > [ 16.000100] (0:@) Simulation time: 16.000100 diff --git a/teshsuite/simdag/basic/basic2.tesh b/teshsuite/simdag/basic/basic2.tesh index 069f50ffe1..7728ee8437 100644 --- a/teshsuite/simdag/basic/basic2.tesh +++ b/teshsuite/simdag/basic/basic2.tesh @@ -1,3 +1,3 @@ $ ${bindir:=.}/basic2 ../../../examples/platforms/two_hosts_platform_shared.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > [ 8.800100] (0:@) Simulation time: 8.800100 diff --git a/teshsuite/simdag/basic/basic3.tesh b/teshsuite/simdag/basic/basic3.tesh index 55b481a2ba..7c3139c509 100644 --- a/teshsuite/simdag/basic/basic3.tesh +++ b/teshsuite/simdag/basic/basic3.tesh @@ -1,5 +1,5 @@ $ ${bindir:=.}/basic3 ../../../examples/platforms/two_hosts_platform_shared.xml "--log=root.fmt:[%10.6r]%e%m%n" --log=sd_kernel.thresh:verbose -> [ 0.000000] surf_host_model_init_ptask_L07 +> [ 0.000000] Switching to the L07 model to handle parallel tasks. > [ 0.000000] Starting simulation... > [ 0.000000] Run simulation for -1.000000 seconds > [ 0.000000] Executing task 'Task Init' diff --git a/teshsuite/simdag/basic/basic4.tesh b/teshsuite/simdag/basic/basic4.tesh index 6d025c348b..01341d280e 100644 --- a/teshsuite/simdag/basic/basic4.tesh +++ b/teshsuite/simdag/basic/basic4.tesh @@ -1,5 +1,5 @@ $ ${bindir:=.}/basic4 ../../../examples/platforms/two_hosts_platform_shared.xml "--log=root.fmt:[%10.6r]%e%m%n" --log=sd_kernel.thresh:verbose -> [ 0.000000] surf_host_model_init_ptask_L07 +> [ 0.000000] Switching to the L07 model to handle parallel tasks. > [ 0.000000] Starting simulation... > [ 0.000000] Run simulation for -1.000000 seconds > [ 0.000000] Executing task 'Task Init' diff --git a/teshsuite/simdag/basic/basic5.tesh b/teshsuite/simdag/basic/basic5.tesh index 906989d187..55b251bd74 100644 --- a/teshsuite/simdag/basic/basic5.tesh +++ b/teshsuite/simdag/basic/basic5.tesh @@ -1,3 +1,3 @@ $ ${bindir:=.}/basic5 ../../../examples/platforms/two_hosts_platform_shared.xml "--log=root.fmt:[%10.6r]%e%m%n" -> [ 0.000000] surf_host_model_init_ptask_L07 +> [ 0.000000] Switching to the L07 model to handle parallel tasks. > [ 0.002500] Simulation time: 0.002500 diff --git a/teshsuite/simdag/basic/basic6.tesh b/teshsuite/simdag/basic/basic6.tesh index 721e08e7e4..550dd6c8b7 100644 --- a/teshsuite/simdag/basic/basic6.tesh +++ b/teshsuite/simdag/basic/basic6.tesh @@ -1,3 +1,3 @@ $ ${bindir:=.}/basic6 ../network/p2p/platform_2p_1sl.xml "--log=root.fmt:[%10.6r]%e%m%n" -> [ 0.000000] surf_host_model_init_ptask_L07 +> [ 0.000000] Switching to the L07 model to handle parallel tasks. > [ 2.000000] Simulation time: 2.000000 diff --git a/teshsuite/simdag/incomplete/incomplete.tesh b/teshsuite/simdag/incomplete/incomplete.tesh index d5c817e2e6..e98ada5120 100644 --- a/teshsuite/simdag/incomplete/incomplete.tesh +++ b/teshsuite/simdag/incomplete/incomplete.tesh @@ -1,5 +1,5 @@ $ ${bindir:=.}/incomplete ../../../examples/platforms/two_hosts_platform_shared.xml "--log=root.fmt:[%10.6r]%e%m%n" -> [ 0.000000] surf_host_model_init_ptask_L07 +> [ 0.000000] Switching to the L07 model to handle parallel tasks. > [ 8.000100] Simulation is finished but 3 tasks are still not done > [ 8.000100] Task C is in SD_NOT_SCHEDULED state > [ 8.000100] Task B is in SD_SCHEDULABLE state diff --git a/teshsuite/simdag/network/mxn/test_intra_all2all.tesh b/teshsuite/simdag/network/mxn/test_intra_all2all.tesh index 286ff7a96f..af6a3f81e8 100644 --- a/teshsuite/simdag/network/mxn/test_intra_all2all.tesh +++ b/teshsuite/simdag/network/mxn/test_intra_all2all.tesh @@ -3,5 +3,5 @@ p all 2 all test, only fat pipe switch is used concurrently ! output sort $ simdag/network/mxn/test_intra_all2all ${srcdir:=.}/simdag/network/mxn/platform_4p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > 8 diff --git a/teshsuite/simdag/network/mxn/test_intra_independent_comm.tesh b/teshsuite/simdag/network/mxn/test_intra_independent_comm.tesh index de0811d6bc..95b2a62595 100644 --- a/teshsuite/simdag/network/mxn/test_intra_independent_comm.tesh +++ b/teshsuite/simdag/network/mxn/test_intra_independent_comm.tesh @@ -3,5 +3,5 @@ p sending on different paths test ! output sort $ simdag/network/mxn/test_intra_independent_comm ${srcdir:=.}/simdag/network/mxn/platform_4p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > 3 diff --git a/teshsuite/simdag/network/mxn/test_intra_scatter.tesh b/teshsuite/simdag/network/mxn/test_intra_scatter.tesh index 72680c4b93..51cfb1aaeb 100644 --- a/teshsuite/simdag/network/mxn/test_intra_scatter.tesh +++ b/teshsuite/simdag/network/mxn/test_intra_scatter.tesh @@ -3,5 +3,5 @@ p scatter test ! output sort $ simdag/network/mxn/test_intra_scatter ${srcdir:=.}/simdag/network/mxn/platform_4p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > 8 diff --git a/teshsuite/simdag/network/p2p/test_latency1.tesh b/teshsuite/simdag/network/p2p/test_latency1.tesh index a51af45c3f..66109b0aa0 100644 --- a/teshsuite/simdag/network/p2p/test_latency1.tesh +++ b/teshsuite/simdag/network/p2p/test_latency1.tesh @@ -3,19 +3,19 @@ p latency check, 1 byte, shared link ! output sort $ simdag/network/p2p/test_latency1 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > 1.5 p latency check, 1 byte, fat pipe ! output sort $ simdag/network/p2p/test_latency1 ${srcdir:=.}/simdag/network/p2p/platform_2p_1fl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > 1.5 p latency check, 1 byte, link - switch - link ! output sort $ simdag/network/p2p/test_latency1 ${srcdir:=.}/simdag/network/p2p/platform_2p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > 3 diff --git a/teshsuite/simdag/network/p2p/test_latency2.tesh b/teshsuite/simdag/network/p2p/test_latency2.tesh index 7aeb17b062..3ee1a07fa9 100644 --- a/teshsuite/simdag/network/p2p/test_latency2.tesh +++ b/teshsuite/simdag/network/p2p/test_latency2.tesh @@ -3,19 +3,19 @@ p latency check, 2 x 1 byte, same direction, shared link ! output sort $ simdag/network/p2p/test_latency2 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > 2.5 p latency check, 2 x 1 byte, same direction, fat pipe ! output sort $ simdag/network/p2p/test_latency2 ${srcdir:=.}/simdag/network/p2p/platform_2p_1fl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > 1.5 p latency check, 2 x 1 byte, same direction, link - switch - link ! output sort $ simdag/network/p2p/test_latency2 ${srcdir:=.}/simdag/network/p2p/platform_2p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > 4 diff --git a/teshsuite/simdag/network/p2p/test_latency3.tesh b/teshsuite/simdag/network/p2p/test_latency3.tesh index c5f3958d96..7ba096d23d 100644 --- a/teshsuite/simdag/network/p2p/test_latency3.tesh +++ b/teshsuite/simdag/network/p2p/test_latency3.tesh @@ -3,19 +3,19 @@ p latency check, 2 x 1 byte, opposite direction, shared link ! output sort $ simdag/network/p2p/test_latency3 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > 2.5 p latency check, 2 x 1 byte, opposite direction, fat pipe ! output sort $ simdag/network/p2p/test_latency3 ${srcdir:=.}/simdag/network/p2p/platform_2p_1fl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > 1.5 p latency check, 2 x 1 byte, opposite direction, link - switch - link ! output sort $ simdag/network/p2p/test_latency3 ${srcdir:=.}/simdag/network/p2p/platform_2p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > 4 diff --git a/teshsuite/simdag/network/p2p/test_latency_bound.tesh b/teshsuite/simdag/network/p2p/test_latency_bound.tesh index 413e25d4f0..138c7281de 100644 --- a/teshsuite/simdag/network/p2p/test_latency_bound.tesh +++ b/teshsuite/simdag/network/p2p/test_latency_bound.tesh @@ -3,5 +3,5 @@ p latency bounded by large latency link ! output sort $ simdag/network/p2p/test_latency_bound ${srcdir:=.}/simdag/network/p2p/platform_2p_1bb.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > 10001.5 diff --git a/teshsuite/simdag/network/test_reinit_costs.tesh b/teshsuite/simdag/network/test_reinit_costs.tesh index 3ebcb41f07..a126fcf7ca 100644 --- a/teshsuite/simdag/network/test_reinit_costs.tesh +++ b/teshsuite/simdag/network/test_reinit_costs.tesh @@ -3,7 +3,7 @@ p Reinitialization test ! output sort $ simdag/network/test_reinit_costs ${srcdir:=.}/simdag/network/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > 0 -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > 1.5 diff --git a/teshsuite/simdag/partask/test_comp_only_par.tesh b/teshsuite/simdag/partask/test_comp_only_par.tesh index 04eaac4484..1ef2fafcd5 100644 --- a/teshsuite/simdag/partask/test_comp_only_par.tesh +++ b/teshsuite/simdag/partask/test_comp_only_par.tesh @@ -2,11 +2,11 @@ p par task comp only, no comm, homogeneous ! output sort $ simdag/partask/test_comp_only_par ${srcdir:=.}/simdag/partask/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > 1 p par task comp only, no comm, heterogeneous ! output sort $ simdag/partask/test_comp_only_par ${srcdir:=.}/simdag/partask/platform_2p_1sl_hetero.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > 1 diff --git a/teshsuite/simdag/partask/test_comp_only_seq.tesh b/teshsuite/simdag/partask/test_comp_only_seq.tesh index bd31216aee..39fee75e89 100644 --- a/teshsuite/simdag/partask/test_comp_only_seq.tesh +++ b/teshsuite/simdag/partask/test_comp_only_seq.tesh @@ -3,5 +3,5 @@ p seq task comp only, no comm ! output sort $ simdag/partask/test_comp_only_seq ${srcdir:=.}/simdag/partask/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > 1 diff --git a/teshsuite/simdag/platforms/basic_link_test.tesh b/teshsuite/simdag/platforms/basic_link_test.tesh index 0ea13f524a..632a84ff2c 100644 --- a/teshsuite/simdag/platforms/basic_link_test.tesh +++ b/teshsuite/simdag/platforms/basic_link_test.tesh @@ -1,7 +1,7 @@ #! ./tesh $ ${bindir:=.}/basic_link_test one_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > [ 0.000000] (0:@) Link count: 12 > [ 0.000000] (0:@) __loopback__: latency = 0.00002, bandwidth = 498000000.000000 > [ 0.000000] (0:@) bob_cluster_backbone: latency = 0.00050, bandwidth = 2250000000.000000 diff --git a/teshsuite/simdag/platforms/basic_parsing_test.tesh b/teshsuite/simdag/platforms/basic_parsing_test.tesh index bcaa51b8dc..636b553e12 100644 --- a/teshsuite/simdag/platforms/basic_parsing_test.tesh +++ b/teshsuite/simdag/platforms/basic_parsing_test.tesh @@ -1,79 +1,79 @@ ! output sort $ ${bindir:=.}/basic_parsing_test one_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > Workstation number: 5, link number: 12 $ ${bindir:=.}/basic_parsing_test one_host_availability.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > Workstation number: 1, link number: 1 $ ${bindir:=.}/basic_parsing_test one_host_properties.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > Workstation number: 1, link number: 1 $ ${bindir:=.}/basic_parsing_test one_host_state_file.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > Workstation number: 1, link number: 1 $ ${bindir:=.}/basic_parsing_test one_host_state_off.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > Workstation number: 1, link number: 1 $ ${bindir:=.}/basic_parsing_test one_host_state_on.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > Workstation number: 1, link number: 1 $ ${bindir:=.}/basic_parsing_test one_host_trace_file.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > Workstation number: 1, link number: 1 $ ${bindir:=.}/basic_parsing_test one_host_trace_inside.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > Workstation number: 1, link number: 1 $ ${bindir:=.}/basic_parsing_test one_host.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > Workstation number: 1, link number: 1 $ ${bindir:=.}/basic_parsing_test one_link_availability.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > Workstation number: 1, link number: 2 $ ${bindir:=.}/basic_parsing_test one_link_fatpipe.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > Workstation number: 1, link number: 2 $ ${bindir:=.}/basic_parsing_test one_link_shared.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > Workstation number: 1, link number: 2 $ ${bindir:=.}/basic_parsing_test one_link_state_file.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > Workstation number: 1, link number: 2 $ ${bindir:=.}/basic_parsing_test three_hosts_non_symmetric_route.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > Workstation number: 3, link number: 4 $ ${bindir:=.}/basic_parsing_test two_clusters.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > Workstation number: 10, link number: 24 $ ${bindir:=.}/basic_parsing_test two_hosts_multi_hop.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > Workstation number: 2, link number: 4 $ ${bindir:=.}/basic_parsing_test two_hosts_one_link.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > Workstation number: 2, link number: 2 $ ${bindir:=.}/basic_parsing_test ./four_hosts_floyd.xml -> [0.000000] [surf_host/INFO] surf_host_model_init_ptask_L07 +> [0.000000] [surf_host/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] surf_host_model_init_ptask_L07 +> [0.000000] [surf_host/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] surf_host_model_init_ptask_L07 +> [0.000000] [surf_host/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] surf_host_model_init_ptask_L07 +> [0.000000] [surf_host/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 ee7c561413..ff96505dbd 100644 --- 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] surf_host_model_init_ptask_L07 +> [0.000000] [surf_host/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] surf_host_model_init_ptask_L07 +> [0.000000] [surf_host/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/basic_parsing_test_sym_full.tesh b/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh index 957452806e..361ae21666 100644 --- a/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh +++ b/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh @@ -2,7 +2,7 @@ ! output sort $ ${bindir:=.}/basic_parsing_test one_cluster_fullduplex.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > Workstation number: 5, link number: 12 > Route between bob3.hamburger.edu and bob3.hamburger.edu > Route size 3 @@ -156,7 +156,7 @@ $ ${bindir:=.}/basic_parsing_test one_cluster_fullduplex.xml FULL_LINK "--log=ro > Route latency = 0.000600, route bandwidth = 125000000.000000 $ ${bindir:=.}/basic_parsing_test two_clusters_symmetric.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > Workstation number: 4, link number: 12 > Route between bob1.hamburger.edu and bob1.hamburger.edu > Route size 3 @@ -272,7 +272,7 @@ $ ${bindir:=.}/basic_parsing_test two_clusters_symmetric.xml FULL_LINK "--log=ro > Route latency = 0.000600, route bandwidth = 125000000.000000 $ ${bindir:=.}/basic_parsing_test two_hosts_one_link_symmetrical.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > Workstation number: 2, link number: 4 > Route between alice and alice > Route size 1 @@ -296,7 +296,7 @@ $ ${bindir:=.}/basic_parsing_test two_hosts_one_link_symmetrical.xml FULL_LINK " > Route latency = 0.000015, route bandwidth = 498000000.000000 $ ${bindir:=.}/basic_parsing_test two_hosts_one_link_fullduplex.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > Workstation number: 2, link number: 3 > Route between alice and alice > Route size 1 @@ -316,7 +316,7 @@ $ ${bindir:=.}/basic_parsing_test two_hosts_one_link_fullduplex.xml FULL_LINK "- > Route latency = 0.000015, route bandwidth = 498000000.000000 $ ${bindir:=.}/basic_parsing_test Dijkstra.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_host_model_init_ptask_L07 +> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. > Workstation number: 2, link number: 6 > Route between NODO01 and NODO01 > Route size 1 diff --git a/teshsuite/simdag/platforms/bogus_disk_attachment.tesh b/teshsuite/simdag/platforms/bogus_disk_attachment.tesh index 0b928fb05c..ef254d2485 100644 --- a/teshsuite/simdag/platforms/bogus_disk_attachment.tesh +++ b/teshsuite/simdag/platforms/bogus_disk_attachment.tesh @@ -1,5 +1,5 @@ ! expect signal SIGABRT $ ${bindir:=.}/flatifier bogus_disk_attachment.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] surf_host_model_init_ptask_L07 +> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. > [ 0.000000] [0:@] Parse error at bogus_disk_attachment.xml:26: Unable to attach storage cdisk: host plouf doesn't exist. > [ 0.000000] [0:@] Exiting now diff --git a/teshsuite/simdag/platforms/bogus_missing_gateway.tesh b/teshsuite/simdag/platforms/bogus_missing_gateway.tesh index 75f1fd285c..5392c51b8c 100644 --- a/teshsuite/simdag/platforms/bogus_missing_gateway.tesh +++ b/teshsuite/simdag/platforms/bogus_missing_gateway.tesh @@ -1,11 +1,11 @@ ! expect signal SIGABRT $ ${bindir:=.}/flatifier bogus_missing_src_gateway.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] surf_host_model_init_ptask_L07 +> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. > [ 0.000000] [0:@] Parse error at bogus_missing_src_gateway.xml:16: gw_src="nod-cluster_router.cluster.us" not found for ASroute from "us" to "fr" > [ 0.000000] [0:@] Exiting now ! expect signal SIGABRT $ ${bindir:=.}/flatifier bogus_missing_dst_gateway.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] surf_host_model_init_ptask_L07 +> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. > [ 0.000000] [0:@] Parse error at bogus_missing_dst_gateway.xml:16: gw_dst="neud-grappe_router.grappe.fr" not found for ASroute from "us" to "fr" > [ 0.000000] [0:@] Exiting now diff --git a/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.tesh b/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.tesh index c8a97aac4e..c4e90d51fd 100644 --- a/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.tesh +++ b/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.tesh @@ -1,11 +1,11 @@ ! expect signal SIGABRT $ ${bindir:=.}/flatifier bogus_two_hosts_asymetric.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] surf_host_model_init_ptask_L07 +> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. > [ 0.000000] [0:@] Parse error at bogus_two_hosts_asymetric.xml:24: A route between "alice" and "bob" already exists with a different content. If you are trying to define a reverse route, you must set the symmetrical=no attribute to your routes tags. > [ 0.000000] [0:@] Exiting now ! expect signal SIGABRT $ ${bindir:=.}/flatifier bogus_two_hosts_asymetric-2.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] surf_host_model_init_ptask_L07 +> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. > [ 0.000000] [0:@] Parse error at bogus_two_hosts_asymetric-2.xml:26: A route between "alice" and "bob" already exists with a different content. If you are trying to define a reverse route, you must set the symmetrical=no attribute to your routes tags. > [ 0.000000] [0:@] Exiting now diff --git a/teshsuite/simdag/platforms/flatifier.tesh b/teshsuite/simdag/platforms/flatifier.tesh index 710a0ee1ef..d4356e874a 100644 --- a/teshsuite/simdag/platforms/flatifier.tesh +++ b/teshsuite/simdag/platforms/flatifier.tesh @@ -3,7 +3,7 @@ ! output sort $ ${bindir:=.}/flatifier$EXEEXT one_cluster.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] surf_host_model_init_ptask_L07 +> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. > > > @@ -138,7 +138,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_cluster.xml "--log=root.fmt:[%10.6r]%e[%i:%P > $ ${bindir:=.}/flatifier$EXEEXT one_cluster_multicore.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] surf_host_model_init_ptask_L07 +> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. > > > @@ -272,7 +272,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_cluster_multicore.xml "--log=root.fmt:[%10.6 > $ ${bindir:=.}/flatifier$EXEEXT one_host_availability.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] surf_host_model_init_ptask_L07 +> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. > > > @@ -286,7 +286,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_availability.xml "--log=root.fmt:[%10.6 > $ ${bindir:=.}/flatifier$EXEEXT one_host_properties.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] surf_host_model_init_ptask_L07 +> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. > > > @@ -304,7 +304,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_properties.xml "--log=root.fmt:[%10.6r] > $ ${bindir:=.}/flatifier$EXEEXT one_host_state_file.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] surf_host_model_init_ptask_L07 +> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. > > > @@ -318,7 +318,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_state_file.xml "--log=root.fmt:[%10.6r] > $ ${bindir:=.}/flatifier$EXEEXT one_host_state_off.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] surf_host_model_init_ptask_L07 +> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. > > > @@ -332,7 +332,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_state_off.xml "--log=root.fmt:[%10.6r]% > $ ${bindir:=.}/flatifier$EXEEXT one_host_state_on.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] surf_host_model_init_ptask_L07 +> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. > > > @@ -346,7 +346,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_state_on.xml "--log=root.fmt:[%10.6r]%e > $ ${bindir:=.}/flatifier$EXEEXT one_host_trace_file.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] surf_host_model_init_ptask_L07 +> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. > > > @@ -360,7 +360,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_trace_file.xml "--log=root.fmt:[%10.6r] > $ ${bindir:=.}/flatifier$EXEEXT one_host_trace_inside.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] surf_host_model_init_ptask_L07 +> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. > > > @@ -374,7 +374,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_trace_inside.xml "--log=root.fmt:[%10.6 > $ ${bindir:=.}/flatifier$EXEEXT one_host.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] surf_host_model_init_ptask_L07 +> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. > > > @@ -388,7 +388,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h > $ ${bindir:=.}/flatifier$EXEEXT one_link_availability.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] surf_host_model_init_ptask_L07 +> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. > > > @@ -403,7 +403,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_link_availability.xml "--log=root.fmt:[%10.6 > $ ${bindir:=.}/flatifier$EXEEXT one_link_fatpipe.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] surf_host_model_init_ptask_L07 +> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. > > > @@ -418,7 +418,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_link_fatpipe.xml "--log=root.fmt:[%10.6r]%e[ > $ ${bindir:=.}/flatifier$EXEEXT one_link_shared.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] surf_host_model_init_ptask_L07 +> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. > > > @@ -433,7 +433,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_link_shared.xml "--log=root.fmt:[%10.6r]%e[% > $ ${bindir:=.}/flatifier$EXEEXT one_link_state_file.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] surf_host_model_init_ptask_L07 +> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. > > > @@ -448,7 +448,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_link_state_file.xml "--log=root.fmt:[%10.6r] > $ ${bindir:=.}/flatifier$EXEEXT three_hosts_non_symmetric_route.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] surf_host_model_init_ptask_L07 +> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. > > > @@ -491,7 +491,7 @@ $ ${bindir:=.}/flatifier$EXEEXT three_hosts_non_symmetric_route.xml "--log=root. > $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] surf_host_model_init_ptask_L07 +> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. > > > @@ -968,7 +968,7 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:% > $ ${bindir:=.}/flatifier$EXEEXT two_hosts_multi_hop.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] surf_host_model_init_ptask_L07 +> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. > > > @@ -995,7 +995,7 @@ $ ${bindir:=.}/flatifier$EXEEXT two_hosts_multi_hop.xml "--log=root.fmt:[%10.6r] > $ ${bindir:=.}/flatifier$EXEEXT two_hosts_one_link.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] surf_host_model_init_ptask_L07 +> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. > > > @@ -1020,7 +1020,7 @@ $ ${bindir:=.}/flatifier$EXEEXT two_hosts_one_link.xml "--log=root.fmt:[%10.6r]% > $ ${bindir:=.}/flatifier$EXEEXT ${srcdir:=.}/examples/platforms/bypassASroute.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] surf_host_model_init_ptask_L07 +> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. > > > @@ -1155,7 +1155,7 @@ $ ${bindir:=.}/flatifier$EXEEXT ${srcdir:=.}/examples/platforms/bypassASroute.xm $ ${bindir:=.}/flatifier$EXEEXT ${srcdir:=.}/examples/platforms/torus_cluster.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] surf_host_model_init_ptask_L07 +> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. > > > diff --git a/teshsuite/simdag/platforms/get_full_link.tesh b/teshsuite/simdag/platforms/get_full_link.tesh index 53d363476b..a10572797f 100644 --- 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] surf_host_model_init_ptask_L07 +> [0.000000] [surf_host/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] surf_host_model_init_ptask_L07 +> [0.000000] [surf_host/INFO] Switching to the L07 model to handle parallel tasks. > Workstation number: 5, link number: 7 > Route between host1 and host1 > Route size 1 -- 2.20.1