From 024a14e4243df192ed69cd70a701c5fcb45312a7 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Wed, 20 Feb 2013 18:27:18 +0100 Subject: [PATCH] Use splitted xml files, and avoid memory leaks in the parser. --- teshsuite/msg/CMakeLists.txt | 1 - teshsuite/msg/get_sender.c | 2 +- teshsuite/msg/get_sender.tesh | 2 +- teshsuite/msg/get_sender.xml | 14 -------- teshsuite/msg/get_sender_p.xml | 2 +- teshsuite/msg/trace/CMakeLists.txt | 3 +- teshsuite/msg/trace/platform.xml | 7 ++++ teshsuite/msg/trace/platform_trace.xml | 21 ++++++++++++ teshsuite/msg/trace/test1.xml | 3 -- teshsuite/msg/trace/test10.xml | 4 --- teshsuite/msg/trace/test11.xml | 14 -------- teshsuite/msg/trace/test2.xml | 6 +--- teshsuite/msg/trace/test3.xml | 6 +--- teshsuite/msg/trace/test4.xml | 6 +--- teshsuite/msg/trace/test5.xml | 6 +--- teshsuite/msg/trace/test6.xml | 6 +--- teshsuite/msg/trace/test7.xml | 4 --- teshsuite/msg/trace/test8.xml | 4 --- teshsuite/msg/trace/test9.xml | 4 --- teshsuite/msg/trace/test_trace_integration.c | 2 +- .../msg/trace/test_trace_integration.xml | 6 ---- teshsuite/msg/trace/trace.tesh | 32 +++++++------------ 22 files changed, 50 insertions(+), 105 deletions(-) delete mode 100644 teshsuite/msg/get_sender.xml create mode 100644 teshsuite/msg/trace/platform.xml create mode 100644 teshsuite/msg/trace/platform_trace.xml delete mode 100644 teshsuite/msg/trace/test_trace_integration.xml diff --git a/teshsuite/msg/CMakeLists.txt b/teshsuite/msg/CMakeLists.txt index 4de0cde345..065b8f68f1 100644 --- a/teshsuite/msg/CMakeLists.txt +++ b/teshsuite/msg/CMakeLists.txt @@ -22,7 +22,6 @@ set(tesh_files ) set(xml_files ${xml_files} - ${CMAKE_CURRENT_SOURCE_DIR}/get_sender.xml ${CMAKE_CURRENT_SOURCE_DIR}/get_sender_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/get_sender_p.xml ${CMAKE_CURRENT_SOURCE_DIR}/pid_d.xml diff --git a/teshsuite/msg/get_sender.c b/teshsuite/msg/get_sender.c index 70138a1e9f..c6237bdc2d 100644 --- a/teshsuite/msg/get_sender.c +++ b/teshsuite/msg/get_sender.c @@ -44,7 +44,7 @@ int main(int argc, char *argv[]) MSG_function_register("receive", &receive); MSG_create_environment(argv[1]); - MSG_launch_application(argv[1]); + MSG_launch_application(argv[2]); res = MSG_main(); if (res == MSG_OK) diff --git a/teshsuite/msg/get_sender.tesh b/teshsuite/msg/get_sender.tesh index 8d5d0d51fb..bcb14b0e67 100644 --- a/teshsuite/msg/get_sender.tesh +++ b/teshsuite/msg/get_sender.tesh @@ -1,5 +1,5 @@ ! output sort -$ msg/get_sender ${srcdir:=.}/msg/get_sender.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ msg/get_sender ${srcdir:=.}/msg/get_sender_p.xml ${srcdir:=.}/msg/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' diff --git a/teshsuite/msg/get_sender.xml b/teshsuite/msg/get_sender.xml deleted file mode 100644 index c6a3a98e23..0000000000 --- a/teshsuite/msg/get_sender.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/teshsuite/msg/get_sender_p.xml b/teshsuite/msg/get_sender_p.xml index 298539f7bd..90ab287708 100644 --- a/teshsuite/msg/get_sender_p.xml +++ b/teshsuite/msg/get_sender_p.xml @@ -2,7 +2,7 @@ - + diff --git a/teshsuite/msg/trace/CMakeLists.txt b/teshsuite/msg/trace/CMakeLists.txt index 96ebc4a64f..40b8e09aaf 100644 --- a/teshsuite/msg/trace/CMakeLists.txt +++ b/teshsuite/msg/trace/CMakeLists.txt @@ -14,6 +14,8 @@ 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 @@ -25,7 +27,6 @@ set(xml_files ${CMAKE_CURRENT_SOURCE_DIR}/test7.xml ${CMAKE_CURRENT_SOURCE_DIR}/test8.xml ${CMAKE_CURRENT_SOURCE_DIR}/test9.xml - ${CMAKE_CURRENT_SOURCE_DIR}/test_trace_integration.xml PARENT_SCOPE ) set(teshsuite_src diff --git a/teshsuite/msg/trace/platform.xml b/teshsuite/msg/trace/platform.xml new file mode 100644 index 0000000000..66961d0895 --- /dev/null +++ b/teshsuite/msg/trace/platform.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/teshsuite/msg/trace/platform_trace.xml b/teshsuite/msg/trace/platform_trace.xml new file mode 100644 index 0000000000..f5b61e12d8 --- /dev/null +++ b/teshsuite/msg/trace/platform_trace.xml @@ -0,0 +1,21 @@ + + + + + + +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/test1.xml b/teshsuite/msg/trace/test1.xml index 7cfa12af49..51986ba9f4 100644 --- a/teshsuite/msg/trace/test1.xml +++ b/teshsuite/msg/trace/test1.xml @@ -1,9 +1,6 @@ - - - diff --git a/teshsuite/msg/trace/test10.xml b/teshsuite/msg/trace/test10.xml index e006ed00ce..4a5bf8728f 100644 --- a/teshsuite/msg/trace/test10.xml +++ b/teshsuite/msg/trace/test10.xml @@ -1,10 +1,6 @@ - - - - diff --git a/teshsuite/msg/trace/test11.xml b/teshsuite/msg/trace/test11.xml index 3ad4535378..077795ee9b 100644 --- a/teshsuite/msg/trace/test11.xml +++ b/teshsuite/msg/trace/test11.xml @@ -3,20 +3,6 @@ - -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/test2.xml b/teshsuite/msg/trace/test2.xml index f6e700d7f9..7e24cc28e8 100644 --- a/teshsuite/msg/trace/test2.xml +++ b/teshsuite/msg/trace/test2.xml @@ -1,12 +1,8 @@ - - - - - \ No newline at end of file + diff --git a/teshsuite/msg/trace/test3.xml b/teshsuite/msg/trace/test3.xml index cbd8dbb559..2ab04795d0 100644 --- a/teshsuite/msg/trace/test3.xml +++ b/teshsuite/msg/trace/test3.xml @@ -1,12 +1,8 @@ - - - - - \ No newline at end of file + diff --git a/teshsuite/msg/trace/test4.xml b/teshsuite/msg/trace/test4.xml index 46e50fd6c0..e331e2f31d 100644 --- a/teshsuite/msg/trace/test4.xml +++ b/teshsuite/msg/trace/test4.xml @@ -1,12 +1,8 @@ - - - - - \ No newline at end of file + diff --git a/teshsuite/msg/trace/test5.xml b/teshsuite/msg/trace/test5.xml index 9052fa26ee..681d4d6dbe 100644 --- a/teshsuite/msg/trace/test5.xml +++ b/teshsuite/msg/trace/test5.xml @@ -1,12 +1,8 @@ - - - - - \ No newline at end of file + diff --git a/teshsuite/msg/trace/test6.xml b/teshsuite/msg/trace/test6.xml index 726821945f..c86c015068 100644 --- a/teshsuite/msg/trace/test6.xml +++ b/teshsuite/msg/trace/test6.xml @@ -1,12 +1,8 @@ - - - - - \ No newline at end of file + diff --git a/teshsuite/msg/trace/test7.xml b/teshsuite/msg/trace/test7.xml index 43a845bbd5..286a978f0e 100644 --- a/teshsuite/msg/trace/test7.xml +++ b/teshsuite/msg/trace/test7.xml @@ -1,10 +1,6 @@ - - - - diff --git a/teshsuite/msg/trace/test8.xml b/teshsuite/msg/trace/test8.xml index ed1bdeb86f..c3c6e9082b 100644 --- a/teshsuite/msg/trace/test8.xml +++ b/teshsuite/msg/trace/test8.xml @@ -1,10 +1,6 @@ - - - - diff --git a/teshsuite/msg/trace/test9.xml b/teshsuite/msg/trace/test9.xml index 0fe6abaf5e..2993950477 100644 --- a/teshsuite/msg/trace/test9.xml +++ b/teshsuite/msg/trace/test9.xml @@ -1,10 +1,6 @@ - - - - diff --git a/teshsuite/msg/trace/test_trace_integration.c b/teshsuite/msg/trace/test_trace_integration.c index 135509bf5d..49ed7a00a2 100644 --- a/teshsuite/msg/trace/test_trace_integration.c +++ b/teshsuite/msg/trace/test_trace_integration.c @@ -63,7 +63,7 @@ int main(int argc, char *argv[]) MSG_function_register("test_trace", test_trace); /* Use the same file for platform and deployment. */ MSG_create_environment(argv[1]); - MSG_launch_application(argv[1]); + MSG_launch_application(argv[2]); /* Run the example. */ res = MSG_main(); diff --git a/teshsuite/msg/trace/test_trace_integration.xml b/teshsuite/msg/trace/test_trace_integration.xml deleted file mode 100644 index 9629ec7194..0000000000 --- a/teshsuite/msg/trace/test_trace_integration.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/teshsuite/msg/trace/trace.tesh b/teshsuite/msg/trace/trace.tesh index 7f82d0c6f3..4ad10a001d 100644 --- a/teshsuite/msg/trace/trace.tesh +++ b/teshsuite/msg/trace/trace.tesh @@ -3,11 +3,10 @@ p Testing trace integration using file.trace and test1.xml, a < max(time), b < max(time) ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test1.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/platform.xml ./trace/test1.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' -> [ 0.000000] (0:@) Ignoring redefinition of trace trace/file.trace > [ 10.000000] (1:test_trace@CPU1) Testing the trace integration cpu model: CpuTI > [ 10.000000] (1:test_trace@CPU1) Task size: 400.000000 > [ 10.000000] (1:test_trace@CPU1) Task prio: 1.000000 @@ -16,11 +15,10 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test1. p Testing trace integration using file.trace and test2.xml, a < max(time), max(time) < b < 2 max(time) ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test2.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/platform.xml ./trace/test2.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' -> [ 0.000000] (0:@) Ignoring redefinition of trace trace/file.trace > [ 10.000000] (1:test_trace@CPU1) Testing the trace integration cpu model: CpuTI > [ 10.000000] (1:test_trace@CPU1) Task size: 850.000000 > [ 10.000000] (1:test_trace@CPU1) Task prio: 1.000000 @@ -29,11 +27,10 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test2. p Testing trace integration using file.trace and test3.xml, a < max(time), b > 2 max(time) ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test3.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/platform.xml ./trace/test3.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' -> [ 0.000000] (0:@) Ignoring redefinition of trace trace/file.trace > [ 10.000000] (1:test_trace@CPU1) Testing the trace integration cpu model: CpuTI > [ 10.000000] (1:test_trace@CPU1) Task size: 1980.000000 > [ 10.000000] (1:test_trace@CPU1) Task prio: 1.000000 @@ -42,11 +39,10 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test3. p Testing trace integration using file.trace and test4.xml, max(time) < a < 2max(time), max(time) < b < 2max(time) ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test4.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/platform.xml ./trace/test4.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' -> [ 0.000000] (0:@) Ignoring redefinition of trace trace/file.trace > [ 80.000000] (1:test_trace@CPU1) Testing the trace integration cpu model: CpuTI > [ 80.000000] (1:test_trace@CPU1) Task size: 400.000000 > [ 80.000000] (1:test_trace@CPU1) Task prio: 1.000000 @@ -55,11 +51,10 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test4. p Testing trace integration using file.trace and test5.xml, max(time) < a < 2max(time), 2max(time) < b < 3max(time) ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test5.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/platform.xml ./trace/test5.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' -> [ 0.000000] (0:@) Ignoring redefinition of trace trace/file.trace > [ 90.000000] (1:test_trace@CPU1) Testing the trace integration cpu model: CpuTI > [ 90.000000] (1:test_trace@CPU1) Task size: 850.000000 > [ 90.000000] (1:test_trace@CPU1) Task prio: 1.000000 @@ -68,11 +63,10 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test5. p Testing trace integration using file.trace and test6.xml, max(time) < a < 2max(time), b > 3max(time) ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test6.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/platform.xml ./trace/test6.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' -> [ 0.000000] (0:@) Ignoring redefinition of trace trace/file.trace > [ 80.000000] (1:test_trace@CPU1) Testing the trace integration cpu model: CpuTI > [ 80.000000] (1:test_trace@CPU1) Task size: 1980.000000 > [ 80.000000] (1:test_trace@CPU1) Task prio: 1.000000 @@ -81,11 +75,10 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test6. p Testing trace integration using file.trace and test7.xml, two process with same priority ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test7.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/platform.xml ./trace/test7.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' -> [ 0.000000] (0:@) Ignoring redefinition of trace trace/file.trace > [ 10.000000] (1:test_trace@CPU1) Testing the trace integration cpu model: CpuTI > [ 10.000000] (1:test_trace@CPU1) Task size: 400.000000 > [ 10.000000] (1:test_trace@CPU1) Task prio: 1.500000 @@ -98,11 +91,10 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test7. p Testing trace integration using file.trace and test8.xml, two process with different priority ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test8.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/platform.xml ./trace/test8.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' -> [ 0.000000] (0:@) Ignoring redefinition of trace trace/file.trace > [ 10.000000] (1:test_trace@CPU1) Testing the trace integration cpu model: CpuTI > [ 10.000000] (1:test_trace@CPU1) Task size: 400.000000 > [ 10.000000] (1:test_trace@CPU1) Task prio: 2.500000 @@ -115,11 +107,10 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test8. p Testing trace integration using file.trace and test9.xml, three process with same priority ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test9.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/platform.xml ./trace/test9.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' -> [ 0.000000] (0:@) Ignoring redefinition of trace trace/file.trace > [ 0.000000] (1:test_trace@CPU1) Testing the trace integration cpu model: CpuTI > [ 0.000000] (1:test_trace@CPU1) Task size: 400.000000 > [ 0.000000] (1:test_trace@CPU1) Task prio: 1.000000 @@ -136,11 +127,10 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test9. p Testing trace integration using file.trace and test10.xml, three process with different priority ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test10.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/platform.xml ./trace/test10.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' -> [ 0.000000] (0:@) Ignoring redefinition of trace trace/file.trace > [ 0.000000] (1:test_trace@CPU1) Testing the trace integration cpu model: CpuTI > [ 0.000000] (1:test_trace@CPU1) Task size: 420.000000 > [ 0.000000] (1:test_trace@CPU1) Task prio: 2.000000 @@ -157,7 +147,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test10 p Testing trace integration using file.trace and test11.xml, three process with different priority. Changed timestep to 0.1. ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test11.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/platform_trace.xml ./trace/test11.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' -- 2.20.1