Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Xml platform cleaning teshsuite/msg
authorPaul Bédaride <paul.bedaride@gmail.com>
Mon, 7 Jul 2014 14:51:33 +0000 (16:51 +0200)
committerPaul Bédaride <paul.bedaride@gmail.com>
Mon, 7 Jul 2014 15:06:37 +0000 (17:06 +0200)
64 files changed:
buildtools/Cmake/DefinePackages.cmake
examples/platforms/trace/trace_B.txt
examples/platforms/two_hosts_platform_with_availability.xml
examples/platforms/two_hosts_platform_with_availability_included.xml [new file with mode: 0644]
src/simix/smx_user.c
src/surf/cpu_ti.cpp
teshsuite/bug-17132/CMakeLists.txt
teshsuite/bug-17132/bug-17132-surf-debug.tesh
teshsuite/bug-17132/bug-17132.tesh
teshsuite/bug-17132/hostfile.txt
teshsuite/bug-17132/small_platform.xml [deleted file]
teshsuite/msg/CMakeLists.txt
teshsuite/msg/get_sender/CMakeLists.txt
teshsuite/msg/get_sender/get_sender.tesh
teshsuite/msg/get_sender/get_sender_d.xml
teshsuite/msg/get_sender/get_sender_p.xml [deleted file]
teshsuite/msg/host_on_off/CMakeLists.txt
teshsuite/msg/host_on_off/host_on_off.tesh
teshsuite/msg/host_on_off/host_on_off_p.xml [deleted file]
teshsuite/msg/pid/CMakeLists.txt
teshsuite/msg/pid/pid.tesh
teshsuite/msg/pid/pid_d.xml
teshsuite/msg/pid/pid_p.xml [deleted file]
teshsuite/msg/process/CMakeLists.txt
teshsuite/msg/process/process.tesh
teshsuite/msg/process/process_p.xml [deleted file]
teshsuite/msg/process_join/CMakeLists.txt
teshsuite/msg/process_join/process_join.tesh
teshsuite/msg/process_join/process_join_p.xml [deleted file]
teshsuite/msg/storage/CMakeLists.txt
teshsuite/msg/storage/deployment.xml
teshsuite/msg/storage/one_host_platform.xml [deleted file]
teshsuite/msg/storage/platform.xml [deleted file]
teshsuite/msg/storage/storage_basic.c
teshsuite/msg/storage/storage_basic.tesh
teshsuite/msg/storage/storage_content_c.txt [deleted file]
teshsuite/msg/storage/storage_content_s1.txt [deleted file]
teshsuite/msg/storage/storage_content_s2.txt [deleted file]
teshsuite/msg/task_destroy_cancel/CMakeLists.txt
teshsuite/msg/task_destroy_cancel/task_destroy_cancel.tesh
teshsuite/msg/task_destroy_cancel/task_destroy_cancel_p.xml [deleted file]
teshsuite/msg/trace/CMakeLists.txt
teshsuite/msg/trace/file.trace [deleted file]
teshsuite/msg/trace/platform.xml [deleted file]
teshsuite/msg/trace/platform_trace.xml [deleted file]
teshsuite/msg/trace/test-hbp1-c0s0-c0s1.xml [moved from teshsuite/msg/trace/test4.xml with 65% similarity]
teshsuite/msg/trace/test-hbp1-c0s0-c1s0.xml [moved from teshsuite/msg/trace/test2.xml with 65% similarity]
teshsuite/msg/trace/test-hbp1-c0s1-c0s2.xml [moved from teshsuite/msg/trace/test5.xml with 65% similarity]
teshsuite/msg/trace/test-hbp1-c0s1-c2s2.xml [moved from teshsuite/msg/trace/test3.xml with 65% similarity]
teshsuite/msg/trace/test-hbp1-c0s2-c1s0.xml [new file with mode: 0644]
teshsuite/msg/trace/test-hbp1-c0s2-c1s1.xml [new file with mode: 0644]
teshsuite/msg/trace/test-hbp1-c1s1-c1s2.xml [new file with mode: 0644]
teshsuite/msg/trace/test-hbp1-c1s1-c3s2.xml [new file with mode: 0644]
teshsuite/msg/trace/test-hbp1.0-hbp1.0-hbp1.0.xml [moved from teshsuite/msg/trace/test9.xml with 51% similarity]
teshsuite/msg/trace/test-hbp1.0-hbp3.0-hbp4.0.xml [new file with mode: 0644]
teshsuite/msg/trace/test-hbp1.5-hbp1.5.xml [moved from teshsuite/msg/trace/test7.xml with 53% similarity]
teshsuite/msg/trace/test-hbp2.5-hbp1.5.xml [new file with mode: 0644]
teshsuite/msg/trace/test1.xml [deleted file]
teshsuite/msg/trace/test10.xml [deleted file]
teshsuite/msg/trace/test11.xml [deleted file]
teshsuite/msg/trace/test6.xml [deleted file]
teshsuite/msg/trace/test8.xml [deleted file]
teshsuite/msg/trace/test_trace_integration.c
teshsuite/msg/trace/trace.tesh

index e4d0f42..78d8f14 100644 (file)
@@ -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
   )
index 8dc7470..e94c255 100644 (file)
@@ -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
index 5378b5f..99b0c57 100644 (file)
@@ -2,8 +2,8 @@
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
  <platform version="3">
  <AS  id="AS0"  routing="Full">
-   <host id="Cpu A" power="100Mf" availability_file="trace/trace_A.txt" state_file="trace/trace_A_failure.txt"/>
-   <host id="Cpu B" power="100Mf" availability_file="trace/trace_B.txt"/>
+   <host id="Cpu A" power="10f" availability_file="trace/trace_A.txt" state_file="trace/trace_A_failure.txt"/>
+   <host id="Cpu B" power="10f" availability_file="trace/trace_B.txt"/>
    <link id="LinkA" bandwidth="10MBps" latency="200ms"/>
    <route src="Cpu A" dst="Cpu B"><link_ctn id="LinkA"/></route>
  </AS>
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 (file)
index 0000000..88e4b72
--- /dev/null
@@ -0,0 +1,27 @@
+<?xml version='1.0'?>
+ <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
+ <platform version="3">
+<trace id="A" periodicity="1.0">
+0.0 1.0
+11.0 0.5
+20.0 0.9
+</trace>
+<trace id="A_failure" periodicity="10.0">
+1.0 -1.0
+2.0 1.0
+</trace>
+<trace id="B" periodicity="10.0">
+0.0 1.0
+10.0 0.8
+20.0 0.4
+</trace>
+ <AS  id="AS0"  routing="Full">
+   <host id="Cpu A" power="10f"/>
+   <host id="Cpu B" power="10f"/>
+   <link id="LinkA" bandwidth="10MBps" latency="200ms"/>
+   <route src="Cpu A" dst="Cpu B"><link_ctn id="LinkA"/></route>
+ </AS>
+<trace_connect kind="POWER" trace="A" element="Cpu A"/>
+<trace_connect kind="HOST_AVAIL" trace="A_failure" element="Cpu A"/>
+<trace_connect kind="POWER" trace="B" element="Cpu B"/>
+ </platform>
index c65710d..4ddc246 100644 (file)
@@ -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);
 }
 
index 10f16cf..38717da 100644 (file)
@@ -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;
index 87b5a82..8cc6e77 100644 (file)
@@ -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)
index 9256883..c089cff 100644 (file)
@@ -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
index 16c5e00..e674c4f 100644 (file)
@@ -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/small_platform.xml b/teshsuite/bug-17132/small_platform.xml
deleted file mode 100644 (file)
index a2b420d..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version='3'>
- <AS id='AS0' routing='Full'>
-
-  <host id='host1' power='1.0'/>
-  <host id='host2' power='1.0'/>
-  <link id='link' bandwidth='1e+10' latency='1e-09'/>
-
-  <route src='host1' dst='host2' symmetrical="YES">
-       <link_ctn id='link'/>
-  </route>
-
- </AS>
-</platform>
index 4a75a53..8a8ce53 100644 (file)
@@ -17,6 +17,7 @@ set(teshsuite_src
   PARENT_SCOPE
   )
 set(bin_files
+
   ${bin_files}
   PARENT_SCOPE
   )
index d785a82..39bfe70 100644 (file)
@@ -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
index be07f36..d6a0c95 100644 (file)
@@ -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
index 0763eab..9ae95b3 100644 (file)
@@ -2,6 +2,6 @@
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
  <platform version="3">
    <!-- Deployment -->
-   <process host="toto" function="send"/>
-   <process host="toto" function="receive"/>
+   <process host="Tremblay" function="send"/>
+   <process host="Tremblay" function="receive"/>
  </platform>
diff --git a/teshsuite/msg/get_sender/get_sender_p.xml b/teshsuite/msg/get_sender/get_sender_p.xml
deleted file mode 100644 (file)
index 05064f0..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0'?>
- <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
- <platform version="3">
- <AS  id="AS0"  routing="Full">
-
-   <host id="toto" power="1Mf"/>
-   <link id="lb" bandwidth="100MBps" latency="0"/>
-   <route src="toto" dst="toto"><link_ctn id="lb"/></route>
-
- </AS>
- </platform>
index 5230929..7f9719c 100644 (file)
@@ -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
index 0c75055..530f668 100644 (file)
@@ -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 (file)
index 1947841..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="3">
-  <!-- The hosts -->
-  <AS  id="AS0"  routing="Full">
-   <host id="Tremblay" power="98.095Mf"/>
-   <host id="Jupiter" power="76.296Mf"/>
-   <link id="1" bandwidth="41.279125MBps" latency="59.904us"/>
-   <route src="Tremblay" dst="Jupiter">
-    <link_ctn id="1"/>
-   </route>
-  </AS>
-</platform>
index 6dee881..a19568a 100644 (file)
@@ -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
index 0a55186..54c1a3d 100644 (file)
@@ -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.
index 7475570..f1c9122 100644 (file)
@@ -2,8 +2,8 @@
  <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
  <platform version="3">
    <!-- Deployment -->
-   <process host="toto" function="sendpid"/>
-   <process host="toto" function="sendpid"/>
-   <process host="toto" function="sendpid"/>
-   <process host="toto" function="killall"/>
+   <process host="Tremblay" function="sendpid"/>
+   <process host="Tremblay" function="sendpid"/>
+   <process host="Tremblay" function="sendpid"/>
+   <process host="Tremblay" function="killall"/>
  </platform>
diff --git a/teshsuite/msg/pid/pid_p.xml b/teshsuite/msg/pid/pid_p.xml
deleted file mode 100644 (file)
index 50cf472..0000000
+++ /dev/null
@@ -1,10 +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="1Mf"/>
-   <link id="lb" bandwidth="100MBps" latency="0"/>
-   <route src="toto" dst="toto"><link_ctn id="lb"/></route>
-  </AS>
- </platform>
index 95b67c8..05fb130 100644 (file)
@@ -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
index c8ab7f7..f45ddb7 100644 (file)
@@ -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 (file)
index 90e976a..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="3">
-  <!-- The hosts -->
-  <AS  id="AS0"  routing="Full">
-   <host id="Tremblay" power="98.095Mf"/>
-  </AS>
-</platform>
\ No newline at end of file
index bca2830..a7de14e 100644 (file)
@@ -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
index e48c49a..1afe564 100644 (file)
@@ -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 (file)
index 90e976a..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="3">
-  <!-- The hosts -->
-  <AS  id="AS0"  routing="Full">
-   <host id="Tremblay" power="98.095Mf"/>
-  </AS>
-</platform>
\ No newline at end of file
index 7a217ab..223bd66 100644 (file)
@@ -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
   )
index dab6a8c..d4303cb 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="3">
-  <process host="server" function="server" />
-  <process host="client" function="client" />
-</platform>
\ No newline at end of file
+  <process host="alice" function="server" />
+  <process host="bob" function="client" />
+</platform>
diff --git a/teshsuite/msg/storage/one_host_platform.xml b/teshsuite/msg/storage/one_host_platform.xml
deleted file mode 100644 (file)
index e4262df..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-
-<platform version="3">
-       <AS id="AS0" routing="Full">
-               <!-- STORAGE TYPES -->
-               <storage_type id="single_HDD" model="linear_no_lat" size="750GiB" content_type="txt_unix">
-                       <model_prop id="Bwrite" value="30MBps" />
-                       <model_prop id="Bread" value="100MBps" />
-                       <model_prop id="Bconnection" value="150MBps" />
-               </storage_type>
-
-               <!-- DISKS -->
-               <storage id="cdisk" typeId="single_HDD" content="storage_content_c.txt" attach="host"/>
-
-               <!-- HOSTS -->
-               <host id="host" power="1000000000">
-                       <mount storageId="cdisk" name="/sd1" />
-               </host>
-       </AS>
-</platform>
diff --git a/teshsuite/msg/storage/platform.xml b/teshsuite/msg/storage/platform.xml
deleted file mode 100644 (file)
index 22a4876..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-
-<platform version="3">
-       <AS id="AS0" routing="Full">
-               <!-- STORAGE TYPES -->
-               <storage_type id="crucial" model="SSD" size="500GiB">
-                       <model_prop id="Bwrite" value="30000000" /> <!-- 30Mo/s -->
-                       <model_prop id="Bread" value="100000000" /> <!-- 100Mo/s -->
-                       <model_prop id="Bconnection" value="150000000" /> <!-- 150Mo/s -->
-               </storage_type>
-
-               <storage_type id="single_HDD" model="linear_no_lat" size="750GiB" content_type="txt_unix">
-                       <model_prop id="Bwrite" value="30MBps" />
-                       <model_prop id="Bread" value="100MBps" />
-                       <model_prop id="Bconnection" value="150MBps" />
-               </storage_type>
-
-               <storage_type id="single_SSD" model="linear_no_lat"
-                       content="content/storage_content.txt" size="300GiB">
-                       <model_prop id="Bwrite" value="30MBps" />
-                       <model_prop id="Bread" value="100MBps" />
-                       <model_prop id="Bconnection" value="150MBps" />
-               </storage_type>
-
-               <!-- DISKS -->
-               <storage id="cdisk" typeId="single_HDD" content="storage_content_c.txt" attach="client"/>
-
-               <storage id="sdisk1" typeId="single_SSD" content="storage_content_s1.txt" attach="server">
-                       <prop id="usage" value="File system"/>
-               </storage>
-
-               <storage id="sdisk2" typeId="single_HDD" content="storage_content_s2.txt" attach="server">
-                       <prop id="usage" value="Cache"/>
-               </storage>
-
-               <!-- HOSTS -->
-               <host id="client" power="1000000000">
-                       <mount storageId="cdisk" name="/sd1" />
-               </host>
-
-               <host id="server" power="1000000000">
-                       <mount storageId="sdisk1" name="/sd1" />
-                       <mount storageId="sdisk2" name="/sd2" />
-                       <prop id="ip adress" value="127.0.0.5"/>
-               </host>
-
-               <!-- LINKS & ROUTES -->
-               <link id="link" bandwidth="125MBps" latency="50us" />
-
-               <route src="client" dst="server" symmetrical="YES">
-                       <link_ctn id="link" />
-               </route>
-       </AS>
-</platform>
index 77577dc..034a0ee 100644 (file)
@@ -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;
 }
index 2b6e0f9..111fd23 100644 (file)
-$ ./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 (file)
index e495e7e..0000000
+++ /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 (file)
index f2adbfb..0000000
+++ /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 (file)
index e1497a0..0000000
+++ /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
index 565498c..97968dc 100644 (file)
@@ -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
index 07f0c68..4064899 100644 (file)
@@ -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 (file)
index 1947841..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="3">
-  <!-- The hosts -->
-  <AS  id="AS0"  routing="Full">
-   <host id="Tremblay" power="98.095Mf"/>
-   <host id="Jupiter" power="76.296Mf"/>
-   <link id="1" bandwidth="41.279125MBps" latency="59.904us"/>
-   <route src="Tremblay" dst="Jupiter">
-    <link_ctn id="1"/>
-   </route>
-  </AS>
-</platform>
index 40b8e09..761bddc 100644 (file)
@@ -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 (file)
index bbaec1c..0000000
+++ /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 (file)
index 5038245..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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="20f" availability_file="file.trace"/>
-  </AS>
-</platform>
diff --git a/teshsuite/msg/trace/platform_trace.xml b/teshsuite/msg/trace/platform_trace.xml
deleted file mode 100644 (file)
index 5913d93..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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="20f"/>
-  </AS>
-
-<trace_connect kind="POWER" trace="1" element="CPU1"/>
-
-</platform>
similarity index 65%
rename from teshsuite/msg/trace/test4.xml
rename to teshsuite/msg/trace/test-hbp1-c0s0-c0s1.xml
index e331e2f..59999f3 100644 (file)
@@ -1,8 +1,8 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="3">
-  <process host="CPU1" function="test_trace" start_time="80">
-       <argument value="400"/>
+  <process host="Cpu B" function="test_trace" start_time="0">
+       <argument value="40"/>
        <argument value="1.0"/>
   </process>
 </platform>
similarity index 65%
rename from teshsuite/msg/trace/test2.xml
rename to teshsuite/msg/trace/test-hbp1-c0s0-c1s0.xml
index 7e24cc2..c31b162 100644 (file)
@@ -1,8 +1,8 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="3">
-  <process host="CPU1" function="test_trace" start_time="10">
-       <argument value="850"/>
+  <process host="Cpu B" function="test_trace" start_time="0">
+       <argument value="220"/>
        <argument value="1.0"/>
   </process>
 </platform>
similarity index 65%
rename from teshsuite/msg/trace/test5.xml
rename to teshsuite/msg/trace/test-hbp1-c0s1-c0s2.xml
index 681d4d6..f98849c 100644 (file)
@@ -1,8 +1,8 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="3">
-  <process host="CPU1" function="test_trace" start_time="90">
-       <argument value="850"/>
+  <process host="Cpu B" function="test_trace" start_time="10">
+       <argument value="40"/>
        <argument value="1.0"/>
   </process>
 </platform>
similarity index 65%
rename from teshsuite/msg/trace/test3.xml
rename to teshsuite/msg/trace/test-hbp1-c0s1-c2s2.xml
index 2ab0479..6b23c8d 100644 (file)
@@ -1,8 +1,8 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="3">
-  <process host="CPU1" function="test_trace" start_time="10">
-       <argument value="1980"/>
+  <process host="Cpu B" function="test_trace" start_time="10">
+       <argument value="260"/>
        <argument value="1.0"/>
   </process>
 </platform>
diff --git a/teshsuite/msg/trace/test-hbp1-c0s2-c1s0.xml b/teshsuite/msg/trace/test-hbp1-c0s2-c1s0.xml
new file mode 100644 (file)
index 0000000..941e807
--- /dev/null
@@ -0,0 +1,8 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
+<platform version="3">
+  <process host="Cpu B" function="test_trace" start_time="20">
+       <argument value="40"/>
+       <argument value="1.0"/>
+  </process>
+</platform>
diff --git a/teshsuite/msg/trace/test-hbp1-c0s2-c1s1.xml b/teshsuite/msg/trace/test-hbp1-c0s2-c1s1.xml
new file mode 100644 (file)
index 0000000..554cc8f
--- /dev/null
@@ -0,0 +1,8 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
+<platform version="3">
+  <process host="Cpu B" function="test_trace" start_time="20">
+       <argument value="140"/>
+       <argument value="1.0"/>
+  </process>
+</platform>
diff --git a/teshsuite/msg/trace/test-hbp1-c1s1-c1s2.xml b/teshsuite/msg/trace/test-hbp1-c1s1-c1s2.xml
new file mode 100644 (file)
index 0000000..df79a21
--- /dev/null
@@ -0,0 +1,8 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
+<platform version="3">
+  <process host="Cpu B" function="test_trace" start_time="40">
+       <argument value="40"/>
+       <argument value="1.0"/>
+  </process>
+</platform>
diff --git a/teshsuite/msg/trace/test-hbp1-c1s1-c3s2.xml b/teshsuite/msg/trace/test-hbp1-c1s1-c3s2.xml
new file mode 100644 (file)
index 0000000..6948020
--- /dev/null
@@ -0,0 +1,8 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
+<platform version="3">
+  <process host="Cpu B" function="test_trace" start_time="40">
+       <argument value="260"/>
+       <argument value="1.0"/>
+  </process>
+</platform>
similarity index 51%
rename from teshsuite/msg/trace/test9.xml
rename to teshsuite/msg/trace/test-hbp1.0-hbp1.0-hbp1.0.xml
index 2993950..11be503 100644 (file)
@@ -1,16 +1,16 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="3">
-  <process host="CPU1" function="test_trace">
-       <argument value="400"/>
+  <process host="Cpu B" function="test_trace">
+       <argument value="170"/>
        <argument value="1.0"/>
   </process>
-  <process host="CPU1" function="test_trace">
-       <argument value="400"/>
+  <process host="Cpu B" function="test_trace">
+       <argument value="170"/>
        <argument value="1.0"/>
   </process>
-  <process host="CPU1" function="test_trace" start_time="30">
-       <argument value="2000"/>
+  <process host="Cpu B" function="test_trace" start_time="30">
+       <argument value="100"/>
        <argument value="1.0"/>
   </process>
 </platform>
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 (file)
index 0000000..a2b9898
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
+<platform version="3">
+  <process host="Cpu B" function="test_trace" start_time="10">
+       <argument value="25"/>
+       <argument value="1.0"/>
+  </process>
+  <process host="Cpu B" function="test_trace" start_time="10">
+       <argument value="75"/>
+       <argument value="3.0"/>
+  </process>
+  <process host="Cpu B" function="test_trace" start_time="20">
+       <argument value="120"/>
+       <argument value="4.0"/>
+  </process>
+</platform>
similarity index 53%
rename from teshsuite/msg/trace/test7.xml
rename to teshsuite/msg/trace/test-hbp1.5-hbp1.5.xml
index 286a978..a409a31 100644 (file)
@@ -1,12 +1,12 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="3">
-  <process host="CPU1" function="test_trace" start_time="10">
-       <argument value="400"/>
+  <process host="Cpu B" function="test_trace" start_time="10">
+       <argument value="150"/>
        <argument value="1.5"/>
   </process>
-  <process host="CPU1" function="test_trace" start_time="20">
-       <argument value="300"/>
+  <process host="Cpu B" function="test_trace" start_time="20">
+       <argument value="70"/>
        <argument value="1.5"/>
   </process>
 </platform>
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 (file)
index 0000000..cb16f35
--- /dev/null
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
+<platform version="3">
+  <process host="Cpu B" function="test_trace" start_time="10">
+       <argument value="50"/>
+       <argument value="2.5"/>
+  </process>
+  <process host="Cpu B" function="test_trace" start_time="10">
+       <argument value="70"/>
+       <argument value="1.5"/>
+  </process>
+</platform>
diff --git a/teshsuite/msg/trace/test1.xml b/teshsuite/msg/trace/test1.xml
deleted file mode 100644 (file)
index 51986ba..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="3">
-  <process host="CPU1" function="test_trace" start_time="10">
-       <argument value="400"/>
-       <argument value="1.0"/>
-  </process>
-</platform>
\ No newline at end of file
diff --git a/teshsuite/msg/trace/test10.xml b/teshsuite/msg/trace/test10.xml
deleted file mode 100644 (file)
index 4a5bf87..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="3">
-  <process host="CPU1" function="test_trace">
-       <argument value="420"/>
-       <argument value="2.0"/>
-  </process>
-  <process host="CPU1" function="test_trace">
-       <argument value="310"/>
-       <argument value="1.0"/>
-  </process>
-  <process host="CPU1" function="test_trace" start_time="50">
-       <argument value="990"/>
-       <argument value="9.0"/>
-  </process>
-</platform>
diff --git a/teshsuite/msg/trace/test11.xml b/teshsuite/msg/trace/test11.xml
deleted file mode 100644 (file)
index 077795e..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-
-<platform version="3">
-
-<process host="CPU1" function="test_trace">
-<argument value="420"/>
-<argument value="2.0"/>
-</process>
-<process host="CPU1" function="test_trace">
-<argument value="310"/>
-<argument value="1.0"/>
-</process>
-<process host="CPU1" function="test_trace" start_time="50">
-<argument value="990"/>
-<argument value="9.0"/>
-</process>
-
-</platform>
diff --git a/teshsuite/msg/trace/test6.xml b/teshsuite/msg/trace/test6.xml
deleted file mode 100644 (file)
index c86c015..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="3">
-  <process host="CPU1" function="test_trace" start_time="80">
-       <argument value="1980"/>
-       <argument value="1.0"/>
-  </process>
-</platform>
diff --git a/teshsuite/msg/trace/test8.xml b/teshsuite/msg/trace/test8.xml
deleted file mode 100644 (file)
index c3c6e90..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="3">
-  <process host="CPU1" function="test_trace" start_time="10">
-       <argument value="400"/>
-       <argument value="2.5"/>
-  </process>
-  <process host="CPU1" function="test_trace" start_time="10">
-       <argument value="400"/>
-       <argument value="1.0"/>
-  </process>
-</platform>
index 2974e68..96ddc4c 100644 (file)
@@ -43,7 +43,6 @@ int test_trace(int argc, char *argv[])
 
   XBT_INFO("Test finished");
 
-
   return 0;
 }
 
index f843ad4..853cfdd 100644 (file)
 #! ./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