From: Paul Bédaride Date: Mon, 7 Jul 2014 14:51:33 +0000 (+0200) Subject: Xml platform cleaning teshsuite/msg X-Git-Tag: v3_12~922 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/7cad4f0d54aafeabb7ee95007fc370514c4923a9 Xml platform cleaning teshsuite/msg --- diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index e4d0f42ece..78d8f14f6b 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -1220,6 +1220,7 @@ set(PLATFORMS_EXAMPLES examples/platforms/torus_cluster.xml examples/platforms/two_hosts_platform.xml examples/platforms/two_hosts_platform_with_availability.xml + examples/platforms/two_hosts_platform_with_availability_included.xml examples/platforms/two_peers.xml examples/platforms/vivaldi.xml ) diff --git a/examples/platforms/trace/trace_B.txt b/examples/platforms/trace/trace_B.txt index 8dc74704d1..e94c2554a2 100644 --- a/examples/platforms/trace/trace_B.txt +++ b/examples/platforms/trace/trace_B.txt @@ -1,4 +1,4 @@ -PERIODICITY 7.00 +PERIODICITY 10.00 0.0 1.0 -11.0 1.0 -30.0 1.0 +10.0 0.8 +20.0 0.4 diff --git a/examples/platforms/two_hosts_platform_with_availability.xml b/examples/platforms/two_hosts_platform_with_availability.xml index 5378b5fb22..99b0c576e7 100644 --- a/examples/platforms/two_hosts_platform_with_availability.xml +++ b/examples/platforms/two_hosts_platform_with_availability.xml @@ -2,8 +2,8 @@ - - + + diff --git a/examples/platforms/two_hosts_platform_with_availability_included.xml b/examples/platforms/two_hosts_platform_with_availability_included.xml new file mode 100644 index 0000000000..88e4b72a51 --- /dev/null +++ b/examples/platforms/two_hosts_platform_with_availability_included.xml @@ -0,0 +1,27 @@ + + + + +0.0 1.0 +11.0 0.5 +20.0 0.9 + + +1.0 -1.0 +2.0 1.0 + + +0.0 1.0 +10.0 0.8 +20.0 0.4 + + + + + + + + + + + diff --git a/src/simix/smx_user.c b/src/simix/smx_user.c index c65710d43e..4ddc246d25 100644 --- a/src/simix/smx_user.c +++ b/src/simix/smx_user.c @@ -437,7 +437,7 @@ int simcall_vm_get_state(smx_host_t vm) */ void *simcall_vm_get_pm(smx_host_t vm) { - /* will jump to SIMIX_pre_vm_migrate in src/simix/smx_smurf_private.h */ + /* will jump to SIMIX_pre_vm_get_pm in src/simix/smx_smurf_private.h */ return simcall_BODY_vm_get_pm(vm); } diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp index 10f16cf52e..38717da785 100644 --- a/src/surf/cpu_ti.cpp +++ b/src/surf/cpu_ti.cpp @@ -31,7 +31,7 @@ CpuTiTrace::CpuTiTrace(tmgr_trace_t power_trace) (xbt_dynar_length(power_trace->s_list.event_list) + 1)); p_integral = (double*) xbt_malloc0(sizeof(double) * (xbt_dynar_length(power_trace->s_list.event_list) + 1)); - m_nbPoints = xbt_dynar_length(power_trace->s_list.event_list); + m_nbPoints = xbt_dynar_length(power_trace->s_list.event_list) + 1; xbt_dynar_foreach(power_trace->s_list.event_list, cpt, val) { p_timePoints[i] = time; p_integral[i] = integral; diff --git a/teshsuite/bug-17132/CMakeLists.txt b/teshsuite/bug-17132/CMakeLists.txt index 87b5a824ea..8cc6e77b54 100644 --- a/teshsuite/bug-17132/CMakeLists.txt +++ b/teshsuite/bug-17132/CMakeLists.txt @@ -6,8 +6,8 @@ if(enable_smpi) else() set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") endif() - - + + set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") @@ -21,7 +21,6 @@ if(enable_smpi) PARENT_SCOPE) set(xml_files ${xml_files} - ${CMAKE_CURRENT_SOURCE_DIR}/small_platform.xml PARENT_SCOPE) set(teshsuite_src ${teshsuite_src} @@ -35,5 +34,5 @@ if(enable_smpi) ${CMAKE_CURRENT_SOURCE_DIR}/hostfile.txt ${CMAKE_CURRENT_SOURCE_DIR}/README PARENT_SCOPE) - + endif(enable_smpi) diff --git a/teshsuite/bug-17132/bug-17132-surf-debug.tesh b/teshsuite/bug-17132/bug-17132-surf-debug.tesh index 92568830d9..c089cff44c 100644 --- a/teshsuite/bug-17132/bug-17132-surf-debug.tesh +++ b/teshsuite/bug-17132/bug-17132-surf-debug.tesh @@ -1,2 +1,2 @@ ! output ignore -$ ../../smpi_script/bin/smpirun -np 16 -platform ${srcdir:=.}/small_platform.xml -hostfile ${srcdir:=.}/hostfile.txt ./bug-17132 --cfg=smpi/cpu_threshold:-1 --log=surf.thres:debug +$ ../../smpi_script/bin/smpirun -np 16 -platform ${srcdir:=.}/../../examples/platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile.txt ./bug-17132 --cfg=smpi/cpu_threshold:-1 --log=surf.thres:debug diff --git a/teshsuite/bug-17132/bug-17132.tesh b/teshsuite/bug-17132/bug-17132.tesh index 16c5e008ae..e674c4f0df 100644 --- a/teshsuite/bug-17132/bug-17132.tesh +++ b/teshsuite/bug-17132/bug-17132.tesh @@ -1,4 +1,4 @@ -$ ../../smpi_script/bin/smpirun -np 16 -platform ${srcdir:=.}/small_platform.xml -hostfile ${srcdir:=.}/hostfile.txt ./bug-17132 --cfg=smpi/cpu_threshold:-1 --log=smpi_kernel.thres:warning +$ ../../smpi_script/bin/smpirun -np 16 -platform ${srcdir:=.}/../../examples/platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile.txt ./bug-17132 --cfg=smpi/cpu_threshold:-1 --log=smpi_kernel.thres:warning > You requested to use 16 processes, but there is only 2 processes in your hostfile... > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'maxmin/precision' to '1e-3' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' @@ -6,4 +6,4 @@ $ ../../smpi_script/bin/smpirun -np 16 -platform ${srcdir:=.}/small_platform.xml > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/cpu_threshold' to '-1' > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s) -> Walltime = 0.00212779 +> Walltime = 0.37183 diff --git a/teshsuite/bug-17132/hostfile.txt b/teshsuite/bug-17132/hostfile.txt index 994b3e2cfc..3ab05f5e72 100644 --- a/teshsuite/bug-17132/hostfile.txt +++ b/teshsuite/bug-17132/hostfile.txt @@ -1,2 +1,2 @@ -host1 -host2 +Tremblay +Jupiter diff --git a/teshsuite/bug-17132/small_platform.xml b/teshsuite/bug-17132/small_platform.xml deleted file mode 100644 index a2b420d810..0000000000 --- a/teshsuite/bug-17132/small_platform.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/teshsuite/msg/CMakeLists.txt b/teshsuite/msg/CMakeLists.txt index 4a75a53042..8a8ce53a13 100644 --- a/teshsuite/msg/CMakeLists.txt +++ b/teshsuite/msg/CMakeLists.txt @@ -17,6 +17,7 @@ set(teshsuite_src PARENT_SCOPE ) set(bin_files + ${bin_files} PARENT_SCOPE ) diff --git a/teshsuite/msg/get_sender/CMakeLists.txt b/teshsuite/msg/get_sender/CMakeLists.txt index d785a82f0d..39bfe70915 100644 --- a/teshsuite/msg/get_sender/CMakeLists.txt +++ b/teshsuite/msg/get_sender/CMakeLists.txt @@ -15,7 +15,6 @@ set(tesh_files set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/get_sender_d.xml - ${CMAKE_CURRENT_SOURCE_DIR}/get_sender_p.xml PARENT_SCOPE ) set(teshsuite_src diff --git a/teshsuite/msg/get_sender/get_sender.tesh b/teshsuite/msg/get_sender/get_sender.tesh index be07f366b2..d6a0c952af 100644 --- a/teshsuite/msg/get_sender/get_sender.tesh +++ b/teshsuite/msg/get_sender/get_sender.tesh @@ -1,6 +1,6 @@ ! output sort -$ ./get_sender ${srcdir:=.}/get_sender_p.xml ${srcdir:=.}/get_sender_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (1:send@toto) Sending -> [ 0.000000] (2:receive@toto) Receiving -> [ 0.000000] (2:receive@toto) Got a message sent by 'send' -> [ 1.000000] (1:send@toto) Exiting +$ ./get_sender ${srcdir:=.}/../../../examples/platforms/small_platform.xml ${srcdir:=.}/get_sender_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +> [ 0.000000] (1:send@Tremblay) Sending +> [ 0.000000] (2:receive@Tremblay) Receiving +> [ 0.000195] (2:receive@Tremblay) Got a message sent by 'send' +> [ 1.000195] (1:send@Tremblay) Exiting diff --git a/teshsuite/msg/get_sender/get_sender_d.xml b/teshsuite/msg/get_sender/get_sender_d.xml index 0763eab4bf..9ae95b37ed 100644 --- a/teshsuite/msg/get_sender/get_sender_d.xml +++ b/teshsuite/msg/get_sender/get_sender_d.xml @@ -2,6 +2,6 @@ - - + + diff --git a/teshsuite/msg/get_sender/get_sender_p.xml b/teshsuite/msg/get_sender/get_sender_p.xml deleted file mode 100644 index 05064f07c2..0000000000 --- a/teshsuite/msg/get_sender/get_sender_p.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/teshsuite/msg/host_on_off/CMakeLists.txt b/teshsuite/msg/host_on_off/CMakeLists.txt index 5230929fbd..7f9719cdb7 100644 --- a/teshsuite/msg/host_on_off/CMakeLists.txt +++ b/teshsuite/msg/host_on_off/CMakeLists.txt @@ -15,7 +15,6 @@ set(tesh_files set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/host_on_off_d.xml - ${CMAKE_CURRENT_SOURCE_DIR}/host_on_off_p.xml PARENT_SCOPE ) set(teshsuite_src diff --git a/teshsuite/msg/host_on_off/host_on_off.tesh b/teshsuite/msg/host_on_off/host_on_off.tesh index 0c75055be3..530f668974 100644 --- a/teshsuite/msg/host_on_off/host_on_off.tesh +++ b/teshsuite/msg/host_on_off/host_on_off.tesh @@ -1,13 +1,13 @@ -$ ./host_on_off ${srcdir:=.}/host_on_off_p.xml ${srcdir:=.}/host_on_off_d.xml +$ ./host_on_off ${srcdir:=.}/../../../examples/platforms/small_platform.xml ${srcdir:=.}/host_on_off_d.xml > [Tremblay:master:(1) 0.000000] [msg_test/INFO] Sending "task on" -> [Jupiter:slave:(2) 0.682345] [msg_test/INFO] Task "task on" done -> [Tremblay:master:(1) 1.027003] [msg_test/INFO] Sending "task off" -> [Tremblay:master:(1) 2.027003] [msg_test/INFO] Sending "task on without proc" -> [Tremblay:master:(1) 3.027003] [msg_test/INFO] Sending "task on with proc" -> [Tremblay:master:(1) 3.054005] [msg_test/INFO] Sending "finalize" -> [Jupiter:slave:(3) 3.709348] [msg_test/INFO] Task "task on with proc" done -> [Tremblay:master:(1) 3.710127] [msg_test/INFO] Goodbye now! -> [Jupiter:slave:(3) 3.710127] [msg_test/INFO] I'm done. See you! -> [3.710127] [msg_test/INFO] Simulation time 3.71013 +> [Jupiter:slave:(2) 0.824497] [msg_test/INFO] Task "task on" done +> [Tremblay:master:(1) 1.169155] [msg_test/INFO] Sending "task off" +> [Tremblay:master:(1) 2.169155] [msg_test/INFO] Sending "task on without proc" +> [Tremblay:master:(1) 3.169155] [msg_test/INFO] Sending "task on with proc" +> [Tremblay:master:(1) 3.338309] [msg_test/INFO] Sending "finalize" +> [Jupiter:slave:(3) 3.993652] [msg_test/INFO] Task "task on with proc" done +> [Tremblay:master:(1) 4.012666] [msg_test/INFO] Goodbye now! +> [Jupiter:slave:(3) 4.012666] [msg_test/INFO] I'm done. See you! +> [4.012666] [msg_test/INFO] Simulation time 4.01267 diff --git a/teshsuite/msg/host_on_off/host_on_off_p.xml b/teshsuite/msg/host_on_off/host_on_off_p.xml deleted file mode 100644 index 1947841342..0000000000 --- a/teshsuite/msg/host_on_off/host_on_off_p.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/teshsuite/msg/pid/CMakeLists.txt b/teshsuite/msg/pid/CMakeLists.txt index 6dee881663..a19568af0d 100644 --- a/teshsuite/msg/pid/CMakeLists.txt +++ b/teshsuite/msg/pid/CMakeLists.txt @@ -19,7 +19,6 @@ set(tesh_files set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/pid_d.xml - ${CMAKE_CURRENT_SOURCE_DIR}/pid_p.xml PARENT_SCOPE ) set(teshsuite_src diff --git a/teshsuite/msg/pid/pid.tesh b/teshsuite/msg/pid/pid.tesh index 0a551860b1..54c1a3d1c1 100644 --- a/teshsuite/msg/pid/pid.tesh +++ b/teshsuite/msg/pid/pid.tesh @@ -1,27 +1,27 @@ -$ ./pid ${srcdir:=.}/pid_p.xml ${srcdir:=.}/pid_d.xml 0 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (1:sendpid@toto) Sending pid of "1". -> [ 0.000000] (2:sendpid@toto) Sending pid of "2". -> [ 0.000000] (3:sendpid@toto) Sending pid of "3". -> [ 0.001082] (4:killall@toto) Killing process "1". -> [ 0.001082] (1:sendpid@toto) Send of pid "1" done. -> [ 0.001082] (1:sendpid@toto) Process "1" killed. -> [ 0.002165] (2:sendpid@toto) Send of pid "2" done. -> [ 0.002165] (4:killall@toto) Killing process "2". -> [ 0.002165] (2:sendpid@toto) Process "2" killed. -> [ 0.003247] (3:sendpid@toto) Send of pid "3" done. -> [ 0.003247] (4:killall@toto) Killing process "3". -> [ 0.003247] (3:sendpid@toto) Process "3" killed. +$ ./pid ${srcdir:=.}/../../../examples/platforms/small_platform.xml ${srcdir:=.}/pid_d.xml 0 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +> [ 0.000000] (1:sendpid@Tremblay) Sending pid of "1". +> [ 0.000000] (2:sendpid@Tremblay) Sending pid of "2". +> [ 0.000000] (3:sendpid@Tremblay) Sending pid of "3". +> [ 0.000402] (4:killall@Tremblay) Killing process "1". +> [ 0.000402] (1:sendpid@Tremblay) Send of pid "1" done. +> [ 0.000402] (1:sendpid@Tremblay) Process "1" killed. +> [ 0.000804] (2:sendpid@Tremblay) Send of pid "2" done. +> [ 0.000804] (4:killall@Tremblay) Killing process "2". +> [ 0.000804] (2:sendpid@Tremblay) Process "2" killed. +> [ 0.001206] (3:sendpid@Tremblay) Send of pid "3" done. +> [ 0.001206] (4:killall@Tremblay) Killing process "3". +> [ 0.001206] (3:sendpid@Tremblay) Process "3" killed. -$ ./pid ${srcdir:=.}/pid_p.xml ${srcdir:=.}/pid_d.xml 2 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (2:sendpid@toto) Sending pid of "2". -> [ 0.000000] (3:sendpid@toto) Sending pid of "3". -> [ 0.000000] (4:sendpid@toto) Sending pid of "4". -> [ 0.001082] (5:killall@toto) Killing process "2". -> [ 0.001082] (2:sendpid@toto) Send of pid "2" done. -> [ 0.001082] (2:sendpid@toto) Process "2" killed. -> [ 0.002165] (3:sendpid@toto) Send of pid "3" done. -> [ 0.002165] (5:killall@toto) Killing process "3". -> [ 0.002165] (3:sendpid@toto) Process "3" killed. -> [ 0.003247] (4:sendpid@toto) Send of pid "4" done. -> [ 0.003247] (5:killall@toto) Killing process "4". -> [ 0.003247] (4:sendpid@toto) Process "4" killed. +$ ./pid ${srcdir:=.}/../../../examples/platforms/small_platform.xml ${srcdir:=.}/pid_d.xml 2 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +> [ 0.000000] (2:sendpid@Tremblay) Sending pid of "2". +> [ 0.000000] (3:sendpid@Tremblay) Sending pid of "3". +> [ 0.000000] (4:sendpid@Tremblay) Sending pid of "4". +> [ 0.000402] (5:killall@Tremblay) Killing process "2". +> [ 0.000402] (2:sendpid@Tremblay) Send of pid "2" done. +> [ 0.000402] (2:sendpid@Tremblay) Process "2" killed. +> [ 0.000804] (3:sendpid@Tremblay) Send of pid "3" done. +> [ 0.000804] (5:killall@Tremblay) Killing process "3". +> [ 0.000804] (3:sendpid@Tremblay) Process "3" killed. +> [ 0.001206] (4:sendpid@Tremblay) Send of pid "4" done. +> [ 0.001206] (5:killall@Tremblay) Killing process "4". +> [ 0.001206] (4:sendpid@Tremblay) Process "4" killed. diff --git a/teshsuite/msg/pid/pid_d.xml b/teshsuite/msg/pid/pid_d.xml index 7475570b65..f1c9122f39 100644 --- a/teshsuite/msg/pid/pid_d.xml +++ b/teshsuite/msg/pid/pid_d.xml @@ -2,8 +2,8 @@ - - - - + + + + diff --git a/teshsuite/msg/pid/pid_p.xml b/teshsuite/msg/pid/pid_p.xml deleted file mode 100644 index 50cf472681..0000000000 --- a/teshsuite/msg/pid/pid_p.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/teshsuite/msg/process/CMakeLists.txt b/teshsuite/msg/process/CMakeLists.txt index 95b67c80a3..05fb130e2a 100644 --- a/teshsuite/msg/process/CMakeLists.txt +++ b/teshsuite/msg/process/CMakeLists.txt @@ -15,7 +15,6 @@ set(tesh_files set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/process_d.xml - ${CMAKE_CURRENT_SOURCE_DIR}/process_p.xml PARENT_SCOPE ) set(teshsuite_src diff --git a/teshsuite/msg/process/process.tesh b/teshsuite/msg/process/process.tesh index c8ab7f7758..f45ddb707c 100644 --- a/teshsuite/msg/process/process.tesh +++ b/teshsuite/msg/process/process.tesh @@ -1,5 +1,5 @@ -$ ./process ${srcdir:=.}/process_p.xml ${srcdir:=.}/process_d.xml +$ ./process ${srcdir:=.}/../../../examples/platforms/small_platform.xml ${srcdir:=.}/process_d.xml > [Tremblay:slave:(2) 0.500000] [msg_test/INFO] Slave started (PID:2, PPID:0) > [Tremblay:slave:(2) 0.500000] [msg_test/INFO] Plop i am not suspended > [Tremblay:master:(1) 1.000000] [msg_test/INFO] Process(pid=1, ppid=0, name=master) diff --git a/teshsuite/msg/process/process_p.xml b/teshsuite/msg/process/process_p.xml deleted file mode 100644 index 90e976acee..0000000000 --- a/teshsuite/msg/process/process_p.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/teshsuite/msg/process_join/CMakeLists.txt b/teshsuite/msg/process_join/CMakeLists.txt index bca2830b7b..a7de14eb39 100644 --- a/teshsuite/msg/process_join/CMakeLists.txt +++ b/teshsuite/msg/process_join/CMakeLists.txt @@ -15,7 +15,6 @@ set(tesh_files set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/process_join_d.xml - ${CMAKE_CURRENT_SOURCE_DIR}/process_join_p.xml PARENT_SCOPE ) set(teshsuite_src diff --git a/teshsuite/msg/process_join/process_join.tesh b/teshsuite/msg/process_join/process_join.tesh index e48c49a411..1afe5644cd 100644 --- a/teshsuite/msg/process_join/process_join.tesh +++ b/teshsuite/msg/process_join/process_join.tesh @@ -1,5 +1,5 @@ -$ ./process_join$EXEEXT ${srcdir:=.}/process_join_p.xml ${srcdir:=.}/process_join_d.xml +$ ./process_join$EXEEXT ${srcdir:=.}/../../../examples/platforms/small_platform.xml ${srcdir:=.}/process_join_d.xml > [Tremblay:master:(1) 0.000000] [msg_test/INFO] Start slave > [Tremblay:slave from master:(2) 0.000000] [msg_test/INFO] Slave started > [Tremblay:master:(1) 0.000000] [msg_test/INFO] Join the slave (timeout 2) diff --git a/teshsuite/msg/process_join/process_join_p.xml b/teshsuite/msg/process_join/process_join_p.xml deleted file mode 100644 index 90e976acee..0000000000 --- a/teshsuite/msg/process_join/process_join_p.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/teshsuite/msg/storage/CMakeLists.txt b/teshsuite/msg/storage/CMakeLists.txt index 7a217aba02..223bd665f1 100644 --- a/teshsuite/msg/storage/CMakeLists.txt +++ b/teshsuite/msg/storage/CMakeLists.txt @@ -21,9 +21,7 @@ set(tesh_files ) set(xml_files ${xml_files} - ${CMAKE_CURRENT_SOURCE_DIR}/platform.xml ${CMAKE_CURRENT_SOURCE_DIR}/deployment.xml - ${CMAKE_CURRENT_SOURCE_DIR}/one_host_platform.xml PARENT_SCOPE ) set(teshsuite_src @@ -38,8 +36,5 @@ set(bin_files ) set(txt_files ${txt_files} - ${CMAKE_CURRENT_SOURCE_DIR}/storage_content_c.txt - ${CMAKE_CURRENT_SOURCE_DIR}/storage_content_s1.txt - ${CMAKE_CURRENT_SOURCE_DIR}/storage_content_s2.txt PARENT_SCOPE ) diff --git a/teshsuite/msg/storage/deployment.xml b/teshsuite/msg/storage/deployment.xml index dab6a8c907..d4303cba5d 100644 --- a/teshsuite/msg/storage/deployment.xml +++ b/teshsuite/msg/storage/deployment.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/teshsuite/msg/storage/one_host_platform.xml b/teshsuite/msg/storage/one_host_platform.xml deleted file mode 100644 index e4262df9f7..0000000000 --- a/teshsuite/msg/storage/one_host_platform.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/teshsuite/msg/storage/platform.xml b/teshsuite/msg/storage/platform.xml deleted file mode 100644 index 22a4876cb9..0000000000 --- a/teshsuite/msg/storage/platform.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/teshsuite/msg/storage/storage_basic.c b/teshsuite/msg/storage/storage_basic.c index 77577dc50b..034a0ee72f 100644 --- a/teshsuite/msg/storage/storage_basic.c +++ b/teshsuite/msg/storage/storage_basic.c @@ -153,14 +153,14 @@ void dump_platform_storages(void){ int client(int argc, char *argv[]) { - hsm_put("server","/sd1/doc/simgrid/examples/cxx/autoDestination/FinalizeTask.cxx","/sd2/scratch/toto.cxx"); - hsm_put("server","/sd1/doc/simgrid/examples/cxx/autoDestination/autoDestination_deployment.xml","/sd2/scratch/titi.xml"); - hsm_put("server","/sd1/doc/simgrid/examples/cxx/autoDestination/Slave.cxx","/sd2/scratch/tata.cxx"); + hsm_put("alice","/home/doc/simgrid/examples/msg/icomms/small_platform.xml","c:\\Windows\\toto.cxx"); + hsm_put("alice","/home/doc/simgrid/examples/msg/parallel_task/test_ptask_deployment.xml","c:\\Windows\\titi.xml"); + hsm_put("alice","/home/doc/simgrid/examples/msg/alias/masterslave_forwarder_with_alias.c","c:\\Windows\\tata.c"); msg_task_t finalize = MSG_task_create("finalize", 0, 0, NULL); - MSG_task_send(finalize, "server"); + MSG_task_send(finalize, "alice"); - get_set_storage_data("cdisk"); + get_set_storage_data("Disk1"); return 1; } diff --git a/teshsuite/msg/storage/storage_basic.tesh b/teshsuite/msg/storage/storage_basic.tesh index 2b6e0f98ca..111fd23af5 100644 --- a/teshsuite/msg/storage/storage_basic.tesh +++ b/teshsuite/msg/storage/storage_basic.tesh @@ -1,63 +1,109 @@ -$ ./storage_basic$EXEEXT --cfg=path:${srcdir:=.} ${srcdir:=.}/platform.xml ${srcdir:=.}/deployment.xml 0 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (1:server@server) *** Storage info on server *** -> [ 0.000000] (1:server@server) Storage name: sdisk1, mount name: /sd1 -> [ 0.000000] (1:server@server) Free size: 322122547160 bytes -> [ 0.000000] (1:server@server) Used size: 40 bytes -> [ 0.000000] (1:server@server) Properties of mounted storage: sdisk1 -> [ 0.000000] (1:server@server) 'usage' -> 'File system' -> [ 0.000000] (1:server@server) *** Dump a storage element *** -> [ 0.000000] (1:server@server) Print the content of the storage element: sdisk1 -> [ 0.000000] (1:server@server) /doc/simgrid/examples/cxx/autoDestination/Master.cxx size: 10 bytes -> [ 0.000000] (1:server@server) /doc/simgrid/examples/cxx/basic/FinalizeTask.cxx size: 10 bytes -> [ 0.000000] (1:server@server) /doc/simgrid/examples/cxx/autoDestination/Forwarder.cxx size: 10 bytes -> [ 0.000000] (1:server@server) /doc/simgrid/examples/cxx/autoDestination/autoDestination_platform.xml size: 10 bytes -> [ 0.000000] (1:server@server) Storage name: sdisk2, mount name: /sd2 -> [ 0.000000] (1:server@server) Free size: 805306367980 bytes -> [ 0.000000] (1:server@server) Used size: 20 bytes -> [ 0.000000] (1:server@server) Properties of mounted storage: sdisk2 -> [ 0.000000] (1:server@server) 'usage' -> 'Cache' -> [ 0.000000] (1:server@server) *** Dump a storage element *** -> [ 0.000000] (1:server@server) Print the content of the storage element: sdisk2 -> [ 0.000000] (1:server@server) /doc/simgrid/examples/cxx/basic/Main.cxx size: 10 bytes -> [ 0.000000] (1:server@server) /doc/simgrid/examples/cxx/basic/Slave.cxx size: 10 bytes -> [ 0.000000] (1:server@server) Server waiting for transfers ... -> [ 0.005000] (2:client@client) client has read 500001 on /sd1/doc/simgrid/examples/cxx/autoDestination/FinalizeTask.cxx -> [ 0.005000] (2:client@client) client sends 500001 to server -> [ 0.026647] (1:server@server) 500001 bytes on 500001 bytes have been written by server on /sd1 -> [ 0.417980] (2:client@client) client has read 800000 on /sd1/doc/simgrid/examples/cxx/autoDestination/autoDestination_deployment.xml -> [ 0.417980] (2:client@client) client sends 800000 to server -> [ 0.452225] (1:server@server) 800000 bytes on 800000 bytes have been written by server on /sd1 -> [ 1.283559] (2:client@client) client has read 45800000 on /sd1/doc/simgrid/examples/cxx/autoDestination/Slave.cxx -> [ 1.283559] (2:client@client) client sends 45800000 to server -> [ 3.207494] (1:server@server) 45800000 bytes on 45800000 bytes have been written by server on /sd1 -> [ 3.208145] (2:client@client) *** GET/SET DATA for storage element: cdisk *** -> [ 3.208145] (2:client@client) Get data: '(null)' -> [ 3.208145] (2:client@client) Set and get data: 'Some data' -> [ 3.208145] (1:server@server) *** Storage info on server *** -> [ 3.208145] (1:server@server) Storage name: sdisk1, mount name: /sd1 -> [ 3.208145] (1:server@server) Free size: 322122547160 bytes -> [ 3.208145] (1:server@server) Used size: 40 bytes -> [ 3.208145] (1:server@server) Properties of mounted storage: sdisk1 -> [ 3.208145] (1:server@server) 'usage' -> 'File system' -> [ 3.208145] (1:server@server) *** Dump a storage element *** -> [ 3.208145] (1:server@server) Print the content of the storage element: sdisk1 -> [ 3.208145] (1:server@server) /doc/simgrid/examples/cxx/autoDestination/Master.cxx size: 10 bytes -> [ 3.208145] (1:server@server) /doc/simgrid/examples/cxx/basic/FinalizeTask.cxx size: 10 bytes -> [ 3.208145] (1:server@server) /doc/simgrid/examples/cxx/autoDestination/Forwarder.cxx size: 10 bytes -> [ 3.208145] (1:server@server) /doc/simgrid/examples/cxx/autoDestination/autoDestination_platform.xml size: 10 bytes -> [ 3.208145] (1:server@server) Storage name: sdisk2, mount name: /sd2 -> [ 3.208145] (1:server@server) Free size: 805259267979 bytes -> [ 3.208145] (1:server@server) Used size: 47100021 bytes -> [ 3.208145] (1:server@server) Properties of mounted storage: sdisk2 -> [ 3.208145] (1:server@server) 'usage' -> 'Cache' -> [ 3.208145] (1:server@server) *** Dump a storage element *** -> [ 3.208145] (1:server@server) Print the content of the storage element: sdisk2 -> [ 3.208145] (1:server@server) /scratch/titi.xml size: 800000 bytes -> [ 3.208145] (1:server@server) /scratch/tata.cxx size: 45800000 bytes -> [ 3.208145] (1:server@server) /doc/simgrid/examples/cxx/basic/Main.cxx size: 10 bytes -> [ 3.208145] (1:server@server) /scratch/toto.cxx size: 500001 bytes -> [ 3.208145] (1:server@server) /doc/simgrid/examples/cxx/basic/Slave.cxx size: 10 bytes -> [ 3.208145] (1:server@server) Storage cdisk is attached to client -> [ 3.208145] (1:server@server) Storage sdisk1 is attached to server -> [ 3.208145] (1:server@server) Storage sdisk2 is attached to server -> [ 3.208145] (0:@) Simulated time: 3.20814 +$ ./storage_basic$EXEEXT --cfg=path:${srcdir:=.} ${srcdir:=.}/../../../examples/platforms/storage.xml ${srcdir:=.}/deployment.xml 0 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +> [ 0.000000] (0:@) The custom configuration 'path' is already defined by user! +> [ 0.000000] (1:server@alice) *** Storage info on alice *** +> [ 0.000000] (1:server@alice) Storage name: Disk2, mount name: c: +> [ 0.000000] (1:server@alice) Free size: 534479374867 bytes +> [ 0.000000] (1:server@alice) Used size: 2391537133 bytes +> [ 0.000000] (1:server@alice) No property attached. +> [ 0.000000] (1:server@alice) *** Dump a storage element *** +> [ 0.000000] (1:server@alice) Print the content of the storage element: Disk2 +> [ 0.000000] (1:server@alice) \Windows\win.ini size: 92 bytes +> [ 0.000000] (1:server@alice) \Windows\mib.bin size: 43131 bytes +> [ 0.000000] (1:server@alice) \Windows\DtcInstall.log size: 1955 bytes +> [ 0.000000] (1:server@alice) \Windows\vmgcoinstall.log size: 1585 bytes +> [ 0.000000] (1:server@alice) \Windows\Starter.xml size: 31537 bytes +> [ 0.000000] (1:server@alice) \Windows\_isusr32.dll size: 180320 bytes +> [ 0.000000] (1:server@alice) \Windows\winhlp32.exe size: 10752 bytes +> [ 0.000000] (1:server@alice) \Windows\setuperr.log size: 0 bytes +> [ 0.000000] (1:server@alice) \Windows\system.ini size: 219 bytes +> [ 0.000000] (1:server@alice) \Windows\hapint.exe size: 382056 bytes +> [ 0.000000] (1:server@alice) \Windows\Professional.xml size: 31881 bytes +> [ 0.000000] (1:server@alice) \Windows\regedit.exe size: 159232 bytes +> [ 0.000000] (1:server@alice) \Windows\setupact.log size: 101663 bytes +> [ 0.000000] (1:server@alice) \Windows\WindowsUpdate.log size: 1518934 bytes +> [ 0.000000] (1:server@alice) \Windows\explorer.exe size: 2380944 bytes +> [ 0.000000] (1:server@alice) \Windows\DirectX.log size: 10486 bytes +> [ 0.000000] (1:server@alice) \Windows\WMSysPr9.prx size: 316640 bytes +> [ 0.000000] (1:server@alice) \Windows\PFRO.log size: 6770 bytes +> [ 0.000000] (1:server@alice) \Windows\csup.txt size: 12 bytes +> [ 0.000000] (1:server@alice) \Windows\WLXPGSS.SCR size: 322048 bytes +> [ 0.000000] (1:server@alice) \Windows\avastSS.scr size: 41664 bytes +> [ 0.000000] (1:server@alice) \Windows\font1.sii size: 4907 bytes +> [ 0.000000] (1:server@alice) \Windows\write.exe size: 10752 bytes +> [ 0.000000] (1:server@alice) \Windows\font2.sii size: 8698 bytes +> [ 0.000000] (1:server@alice) \Windows\CoreSingleLanguage.xml size: 31497 bytes +> [ 0.000000] (1:server@alice) \Windows\dchcfg64.exe size: 335464 bytes +> [ 0.000000] (1:server@alice) \Windows\notepad.exe size: 243712 bytes +> [ 0.000000] (1:server@alice) \Windows\HelpPane.exe size: 883712 bytes +> [ 0.000000] (1:server@alice) \Windows\hh.exe size: 17408 bytes +> [ 0.000000] (1:server@alice) \Windows\DPINST.LOG size: 18944 bytes +> [ 0.000000] (1:server@alice) \Windows\bfsvc.exe size: 75264 bytes +> [ 0.000000] (1:server@alice) \Windows\splwow64.exe size: 126464 bytes +> [ 0.000000] (1:server@alice) \Windows\MEMORY.DMP size: 2384027342 bytes +> [ 0.000000] (1:server@alice) \Windows\dcmdev64.exe size: 93288 bytes +> [ 0.000000] (1:server@alice) \Windows\twain_32.dll size: 50176 bytes +> [ 0.000000] (1:server@alice) \Windows\bootstat.dat size: 67584 bytes +> [ 0.000000] (1:server@alice) Server waiting for transfers ... +> [ 0.000010] (2:client@bob) bob has read 972 on /home/doc/simgrid/examples/msg/icomms/small_platform.xml +> [ 0.000010] (2:client@bob) bob sends 972 to alice +> [ 0.001986] (1:server@alice) 972 bytes on 972 bytes have been written by alice on /sd1 +> [ 0.401976] (2:client@bob) bob has read 654 on /home/doc/simgrid/examples/msg/parallel_task/test_ptask_deployment.xml +> [ 0.401976] (2:client@bob) bob sends 654 to alice +> [ 0.403944] (1:server@alice) 654 bytes on 654 bytes have been written by alice on /sd1 +> [ 0.803996] (2:client@bob) bob has read 6217 on /home/doc/simgrid/examples/msg/alias/masterslave_forwarder_with_alias.c +> [ 0.803996] (2:client@bob) bob sends 6217 to alice +> [ 0.806104] (1:server@alice) 6217 bytes on 6217 bytes have been written by alice on /sd1 +> [ 1.207952] (1:server@alice) *** Storage info on alice *** +> [ 1.207952] (2:client@bob) *** GET/SET DATA for storage element: Disk1 *** +> [ 1.207952] (2:client@bob) Get data: '(null)' +> [ 1.207952] (2:client@bob) Set and get data: 'Some data' +> [ 1.207952] (1:server@alice) Storage name: Disk2, mount name: c: +> [ 1.207952] (1:server@alice) Free size: 534479367024 bytes +> [ 1.207952] (1:server@alice) Used size: 2391544976 bytes +> [ 1.207952] (1:server@alice) No property attached. +> [ 1.207952] (1:server@alice) *** Dump a storage element *** +> [ 1.207952] (1:server@alice) Print the content of the storage element: Disk2 +> [ 1.207952] (1:server@alice) \Windows\titi.xml size: 654 bytes +> [ 1.207952] (1:server@alice) \Windows\win.ini size: 92 bytes +> [ 1.207952] (1:server@alice) \Windows\mib.bin size: 43131 bytes +> [ 1.207952] (1:server@alice) \Windows\DtcInstall.log size: 1955 bytes +> [ 1.207952] (1:server@alice) \Windows\vmgcoinstall.log size: 1585 bytes +> [ 1.207952] (1:server@alice) \Windows\Starter.xml size: 31537 bytes +> [ 1.207952] (1:server@alice) \Windows\_isusr32.dll size: 180320 bytes +> [ 1.207952] (1:server@alice) \Windows\winhlp32.exe size: 10752 bytes +> [ 1.207952] (1:server@alice) \Windows\setuperr.log size: 0 bytes +> [ 1.207952] (1:server@alice) \Windows\system.ini size: 219 bytes +> [ 1.207952] (1:server@alice) \Windows\hapint.exe size: 382056 bytes +> [ 1.207952] (1:server@alice) \Windows\Professional.xml size: 31881 bytes +> [ 1.207952] (1:server@alice) \Windows\regedit.exe size: 159232 bytes +> [ 1.207952] (1:server@alice) \Windows\setupact.log size: 101663 bytes +> [ 1.207952] (1:server@alice) \Windows\WindowsUpdate.log size: 1518934 bytes +> [ 1.207952] (1:server@alice) \Windows\explorer.exe size: 2380944 bytes +> [ 1.207952] (1:server@alice) \Windows\DirectX.log size: 10486 bytes +> [ 1.207952] (1:server@alice) \Windows\WMSysPr9.prx size: 316640 bytes +> [ 1.207952] (1:server@alice) \Windows\PFRO.log size: 6770 bytes +> [ 1.207952] (1:server@alice) \Windows\toto.cxx size: 972 bytes +> [ 1.207952] (1:server@alice) \Windows\csup.txt size: 12 bytes +> [ 1.207952] (1:server@alice) \Windows\WLXPGSS.SCR size: 322048 bytes +> [ 1.207952] (1:server@alice) \Windows\avastSS.scr size: 41664 bytes +> [ 1.207952] (1:server@alice) \Windows\font1.sii size: 4907 bytes +> [ 1.207952] (1:server@alice) \Windows\write.exe size: 10752 bytes +> [ 1.207952] (1:server@alice) \Windows\font2.sii size: 8698 bytes +> [ 1.207952] (1:server@alice) \Windows\CoreSingleLanguage.xml size: 31497 bytes +> [ 1.207952] (1:server@alice) \Windows\dchcfg64.exe size: 335464 bytes +> [ 1.207952] (1:server@alice) \Windows\notepad.exe size: 243712 bytes +> [ 1.207952] (1:server@alice) \Windows\tata.c size: 6217 bytes +> [ 1.207952] (1:server@alice) \Windows\HelpPane.exe size: 883712 bytes +> [ 1.207952] (1:server@alice) \Windows\hh.exe size: 17408 bytes +> [ 1.207952] (1:server@alice) \Windows\DPINST.LOG size: 18944 bytes +> [ 1.207952] (1:server@alice) \Windows\bfsvc.exe size: 75264 bytes +> [ 1.207952] (1:server@alice) \Windows\splwow64.exe size: 126464 bytes +> [ 1.207952] (1:server@alice) \Windows\MEMORY.DMP size: 2384027342 bytes +> [ 1.207952] (1:server@alice) \Windows\dcmdev64.exe size: 93288 bytes +> [ 1.207952] (1:server@alice) \Windows\twain_32.dll size: 50176 bytes +> [ 1.207952] (1:server@alice) \Windows\bootstat.dat size: 67584 bytes +> [ 1.207952] (1:server@alice) Storage Disk1 is attached to bob +> [ 1.207952] (1:server@alice) Storage Disk2 is attached to alice +> [ 1.207952] (1:server@alice) Storage Disk3 is attached to carl +> [ 1.207952] (1:server@alice) Storage Disk4 is attached to denise +> [ 1.207952] (0:@) Simulated time: 1.20795 diff --git a/teshsuite/msg/storage/storage_content_c.txt b/teshsuite/msg/storage/storage_content_c.txt deleted file mode 100644 index e495e7e3c4..0000000000 --- a/teshsuite/msg/storage/storage_content_c.txt +++ /dev/null @@ -1,5 +0,0 @@ -/doc/simgrid/examples/cxx/autoDestination/FinalizeTask.cxx 500001 -/doc/simgrid/examples/cxx/autoDestination/autoDestination_deployment.xml 800000 -/doc/simgrid/examples/cxx/autoDestination/Main.cxx 75000000 -/doc/simgrid/examples/cxx/autoDestination/Slave.cxx 45800000 -/doc/simgrid/examples/cxx/autoDestination/BasicTask.cxx 400000 diff --git a/teshsuite/msg/storage/storage_content_s1.txt b/teshsuite/msg/storage/storage_content_s1.txt deleted file mode 100644 index f2adbfbd6c..0000000000 --- a/teshsuite/msg/storage/storage_content_s1.txt +++ /dev/null @@ -1,4 +0,0 @@ -/doc/simgrid/examples/cxx/autoDestination/Master.cxx 10 -/doc/simgrid/examples/cxx/autoDestination/autoDestination_platform.xml 10 -/doc/simgrid/examples/cxx/autoDestination/Forwarder.cxx 10 -/doc/simgrid/examples/cxx/basic/FinalizeTask.cxx 10 diff --git a/teshsuite/msg/storage/storage_content_s2.txt b/teshsuite/msg/storage/storage_content_s2.txt deleted file mode 100644 index e1497a00b3..0000000000 --- a/teshsuite/msg/storage/storage_content_s2.txt +++ /dev/null @@ -1,2 +0,0 @@ -/doc/simgrid/examples/cxx/basic/Main.cxx 10 -/doc/simgrid/examples/cxx/basic/Slave.cxx 10 \ No newline at end of file diff --git a/teshsuite/msg/task_destroy_cancel/CMakeLists.txt b/teshsuite/msg/task_destroy_cancel/CMakeLists.txt index 565498c0c9..97968dcf19 100644 --- a/teshsuite/msg/task_destroy_cancel/CMakeLists.txt +++ b/teshsuite/msg/task_destroy_cancel/CMakeLists.txt @@ -15,7 +15,6 @@ set(tesh_files set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/task_destroy_cancel_d.xml - ${CMAKE_CURRENT_SOURCE_DIR}/task_destroy_cancel_p.xml PARENT_SCOPE ) set(teshsuite_src diff --git a/teshsuite/msg/task_destroy_cancel/task_destroy_cancel.tesh b/teshsuite/msg/task_destroy_cancel/task_destroy_cancel.tesh index 07f0c68887..40648995b7 100644 --- a/teshsuite/msg/task_destroy_cancel/task_destroy_cancel.tesh +++ b/teshsuite/msg/task_destroy_cancel/task_destroy_cancel.tesh @@ -1,18 +1,18 @@ -$ ./task_destroy_cancel ${srcdir:=.}/task_destroy_cancel_p.xml ${srcdir:=.}/task_destroy_cancel_d.xml +$ ./task_destroy_cancel ${srcdir:=.}/../../../examples/platforms/small_platform.xml ${srcdir:=.}/task_destroy_cancel_d.xml > [Tremblay:master:(1) 0.000000] [msg_test/INFO] Sending task: "normal" -> [Jupiter:slave:(2) 0.027003] [msg_test/INFO] Handling task "normal" -> [Tremblay:master:(1) 0.027003] [msg_test/INFO] Canceling task "cancel directly" directly -> [Tremblay:master:(1) 0.027003] [msg_test/INFO] Destroying task "destroy directly" directly -> [Tremblay:master:(1) 0.027003] [msg_test/INFO] Canceling task "cancel" during comm -> [Tremblay:master:(1) 0.027003] [msg_test/INFO] Destroying task "finalize" during comm -> [Jupiter:slave:(2) 0.682345] [msg_test/INFO] Task "normal" done in 0.655342 (amount 0.000000) -> [Jupiter:slave:(2) 0.709348] [msg_test/INFO] Handling task "cancel" -> [Jupiter:worker1:(3) 0.709348] [msg_test/INFO] Start cancel -> [Jupiter:slave:(2) 0.809348] [msg_test/INFO] Canceling task "cancel" -> [Jupiter:worker1:(3) 0.810127] [msg_test/INFO] Task failed -> [Tremblay:master:(1) 0.836350] [msg_test/INFO] Goodbye now! -> [Jupiter:slave:(2) 0.836350] [msg_test/INFO] Handling task "finalize" -> [Jupiter:slave:(2) 0.836350] [msg_test/INFO] Destroying task "finalize" -> [Jupiter:slave:(2) 0.836350] [msg_test/INFO] I'm done. See you! -> [0.836350] [msg_test/INFO] Simulation time 0.83635 +> [Jupiter:slave:(2) 0.169155] [msg_test/INFO] Handling task "normal" +> [Tremblay:master:(1) 0.169155] [msg_test/INFO] Canceling task "cancel directly" directly +> [Tremblay:master:(1) 0.169155] [msg_test/INFO] Destroying task "destroy directly" directly +> [Tremblay:master:(1) 0.169155] [msg_test/INFO] Canceling task "cancel" during comm +> [Tremblay:master:(1) 0.169155] [msg_test/INFO] Destroying task "finalize" during comm +> [Jupiter:slave:(2) 0.824497] [msg_test/INFO] Task "normal" done in 0.655342 (amount 0.000000) +> [Jupiter:slave:(2) 0.993652] [msg_test/INFO] Handling task "cancel" +> [Jupiter:worker1:(3) 0.993652] [msg_test/INFO] Start cancel +> [Jupiter:slave:(2) 1.093652] [msg_test/INFO] Canceling task "cancel" +> [Jupiter:worker1:(3) 1.112666] [msg_test/INFO] Task failed +> [Tremblay:master:(1) 1.262806] [msg_test/INFO] Goodbye now! +> [Jupiter:slave:(2) 1.262806] [msg_test/INFO] Handling task "finalize" +> [Jupiter:slave:(2) 1.262806] [msg_test/INFO] Destroying task "finalize" +> [Jupiter:slave:(2) 1.262806] [msg_test/INFO] I'm done. See you! +> [1.262806] [msg_test/INFO] Simulation time 1.26281 diff --git a/teshsuite/msg/task_destroy_cancel/task_destroy_cancel_p.xml b/teshsuite/msg/task_destroy_cancel/task_destroy_cancel_p.xml deleted file mode 100644 index 1947841342..0000000000 --- a/teshsuite/msg/task_destroy_cancel/task_destroy_cancel_p.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/teshsuite/msg/trace/CMakeLists.txt b/teshsuite/msg/trace/CMakeLists.txt index 40b8e09aaf..761bddc016 100644 --- a/teshsuite/msg/trace/CMakeLists.txt +++ b/teshsuite/msg/trace/CMakeLists.txt @@ -14,19 +14,18 @@ set(tesh_files ) set(xml_files ${xml_files} - ${CMAKE_CURRENT_SOURCE_DIR}/platform.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platform_trace.xml - ${CMAKE_CURRENT_SOURCE_DIR}/test10.xml - ${CMAKE_CURRENT_SOURCE_DIR}/test11.xml - ${CMAKE_CURRENT_SOURCE_DIR}/test1.xml - ${CMAKE_CURRENT_SOURCE_DIR}/test2.xml - ${CMAKE_CURRENT_SOURCE_DIR}/test3.xml - ${CMAKE_CURRENT_SOURCE_DIR}/test4.xml - ${CMAKE_CURRENT_SOURCE_DIR}/test5.xml - ${CMAKE_CURRENT_SOURCE_DIR}/test6.xml - ${CMAKE_CURRENT_SOURCE_DIR}/test7.xml - ${CMAKE_CURRENT_SOURCE_DIR}/test8.xml - ${CMAKE_CURRENT_SOURCE_DIR}/test9.xml + ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1.0-hbp1.0-hbp1.0.xml + ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1.0-hbp3.0-hbp4.0.xml + ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1.5-hbp1.5.xml + ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1-c0s0-c0s1.xml + ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1-c0s0-c1s0.xml + ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1-c0s1-c0s2.xml + ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1-c0s1-c2s2.xml + ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1-c0s2-c1s0.xml + ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1-c0s2-c1s1.xml + ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1-c1s1-c1s2.xml + ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1-c1s1-c3s2.xml + ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp2.5-hbp1.5.xml PARENT_SCOPE ) set(teshsuite_src @@ -40,6 +39,5 @@ set(bin_files ) set(txt_files ${txt_files} - ${CMAKE_CURRENT_SOURCE_DIR}/file.trace PARENT_SCOPE ) diff --git a/teshsuite/msg/trace/file.trace b/teshsuite/msg/trace/file.trace deleted file mode 100644 index bbaec1cb29..0000000000 --- a/teshsuite/msg/trace/file.trace +++ /dev/null @@ -1,8 +0,0 @@ -PERIODICITY 10 - 0 0.5 -10 0.5 -20 1.00 -30 0.5 -40 0.5 -50 0.5 -60 0.5 diff --git a/teshsuite/msg/trace/platform.xml b/teshsuite/msg/trace/platform.xml deleted file mode 100644 index 5038245b64..0000000000 --- a/teshsuite/msg/trace/platform.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/teshsuite/msg/trace/platform_trace.xml b/teshsuite/msg/trace/platform_trace.xml deleted file mode 100644 index 5913d93eb7..0000000000 --- a/teshsuite/msg/trace/platform_trace.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - -0 0.5 -10 0.5 -20 1.00 -30 0.5 -40 0.5 -50 0.5 -60 0.5 - - - - - - - - diff --git a/teshsuite/msg/trace/test4.xml b/teshsuite/msg/trace/test-hbp1-c0s0-c0s1.xml similarity index 65% rename from teshsuite/msg/trace/test4.xml rename to teshsuite/msg/trace/test-hbp1-c0s0-c0s1.xml index e331e2f31d..59999f3cd0 100644 --- a/teshsuite/msg/trace/test4.xml +++ b/teshsuite/msg/trace/test-hbp1-c0s0-c0s1.xml @@ -1,8 +1,8 @@ - - + + diff --git a/teshsuite/msg/trace/test2.xml b/teshsuite/msg/trace/test-hbp1-c0s0-c1s0.xml similarity index 65% rename from teshsuite/msg/trace/test2.xml rename to teshsuite/msg/trace/test-hbp1-c0s0-c1s0.xml index 7e24cc28e8..c31b162bbc 100644 --- a/teshsuite/msg/trace/test2.xml +++ b/teshsuite/msg/trace/test-hbp1-c0s0-c1s0.xml @@ -1,8 +1,8 @@ - - + + diff --git a/teshsuite/msg/trace/test5.xml b/teshsuite/msg/trace/test-hbp1-c0s1-c0s2.xml similarity index 65% rename from teshsuite/msg/trace/test5.xml rename to teshsuite/msg/trace/test-hbp1-c0s1-c0s2.xml index 681d4d6dbe..f98849c3ea 100644 --- a/teshsuite/msg/trace/test5.xml +++ b/teshsuite/msg/trace/test-hbp1-c0s1-c0s2.xml @@ -1,8 +1,8 @@ - - + + diff --git a/teshsuite/msg/trace/test3.xml b/teshsuite/msg/trace/test-hbp1-c0s1-c2s2.xml similarity index 65% rename from teshsuite/msg/trace/test3.xml rename to teshsuite/msg/trace/test-hbp1-c0s1-c2s2.xml index 2ab04795d0..6b23c8dda6 100644 --- a/teshsuite/msg/trace/test3.xml +++ b/teshsuite/msg/trace/test-hbp1-c0s1-c2s2.xml @@ -1,8 +1,8 @@ - - + + diff --git a/teshsuite/msg/trace/test-hbp1-c0s2-c1s0.xml b/teshsuite/msg/trace/test-hbp1-c0s2-c1s0.xml new file mode 100644 index 0000000000..941e807221 --- /dev/null +++ b/teshsuite/msg/trace/test-hbp1-c0s2-c1s0.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/teshsuite/msg/trace/test-hbp1-c0s2-c1s1.xml b/teshsuite/msg/trace/test-hbp1-c0s2-c1s1.xml new file mode 100644 index 0000000000..554cc8f7cf --- /dev/null +++ b/teshsuite/msg/trace/test-hbp1-c0s2-c1s1.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/teshsuite/msg/trace/test-hbp1-c1s1-c1s2.xml b/teshsuite/msg/trace/test-hbp1-c1s1-c1s2.xml new file mode 100644 index 0000000000..df79a2144e --- /dev/null +++ b/teshsuite/msg/trace/test-hbp1-c1s1-c1s2.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/teshsuite/msg/trace/test-hbp1-c1s1-c3s2.xml b/teshsuite/msg/trace/test-hbp1-c1s1-c3s2.xml new file mode 100644 index 0000000000..6948020a6d --- /dev/null +++ b/teshsuite/msg/trace/test-hbp1-c1s1-c3s2.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/teshsuite/msg/trace/test9.xml b/teshsuite/msg/trace/test-hbp1.0-hbp1.0-hbp1.0.xml similarity index 51% rename from teshsuite/msg/trace/test9.xml rename to teshsuite/msg/trace/test-hbp1.0-hbp1.0-hbp1.0.xml index 2993950477..11be5034d4 100644 --- a/teshsuite/msg/trace/test9.xml +++ b/teshsuite/msg/trace/test-hbp1.0-hbp1.0-hbp1.0.xml @@ -1,16 +1,16 @@ - - + + - - + + - - + + diff --git a/teshsuite/msg/trace/test-hbp1.0-hbp3.0-hbp4.0.xml b/teshsuite/msg/trace/test-hbp1.0-hbp3.0-hbp4.0.xml new file mode 100644 index 0000000000..a2b9898ed1 --- /dev/null +++ b/teshsuite/msg/trace/test-hbp1.0-hbp3.0-hbp4.0.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/teshsuite/msg/trace/test7.xml b/teshsuite/msg/trace/test-hbp1.5-hbp1.5.xml similarity index 53% rename from teshsuite/msg/trace/test7.xml rename to teshsuite/msg/trace/test-hbp1.5-hbp1.5.xml index 286a978f0e..a409a31859 100644 --- a/teshsuite/msg/trace/test7.xml +++ b/teshsuite/msg/trace/test-hbp1.5-hbp1.5.xml @@ -1,12 +1,12 @@ - - + + - - + + diff --git a/teshsuite/msg/trace/test-hbp2.5-hbp1.5.xml b/teshsuite/msg/trace/test-hbp2.5-hbp1.5.xml new file mode 100644 index 0000000000..cb16f35469 --- /dev/null +++ b/teshsuite/msg/trace/test-hbp2.5-hbp1.5.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/teshsuite/msg/trace/test1.xml b/teshsuite/msg/trace/test1.xml deleted file mode 100644 index 51986ba9f4..0000000000 --- a/teshsuite/msg/trace/test1.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/teshsuite/msg/trace/test10.xml b/teshsuite/msg/trace/test10.xml deleted file mode 100644 index 4a5bf8728f..0000000000 --- a/teshsuite/msg/trace/test10.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/teshsuite/msg/trace/test11.xml b/teshsuite/msg/trace/test11.xml deleted file mode 100644 index 077795ee9b..0000000000 --- a/teshsuite/msg/trace/test11.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/teshsuite/msg/trace/test6.xml b/teshsuite/msg/trace/test6.xml deleted file mode 100644 index c86c015068..0000000000 --- a/teshsuite/msg/trace/test6.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/teshsuite/msg/trace/test8.xml b/teshsuite/msg/trace/test8.xml deleted file mode 100644 index c3c6e9082b..0000000000 --- a/teshsuite/msg/trace/test8.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/teshsuite/msg/trace/test_trace_integration.c b/teshsuite/msg/trace/test_trace_integration.c index 2974e68233..96ddc4cc89 100644 --- a/teshsuite/msg/trace/test_trace_integration.c +++ b/teshsuite/msg/trace/test_trace_integration.c @@ -43,7 +43,6 @@ int test_trace(int argc, char *argv[]) XBT_INFO("Test finished"); - return 0; } diff --git a/teshsuite/msg/trace/trace.tesh b/teshsuite/msg/trace/trace.tesh index f843ad4cb2..853cfdd5d6 100644 --- a/teshsuite/msg/trace/trace.tesh +++ b/teshsuite/msg/trace/trace.tesh @@ -1,165 +1,226 @@ #! ./tesh +p c=cycle s=step p=priority h=host -p Testing trace integration using file.trace and test1.xml, a < max(time), b < max(time) +p Testing trace integration using trace_B.txt and test-hbp1-c0s0-c0s1.xml, test_trace:start == trace_cycle_0_step_0, test_trace:end < trace_cycle_0_step_1 ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ./platform.xml ./test1.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./test-hbp1-c0s0-c0s1.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' -> [ 10.000000] (1:test_trace@CPU1) Testing the trace integration cpu model: CpuTI -> [ 10.000000] (1:test_trace@CPU1) Task size: 400.000000 -> [ 10.000000] (1:test_trace@CPU1) Task prio: 1.000000 -> [ 40.000000] (1:test_trace@CPU1) Test finished +> [ 0.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI +> [ 0.000000] (1:test_trace@Cpu B) Task size: 40.000000 +> [ 0.000000] (1:test_trace@Cpu B) Task prio: 1.000000 +> [ 4.000000] (1:test_trace@Cpu B) Test finished -p Testing trace integration using file.trace and test2.xml, a < max(time), max(time) < b < 2 max(time) +p Testing trace integration using trace_B.txt and test-hbp1-c0s1-c0s2.xml, test_trace:start == trace_cycle_0_step_1, test_trace:end < trace_cycle_0_step_2 ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ./platform.xml ./test2.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./test-hbp1-c0s1-c0s2.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' -> [ 10.000000] (1:test_trace@CPU1) Testing the trace integration cpu model: CpuTI -> [ 10.000000] (1:test_trace@CPU1) Task size: 850.000000 -> [ 10.000000] (1:test_trace@CPU1) Task prio: 1.000000 -> [ 85.000000] (1:test_trace@CPU1) Test finished +> [ 10.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI +> [ 10.000000] (1:test_trace@Cpu B) Task size: 40.000000 +> [ 10.000000] (1:test_trace@Cpu B) Task prio: 1.000000 +> [ 15.000000] (1:test_trace@Cpu B) Test finished -p Testing trace integration using file.trace and test3.xml, a < max(time), b > 2 max(time) +p Testing trace integration using trace_B.txt and test-hbp1-c0s2-c1s0.xml, test_trace:start == trace_cycle_0_step_2, test_trace:end < trace_cycle_1_step_0 ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ./platform.xml ./test3.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./test-hbp1-c0s2-c1s0.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' -> [ 10.000000] (1:test_trace@CPU1) Testing the trace integration cpu model: CpuTI -> [ 10.000000] (1:test_trace@CPU1) Task size: 1980.000000 -> [ 10.000000] (1:test_trace@CPU1) Task prio: 1.000000 -> [178.000000] (1:test_trace@CPU1) Test finished +> [ 20.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI +> [ 20.000000] (1:test_trace@Cpu B) Task size: 40.000000 +> [ 20.000000] (1:test_trace@Cpu B) Task prio: 1.000000 +> [ 30.000000] (1:test_trace@Cpu B) Test finished -p Testing trace integration using file.trace and test4.xml, max(time) < a < 2max(time), max(time) < b < 2max(time) +p Testing trace integration using trace_B.txt and test-hbp1-c0s0-c1s0.xml, test_trace:start == trace_cycle_0_step_0, test_trace:end < trace_cycle_1_step_0 ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ./platform.xml ./test4.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./test-hbp1-c0s0-c1s0.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' -> [ 80.000000] (1:test_trace@CPU1) Testing the trace integration cpu model: CpuTI -> [ 80.000000] (1:test_trace@CPU1) Task size: 400.000000 -> [ 80.000000] (1:test_trace@CPU1) Task prio: 1.000000 -> [110.000000] (1:test_trace@CPU1) Test finished +> [ 0.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI +> [ 0.000000] (1:test_trace@Cpu B) Task size: 220.000000 +> [ 0.000000] (1:test_trace@Cpu B) Task prio: 1.000000 +> [ 30.000000] (1:test_trace@Cpu B) Test finished -p Testing trace integration using file.trace and test5.xml, max(time) < a < 2max(time), 2max(time) < b < 3max(time) +p Testing trace integration using trace_B.txt and test-hbp1-c0s2-c1s1.xml, test_trace:start == trace_cycle_0_step_2, test_trace:end < trace_cycle_1_step_1 ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ./platform.xml ./test5.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./test-hbp1-c0s2-c1s1.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' -> [ 90.000000] (1:test_trace@CPU1) Testing the trace integration cpu model: CpuTI -> [ 90.000000] (1:test_trace@CPU1) Task size: 850.000000 -> [ 90.000000] (1:test_trace@CPU1) Task prio: 1.000000 -> [162.500000] (1:test_trace@CPU1) Test finished +> [ 20.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI +> [ 20.000000] (1:test_trace@Cpu B) Task size: 140.000000 +> [ 20.000000] (1:test_trace@Cpu B) Task prio: 1.000000 +> [ 40.000000] (1:test_trace@Cpu B) Test finished -p Testing trace integration using file.trace and test6.xml, max(time) < a < 2max(time), b > 3max(time) +p Testing trace integration using trace_B.txt and test-hbp1-c0s1-c2s2.xml, test_trace:start == trace_cycle_0_step_1, test_trace:end < trace_cycle_2_step_2 ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ./platform.xml ./test6.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./test-hbp1-c0s1-c2s2.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' -> [ 80.000000] (1:test_trace@CPU1) Testing the trace integration cpu model: CpuTI -> [ 80.000000] (1:test_trace@CPU1) Task size: 1980.000000 -> [ 80.000000] (1:test_trace@CPU1) Task prio: 1.000000 -> [248.000000] (1:test_trace@CPU1) Test finished +> [ 10.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI +> [ 10.000000] (1:test_trace@Cpu B) Task size: 260.000000 +> [ 10.000000] (1:test_trace@Cpu B) Task prio: 1.000000 +> [ 45.000000] (1:test_trace@Cpu B) Test finished -p Testing trace integration using file.trace and test7.xml, two process with same priority +p Testing trace integration using trace_B.txt and test-hbp1-c1s1-c1s2.xml, test_trace:start == trace_cycle_1_step_1, test_trace:end < trace_cycle_1_step_2 ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ./platform.xml ./test7.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./test-hbp1-c1s1-c1s2.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' -> [ 10.000000] (1:test_trace@CPU1) Testing the trace integration cpu model: CpuTI -> [ 10.000000] (1:test_trace@CPU1) Task size: 400.000000 -> [ 10.000000] (1:test_trace@CPU1) Task prio: 1.500000 -> [ 20.000000] (2:test_trace@CPU1) Testing the trace integration cpu model: CpuTI -> [ 20.000000] (2:test_trace@CPU1) Task size: 300.000000 -> [ 20.000000] (2:test_trace@CPU1) Task prio: 1.500000 -> [ 70.000000] (1:test_trace@CPU1) Test finished -> [ 70.000000] (2:test_trace@CPU1) Test finished +> [ 40.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI +> [ 40.000000] (1:test_trace@Cpu B) Task size: 40.000000 +> [ 40.000000] (1:test_trace@Cpu B) Task prio: 1.000000 +> [ 45.000000] (1:test_trace@Cpu B) Test finished -p Testing trace integration using file.trace and test8.xml, two process with different priority +p Testing trace integration using trace_B.txt and test-hbp1-c1s1-c3s2.xml, test_trace:start == trace_cycle_1_step_1, test_trace:end < trace_cycle_3_step_2 ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ./platform.xml ./test8.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./test-hbp1-c1s1-c3s2.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' -> [ 10.000000] (1:test_trace@CPU1) Testing the trace integration cpu model: CpuTI -> [ 10.000000] (1:test_trace@CPU1) Task size: 400.000000 -> [ 10.000000] (1:test_trace@CPU1) Task prio: 2.500000 -> [ 10.000000] (2:test_trace@CPU1) Testing the trace integration cpu model: CpuTI -> [ 10.000000] (2:test_trace@CPU1) Task size: 400.000000 -> [ 10.000000] (2:test_trace@CPU1) Task prio: 1.000000 -> [ 56.000000] (1:test_trace@CPU1) Test finished -> [ 80.000000] (2:test_trace@CPU1) Test finished +> [ 40.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI +> [ 40.000000] (1:test_trace@Cpu B) Task size: 260.000000 +> [ 40.000000] (1:test_trace@Cpu B) Task prio: 1.000000 +> [ 75.000000] (1:test_trace@Cpu B) Test finished -p Testing trace integration using file.trace and test9.xml, three process with same priority +p Testing trace integration using trace_B.txt and test-hbp1.5-hbp1.5.xml, two process with same priority ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ./platform.xml ./test9.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./test-hbp1.5-hbp1.5.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' -> [ 0.000000] (1:test_trace@CPU1) Testing the trace integration cpu model: CpuTI -> [ 0.000000] (1:test_trace@CPU1) Task size: 400.000000 -> [ 0.000000] (1:test_trace@CPU1) Task prio: 1.000000 -> [ 0.000000] (2:test_trace@CPU1) Testing the trace integration cpu model: CpuTI -> [ 0.000000] (2:test_trace@CPU1) Task size: 400.000000 -> [ 0.000000] (2:test_trace@CPU1) Task prio: 1.000000 -> [ 30.000000] (3:test_trace@CPU1) Testing the trace integration cpu model: CpuTI -> [ 30.000000] (3:test_trace@CPU1) Task size: 2000.000000 -> [ 30.000000] (3:test_trace@CPU1) Task prio: 1.000000 -> [ 90.000000] (1:test_trace@CPU1) Test finished -> [ 90.000000] (2:test_trace@CPU1) Test finished -> [240.000000] (3:test_trace@CPU1) Test finished - -p Testing trace integration using file.trace and test10.xml, three process with different priority +> [ 10.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI +> [ 10.000000] (1:test_trace@Cpu B) Task size: 150.000000 +> [ 10.000000] (1:test_trace@Cpu B) Task prio: 1.500000 +> [ 20.000000] (2:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI +> [ 20.000000] (2:test_trace@Cpu B) Task size: 70.000000 +> [ 20.000000] (2:test_trace@Cpu B) Task prio: 1.500000 +> [ 40.000000] (1:test_trace@Cpu B) Test finished +> [ 40.000000] (2:test_trace@Cpu B) Test finished + +p Testing trace integration using trace_B.txt and test-hbp2.5-hbp1.5.xml, two process with different priority + +! output sort +$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./test-hbp2.5-hbp1.5.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +> [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' +> [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' +> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' +> [ 10.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI +> [ 10.000000] (1:test_trace@Cpu B) Task size: 50.000000 +> [ 10.000000] (1:test_trace@Cpu B) Task prio: 2.500000 +> [ 10.000000] (2:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI +> [ 10.000000] (2:test_trace@Cpu B) Task size: 70.000000 +> [ 10.000000] (2:test_trace@Cpu B) Task prio: 1.500000 +> [ 20.000000] (1:test_trace@Cpu B) Test finished +> [ 30.000000] (2:test_trace@Cpu B) Test finished + +p Testing trace integration using trace_B.txt and test-hbp2.5-hbp1.5.xml, two process with different priority + +! output sort +$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./test-hbp2.5-hbp1.5.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +> [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' +> [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' +> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' +> [ 10.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI +> [ 10.000000] (1:test_trace@Cpu B) Task size: 50.000000 +> [ 10.000000] (1:test_trace@Cpu B) Task prio: 2.500000 +> [ 10.000000] (2:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI +> [ 10.000000] (2:test_trace@Cpu B) Task size: 70.000000 +> [ 10.000000] (2:test_trace@Cpu B) Task prio: 1.500000 +> [ 20.000000] (1:test_trace@Cpu B) Test finished +> [ 30.000000] (2:test_trace@Cpu B) Test finished + +p Testing trace integration using trace_B.txt and test-hbp1.0-hbp1.0-hbp1.0.xml, three process with same priority + +! output sort +$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./test-hbp1.0-hbp1.0-hbp1.0.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +> [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' +> [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' +> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' +> [ 0.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI +> [ 0.000000] (1:test_trace@Cpu B) Task size: 170.000000 +> [ 0.000000] (1:test_trace@Cpu B) Task prio: 1.000000 +> [ 0.000000] (2:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI +> [ 0.000000] (2:test_trace@Cpu B) Task size: 170.000000 +> [ 0.000000] (2:test_trace@Cpu B) Task prio: 1.000000 +> [ 30.000000] (3:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI +> [ 30.000000] (3:test_trace@Cpu B) Task size: 100.000000 +> [ 30.000000] (3:test_trace@Cpu B) Task prio: 1.000000 +> [ 50.000000] (1:test_trace@Cpu B) Test finished +> [ 50.000000] (2:test_trace@Cpu B) Test finished +> [ 60.000000] (3:test_trace@Cpu B) Test finished + +p Testing trace integration using trace_B.txt and test-hbp1.0-hbp3.0-hbp4.0.xml, three process with same priority + +! output sort +$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./test-hbp1.0-hbp3.0-hbp4.0.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +> [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' +> [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' +> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' +> [ 10.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI +> [ 10.000000] (1:test_trace@Cpu B) Task size: 25.000000 +> [ 10.000000] (1:test_trace@Cpu B) Task prio: 1.000000 +> [ 10.000000] (2:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI +> [ 10.000000] (2:test_trace@Cpu B) Task size: 75.000000 +> [ 10.000000] (2:test_trace@Cpu B) Task prio: 3.000000 +> [ 20.000000] (3:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI +> [ 20.000000] (3:test_trace@Cpu B) Task size: 120.000000 +> [ 20.000000] (3:test_trace@Cpu B) Task prio: 4.000000 +> [ 30.000000] (1:test_trace@Cpu B) Test finished +> [ 30.000000] (2:test_trace@Cpu B) Test finished +> [ 40.000000] (3:test_trace@Cpu B) Test finished + +p Testing trace integration using trace_B.txt and test-hbp1.0-hbp3.0-hbp4.0.xml, three process with different priority ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ./platform.xml ./test10.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./test-hbp1.0-hbp3.0-hbp4.0.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' -> [ 0.000000] (1:test_trace@CPU1) Testing the trace integration cpu model: CpuTI -> [ 0.000000] (1:test_trace@CPU1) Task size: 420.000000 -> [ 0.000000] (1:test_trace@CPU1) Task prio: 2.000000 -> [ 0.000000] (2:test_trace@CPU1) Testing the trace integration cpu model: CpuTI -> [ 0.000000] (2:test_trace@CPU1) Task size: 310.000000 -> [ 0.000000] (2:test_trace@CPU1) Task prio: 1.000000 -> [ 50.000000] (3:test_trace@CPU1) Testing the trace integration cpu model: CpuTI -> [ 50.000000] (3:test_trace@CPU1) Task size: 990.000000 -> [ 50.000000] (3:test_trace@CPU1) Task prio: 9.000000 -> [ 62.000000] (1:test_trace@CPU1) Test finished -> [152.000000] (2:test_trace@CPU1) Test finished -> [152.000000] (3:test_trace@CPU1) Test finished - -p Testing trace integration using file.trace and test11.xml, three process with different priority. Changed timestep to 0.1. +> [ 10.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI +> [ 10.000000] (1:test_trace@Cpu B) Task size: 25.000000 +> [ 10.000000] (1:test_trace@Cpu B) Task prio: 1.000000 +> [ 10.000000] (2:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI +> [ 10.000000] (2:test_trace@Cpu B) Task size: 75.000000 +> [ 10.000000] (2:test_trace@Cpu B) Task prio: 3.000000 +> [ 20.000000] (3:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI +> [ 20.000000] (3:test_trace@Cpu B) Task size: 120.000000 +> [ 20.000000] (3:test_trace@Cpu B) Task prio: 4.000000 +> [ 30.000000] (1:test_trace@Cpu B) Test finished +> [ 30.000000] (2:test_trace@Cpu B) Test finished +> [ 40.000000] (3:test_trace@Cpu B) Test finished + +p Testing trace integration using trace_B.txt and test-hbp1.0-hbp3.0-hbp4.0.xml, three process with different priority (included) ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ./platform_trace.xml ./test11.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability_included.xml ./test-hbp1.0-hbp3.0-hbp4.0.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' -> [ 0.000000] (1:test_trace@CPU1) Testing the trace integration cpu model: CpuTI -> [ 0.000000] (1:test_trace@CPU1) Task size: 420.000000 -> [ 0.000000] (1:test_trace@CPU1) Task prio: 2.000000 -> [ 0.000000] (2:test_trace@CPU1) Testing the trace integration cpu model: CpuTI -> [ 0.000000] (2:test_trace@CPU1) Task size: 310.000000 -> [ 0.000000] (2:test_trace@CPU1) Task prio: 1.000000 -> [ 50.000000] (3:test_trace@CPU1) Testing the trace integration cpu model: CpuTI -> [ 50.000000] (3:test_trace@CPU1) Task size: 990.000000 -> [ 50.000000] (3:test_trace@CPU1) Task prio: 9.000000 -> [ 62.000000] (1:test_trace@CPU1) Test finished -> [152.000000] (2:test_trace@CPU1) Test finished -> [152.000000] (3:test_trace@CPU1) Test finished +> [ 10.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI +> [ 10.000000] (1:test_trace@Cpu B) Task size: 25.000000 +> [ 10.000000] (1:test_trace@Cpu B) Task prio: 1.000000 +> [ 10.000000] (2:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI +> [ 10.000000] (2:test_trace@Cpu B) Task size: 75.000000 +> [ 10.000000] (2:test_trace@Cpu B) Task prio: 3.000000 +> [ 20.000000] (3:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI +> [ 20.000000] (3:test_trace@Cpu B) Task size: 120.000000 +> [ 20.000000] (3:test_trace@Cpu B) Task prio: 4.000000 +> [ 30.000000] (1:test_trace@Cpu B) Test finished +> [ 30.000000] (2:test_trace@Cpu B) Test finished +> [ 40.000000] (3:test_trace@Cpu B) Test finished