Use splitted xml files, and avoid memory leaks in the parser.

diff --git a/teshsuite/msg/CMakeLists.txt b/teshsuite/msg/CMakeLists.txt
index 4de0cde..065b8f6 100644 (file)
--- 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 70138a1..c6237bd 100644 (file)
--- 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 8d5d0d5..bcb14b0 100644 (file)
--- 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 (file)
index c6a3a98..0000000
--- a/teshsuite/msg/get_sender.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0'?>
- <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
- <platform version="3">
-   <!-- Platform -->
- <AS  id="AS0"  routing="Full">
-   <host id="toto" power="1000000"/>
-   <link id="lb" bandwidth="100000000" latency="0.000000"/>
-   <route src="toto" dst="toto"><link_ctn id="lb"/></route>    
-  </AS>  
-   
-   <!-- Deployment -->
-   <process host="toto" function="send"/>
-   <process host="toto" function="receive"/>
- </platform>

diff --git a/teshsuite/msg/get_sender_p.xml b/teshsuite/msg/get_sender_p.xml
index 298539f..90ab287 100644 (file)
--- a/teshsuite/msg/get_sender_p.xml
+++ b/teshsuite/msg/get_sender_p.xml
@@ -2,7 +2,7 @@
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
  <platform version="3">
  <AS  id="AS0"  routing="Full">
-   
+
    <host id="toto" power="1000000"/>
    <link id="lb" bandwidth="100000000" latency="0.000000"/>
    <route src="toto" dst="toto"><link_ctn id="lb"/></route>

diff --git a/teshsuite/msg/trace/CMakeLists.txt b/teshsuite/msg/trace/CMakeLists.txt
index 96ebc4a..40b8e09 100644 (file)
--- 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 (file)
index 0000000..66961d0
--- /dev/null
+++ b/teshsuite/msg/trace/platform.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
+<platform version="3">
+  <AS  id="AS0"  routing="Full">
+  <host id="CPU1" power="20" availability_file="trace/file.trace"/>
+  </AS>
+</platform>

diff --git a/teshsuite/msg/trace/platform_trace.xml b/teshsuite/msg/trace/platform_trace.xml
new file mode 100644 (file)
index 0000000..f5b61e1
--- /dev/null
+++ b/teshsuite/msg/trace/platform_trace.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
+
+<platform version="3">
+
+<trace id="1" periodicity="10">
+0  0.5
+10  0.5
+20  1.00
+30  0.5
+40  0.5
+50  0.5
+60  0.5
+</trace>
+  <AS  id="AS0"  routing="Full">
+ <host id="CPU1" power="20"/>
+  </AS>
+
+<trace_connect kind="POWER" trace="1" element="CPU1"/>
+
+</platform>

diff --git a/teshsuite/msg/trace/test1.xml b/teshsuite/msg/trace/test1.xml
index 7cfa12a..51986ba 100644 (file)
--- a/teshsuite/msg/trace/test1.xml
+++ b/teshsuite/msg/trace/test1.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="3">
-  <AS  id="AS0"  routing="Full">
-  <host id="CPU1" power="20" availability_file="trace/file.trace"/>
-  </AS>
   <process host="CPU1" function="test_trace" start_time="10">
        <argument value="400"/>
        <argument value="1.0"/>

diff --git a/teshsuite/msg/trace/test10.xml b/teshsuite/msg/trace/test10.xml
index e006ed0..4a5bf87 100644 (file)
--- a/teshsuite/msg/trace/test10.xml
+++ b/teshsuite/msg/trace/test10.xml
@@ -1,10 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="3">
-         <AS  id="AS0"  routing="Full">
-   <host id="CPU1" power="20" availability_file="trace/file.trace"/>   
-  </AS>
-
   <process host="CPU1" function="test_trace">
        <argument value="420"/>
        <argument value="2.0"/>

diff --git a/teshsuite/msg/trace/test11.xml b/teshsuite/msg/trace/test11.xml
index 3ad4535..077795e 100644 (file)
--- a/teshsuite/msg/trace/test11.xml
+++ b/teshsuite/msg/trace/test11.xml
@@ -3,20 +3,6 @@
 
 <platform version="3">
 
-<trace id="1" periodicity="10">
-0  0.5
-10  0.5
-20  1.00
-30  0.5
-40  0.5
-50  0.5
-60  0.5
-</trace>
-  <AS  id="AS0"  routing="Full">
- <host id="CPU1" power="20"/>  
-  </AS>
-
-<trace_connect kind="POWER" trace="1" element="CPU1"/>
 <process host="CPU1" function="test_trace">
 <argument value="420"/>
 <argument value="2.0"/>

diff --git a/teshsuite/msg/trace/test2.xml b/teshsuite/msg/trace/test2.xml
index f6e700d..7e24cc2 100644 (file)
--- a/teshsuite/msg/trace/test2.xml
+++ b/teshsuite/msg/trace/test2.xml
@@ -1,12 +1,8 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="3">
-  <AS  id="AS0"  routing="Full">
-   <host id="CPU1" power="20" availability_file="trace/file.trace"/>   
-  </AS>
-
   <process host="CPU1" function="test_trace" start_time="10">
        <argument value="850"/>
        <argument value="1.0"/>
   </process>
-</platform>
\ No newline at end of file
+</platform>

diff --git a/teshsuite/msg/trace/test3.xml b/teshsuite/msg/trace/test3.xml
index cbd8dbb..2ab0479 100644 (file)
--- a/teshsuite/msg/trace/test3.xml
+++ b/teshsuite/msg/trace/test3.xml
@@ -1,12 +1,8 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="3">
-         <AS  id="AS0"  routing="Full">
-         <host id="CPU1" power="20" availability_file="trace/file.trace"/>
-  </AS>
-
   <process host="CPU1" function="test_trace" start_time="10">
        <argument value="1980"/>
        <argument value="1.0"/>
   </process>
-</platform>
\ No newline at end of file
+</platform>

diff --git a/teshsuite/msg/trace/test4.xml b/teshsuite/msg/trace/test4.xml
index 46e50fd..e331e2f 100644 (file)
--- a/teshsuite/msg/trace/test4.xml
+++ b/teshsuite/msg/trace/test4.xml
@@ -1,12 +1,8 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="3">
-         <AS  id="AS0"  routing="Full">
-  <host id="CPU1" power="20" availability_file="trace/file.trace"/>    
-  </AS>
-
   <process host="CPU1" function="test_trace" start_time="80">
        <argument value="400"/>
        <argument value="1.0"/>
   </process>
-</platform>
\ No newline at end of file
+</platform>

diff --git a/teshsuite/msg/trace/test5.xml b/teshsuite/msg/trace/test5.xml
index 9052fa2..681d4d6 100644 (file)
--- a/teshsuite/msg/trace/test5.xml
+++ b/teshsuite/msg/trace/test5.xml
@@ -1,12 +1,8 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="3">
-         <AS  id="AS0"  routing="Full">
-   <host id="CPU1" power="20" availability_file="trace/file.trace"/>   
-  </AS>
-
   <process host="CPU1" function="test_trace" start_time="90">
        <argument value="850"/>
        <argument value="1.0"/>
   </process>
-</platform>
\ No newline at end of file
+</platform>

diff --git a/teshsuite/msg/trace/test6.xml b/teshsuite/msg/trace/test6.xml
index 7268219..c86c015 100644 (file)
--- a/teshsuite/msg/trace/test6.xml
+++ b/teshsuite/msg/trace/test6.xml
@@ -1,12 +1,8 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="3">
-         <AS  id="AS0"  routing="Full">
-         <host id="CPU1" power="20" availability_file="trace/file.trace"/>
-  </AS>
-
   <process host="CPU1" function="test_trace" start_time="80">
        <argument value="1980"/>
        <argument value="1.0"/>
   </process>
-</platform>
\ No newline at end of file
+</platform>

diff --git a/teshsuite/msg/trace/test7.xml b/teshsuite/msg/trace/test7.xml
index 43a845b..286a978 100644 (file)
--- a/teshsuite/msg/trace/test7.xml
+++ b/teshsuite/msg/trace/test7.xml
@@ -1,10 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="3">
-         <AS  id="AS0"  routing="Full">
-  <host id="CPU1" power="20" availability_file="trace/file.trace"/>    
-  </AS>
-
   <process host="CPU1" function="test_trace" start_time="10">
        <argument value="400"/>
        <argument value="1.5"/>

diff --git a/teshsuite/msg/trace/test8.xml b/teshsuite/msg/trace/test8.xml
index ed1bdeb..c3c6e90 100644 (file)
--- a/teshsuite/msg/trace/test8.xml
+++ b/teshsuite/msg/trace/test8.xml
@@ -1,10 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="3">
-<AS  id="AS0"  routing="Full">
-  <host id="CPU1" power="20" availability_file="trace/file.trace"/>    
-  </AS>
-
   <process host="CPU1" function="test_trace" start_time="10">
        <argument value="400"/>
        <argument value="2.5"/>

diff --git a/teshsuite/msg/trace/test9.xml b/teshsuite/msg/trace/test9.xml
index 0fe6aba..2993950 100644 (file)
--- a/teshsuite/msg/trace/test9.xml
+++ b/teshsuite/msg/trace/test9.xml
@@ -1,10 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="3">
-  <AS  id="AS0"  routing="Full">
-       <host id="CPU1" power="20" availability_file="trace/file.trace"/>
-  </AS>
-  
   <process host="CPU1" function="test_trace">
        <argument value="400"/>
        <argument value="1.0"/>

diff --git a/teshsuite/msg/trace/test_trace_integration.c b/teshsuite/msg/trace/test_trace_integration.c
index 135509b..49ed7a0 100644 (file)
--- 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 (file)
index 9629ec7..0000000
--- a/teshsuite/msg/trace/test_trace_integration.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="3">
-  <host id="CPU1" power="20"/>
-  <process host="CPU1" function="test_trace"/>
-</platform>
\ No newline at end of file

diff --git a/teshsuite/msg/trace/trace.tesh b/teshsuite/msg/trace/trace.tesh
index 7f82d0c..4ad10a0 100644 (file)
--- 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'