deduplication and tidying

diff --git a/examples/platforms/simulacrum_7_hosts.xml b/examples/platforms/simulacrum_7_hosts.xml
new file mode 100644 (file)
index 0000000..6cbc877
--- /dev/null
+++ b/examples/platforms/simulacrum_7_hosts.xml
@@ -0,0 +1,101 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
+<platform version="3">
+  <AS  id="AS0" routing="Full">
+    <host id="Host 26" power="3.300140519709234Gf"/>
+    <host id="Host 27" power="3.867398877553016Gf"/>
+    <host id="Host 28" power="1.6522665718098645Gf"/>
+    <host id="Host 29" power="1.0759376792481766Gf"/>
+    <host id="Host 30" power="2.4818410475340424Gf"/>
+    <host id="Host 31" power="1.773869555571436Gf"/>
+    <host id="Host 32" power="1.7843609176927505Gf"/>
+    
+    <link id="l152" bandwidth="125MBps" latency="100us"/>
+    <link id="l153" bandwidth="125MBps" latency="100us"/>
+    <link id="l154" bandwidth="125MBps" latency="100us"/>
+    <link id="l155" bandwidth="125MBps" latency="100us"/>
+    <link id="l156" bandwidth="125MBps" latency="100us"/>
+    <link id="l157" bandwidth="125MBps" latency="100us"/>
+    <link id="l159" bandwidth="125MBps" latency="100us"
+         bandwidth_file="trace/linkBandwidth7.bw"/>
+    <link id="l160" bandwidth="125MBps" latency="100us"/>
+    <link id="l161" bandwidth="125MBps" latency="100us"/>
+    <link id="l162" bandwidth="125MBps" latency="100us"/>
+    <link id="l163" bandwidth="125MBps" latency="100us"/>
+    <link id="l164" bandwidth="125MBps" latency="100us"/>
+    <link id="l165" bandwidth="125MBps" latency="100us"/>
+    <link id="l166" bandwidth="125MBps" latency="100us"/>
+    <link id="l167" bandwidth="125MBps" latency="100us"/>
+    <link id="l168" bandwidth="125MBps" latency="100us"/>
+    <link id="l169" bandwidth="125MBps" latency="100us"/>
+    <link id="l170" bandwidth="125MBps" latency="100us"/>
+    <link id="l171" bandwidth="125MBps" latency="100us"/>
+    <link id="l172" bandwidth="125MBps" latency="100us"/>
+    <link id="l173" bandwidth="125MBps" latency="100us"/>
+    
+    <route src="Host 26" dst="Host 27">
+      <link_ctn id="l155"/>
+    </route>
+    <route src="Host 26" dst="Host 28">
+      <link_ctn id="l155"/> <link_ctn id="l154"/><link_ctn id="l156"/>
+    </route>
+    <route src="Host 26" dst="Host 29">
+      <link_ctn id="l152"/><link_ctn id="l157"/>
+    </route>
+    <route src="Host 26" dst="Host 30">
+      <link_ctn id="l152"/><link_ctn id="l161"/>
+    </route>
+    <route src="Host 26" dst="Host 31">
+      <link_ctn id="l166"/>
+    </route>
+    <route src="Host 26" dst="Host 32">
+      <link_ctn id="l152"/><link_ctn id="l169"/>
+    </route>
+    <route src="Host 27" dst="Host 28">
+      <link_ctn id="l154"/><link_ctn id="l156"/>
+    </route>
+    <route src="Host 27" dst="Host 29">
+      <link_ctn id="l159"/>
+    </route>
+    <route src="Host 27" dst="Host 30">
+      <link_ctn id="l162"/>
+    </route>
+    <route src="Host 27" dst="Host 31">
+      <link_ctn id="l167"/>
+    </route>
+    <route src="Host 27" dst="Host 32">
+      <link_ctn id="l154"/><link_ctn id="l170"/>
+    </route>
+    <route src="Host 28" dst="Host 29">
+      <link_ctn id="l160"/>
+    </route>
+    <route src="Host 28" dst="Host 30">
+      <link_ctn id="l163"/>
+    </route>
+    <route src="Host 28" dst="Host 31">
+      <link_ctn id="l163"/><link_ctn id="l168"/>
+    </route>
+    <route src="Host 28" dst="Host 32">
+      <link_ctn id="l156"/><link_ctn id="l170"/>
+    </route>
+    <route src="Host 29" dst="Host 30">
+      <link_ctn id="l164"/>
+    </route>
+    <route src="Host 29" dst="Host 31">
+      <link_ctn id="l159"/><link_ctn id="l167"/>
+    </route>
+    <route src="Host 29" dst="Host 32">
+      <link_ctn id="l171"/>
+    </route>
+    <route src="Host 30" dst="Host 31">
+      <link_ctn id="l168"/>
+    </route>
+    <route src="Host 30" dst="Host 32">
+      <link_ctn id="l172"/>
+    </route>
+    <route src="Host 31" dst="Host 32">
+      <link_ctn id="l173"/>
+    </route>
+  </AS>
+</platform>
+

diff --git a/teshsuite/simdag/availability/linkBandwidth7.bw b/examples/platforms/trace/linkBandwidth7.bw
similarity index 100%
rename from teshsuite/simdag/availability/linkBandwidth7.bw
rename to examples/platforms/trace/linkBandwidth7.bw

diff --git a/examples/simdag/scheduling/CMakeLists.txt b/examples/simdag/scheduling/CMakeLists.txt
index c141076..5aea70e 100644 (file)
--- a/examples/simdag/scheduling/CMakeLists.txt
+++ b/examples/simdag/scheduling/CMakeLists.txt
@@ -17,7 +17,6 @@ set(tesh_files
 set(xml_files
   ${xml_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/Montage_25.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/simulacrum_7_hosts.xml
   PARENT_SCOPE
   )
 set(examples_src

diff --git a/examples/simdag/scheduling/simulacrum_7_hosts.xml b/examples/simdag/scheduling/simulacrum_7_hosts.xml
deleted file mode 100644 (file)
index 0db92e8..0000000
--- a/examples/simdag/scheduling/simulacrum_7_hosts.xml
+++ /dev/null
@@ -1,131 +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="Host 26" power="3.300140519709234Gf" />
-   <host id="Host 27" power="3.867398877553016Gf" />
-   <host id="Host 28" power="1.6522665718098645Gf" />
-   <host id="Host 29" power="1.0759376792481766Gf" />
-   <host id="Host 30" power="2.4818410475340424Gf" />
-   <host id="Host 31" power="1.773869555571436Gf" />
-   <host id="Host 32" power="1.7843609176927505Gf" />
- 
-   <link id="l152" bandwidth="125MBps" latency="100us" />
-   <link id="l153" bandwidth="125MBps" latency="100us" />
-   <link id="l154" bandwidth="125MBps" latency="100us" />
-   <link id="l155" bandwidth="125MBps" latency="100us" />
-   <link id="l156" bandwidth="125MBps" latency="100us" />
-   <link id="l157" bandwidth="125MBps" latency="100us" />
-   <link id="l159" bandwidth="125MBps" latency="100us" />
-   <link id="l160" bandwidth="125MBps" latency="100us" />
-   <link id="l161" bandwidth="125MBps" latency="100us" />
-   <link id="l162" bandwidth="125MBps" latency="100us" />
-   <link id="l163" bandwidth="125MBps" latency="100us" />
-   <link id="l164" bandwidth="125MBps" latency="100us" />
-   <link id="l165" bandwidth="125MBps" latency="100us" />
-   <link id="l166" bandwidth="125MBps" latency="100us" />
-   <link id="l167" bandwidth="125MBps" latency="100us" />
-   <link id="l168" bandwidth="125MBps" latency="100us" />
-   <link id="l169" bandwidth="125MBps" latency="100us" />
-   <link id="l170" bandwidth="125MBps" latency="100us" />
-   <link id="l171" bandwidth="125MBps" latency="100us" />
-   <link id="l172" bandwidth="125MBps" latency="100us" />
-   <link id="l173" bandwidth="125MBps" latency="100us" />
- 
-   <route src="Host 26" dst="Host 27">
-     <link_ctn id="l155"/>
-   </route>
- 
-   <route src="Host 26" dst="Host 28">
-     <link_ctn id="l155"/>
-     <link_ctn id="l154"/>
-     <link_ctn id="l156"/>
-   </route>
- 
-   <route src="Host 26" dst="Host 29">
-     <link_ctn id="l152"/>
-     <link_ctn id="l157"/>
-   </route>
- 
-   <route src="Host 26" dst="Host 30">
-     <link_ctn id="l152"/>
-     <link_ctn id="l161"/>
-   </route>
- 
-   <route src="Host 26" dst="Host 31">
-     <link_ctn id="l166"/>
-   </route>
- 
-   <route src="Host 26" dst="Host 32">
-     <link_ctn id="l152"/>
-     <link_ctn id="l169"/>
-   </route>
- 
-   <route src="Host 27" dst="Host 28">
-     <link_ctn id="l154"/>
-     <link_ctn id="l156"/>
-   </route>
- 
-   <route src="Host 27" dst="Host 29">
-     <link_ctn id="l159"/>
-   </route>
- 
-   <route src="Host 27" dst="Host 30">
-     <link_ctn id="l162"/>
-   </route>
- 
-   <route src="Host 27" dst="Host 31">
-     <link_ctn id="l167"/>
-   </route>
- 
-   <route src="Host 27" dst="Host 32">
-     <link_ctn id="l154"/>
-     <link_ctn id="l170"/>
-   </route>
- 
-   <route src="Host 28" dst="Host 29">
-     <link_ctn id="l160"/>
-   </route>
- 
-   <route src="Host 28" dst="Host 30">
-     <link_ctn id="l163"/>
-   </route>
- 
-   <route src="Host 28" dst="Host 31">
-     <link_ctn id="l163"/>
-     <link_ctn id="l168"/>
-   </route>
- 
-   <route src="Host 28" dst="Host 32">
-     <link_ctn id="l156"/>
-     <link_ctn id="l170"/>
-   </route>
- 
-   <route src="Host 29" dst="Host 30">
-     <link_ctn id="l164"/>
-   </route>
- 
-   <route src="Host 29" dst="Host 31">
-     <link_ctn id="l159"/>
-     <link_ctn id="l167"/>
-   </route>
- 
-   <route src="Host 29" dst="Host 32">
-     <link_ctn id="l171"/>
-   </route>
- 
-   <route src="Host 30" dst="Host 31">
-     <link_ctn id="l168"/>
-   </route>
- 
-   <route src="Host 30" dst="Host 32">
-     <link_ctn id="l172"/>
-   </route>
- 
-   <route src="Host 31" dst="Host 32">
-     <link_ctn id="l173"/>
-   </route>
- 
- </AS>
- </platform>
- 

diff --git a/examples/simdag/scheduling/test_minmin.tesh b/examples/simdag/scheduling/test_minmin.tesh
index 7a04cd3..9a93e1b 100644 (file)
--- a/examples/simdag/scheduling/test_minmin.tesh
+++ b/examples/simdag/scheduling/test_minmin.tesh
@@ -2,7 +2,7 @@
 
 p Simple test of simdag
 
-$ $SG_TEST_EXENV ${bindir:=.}/minmin_test --log=sd_daxparse.thresh:critical ${srcdir:=.}/simulacrum_7_hosts.xml ${srcdir:=.}/Montage_25.xml
+$ $SG_TEST_EXENV ${bindir:=.}/minmin_test --log=sd_daxparse.thresh:critical ${srcdir:=.}/../../platforms/simulacrum_7_hosts.xml ${srcdir:=.}/Montage_25.xml
 > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [0.000000] [test/INFO] Schedule ID00002@mProjectPP on Host 27
 > [0.000105] [test/INFO] Schedule ID00000@mProjectPP on Host 26

diff --git a/teshsuite/simdag/availability/CMakeLists.txt b/teshsuite/simdag/availability/CMakeLists.txt
index 67e641c..ae7ee10 100644 (file)
--- a/teshsuite/simdag/availability/CMakeLists.txt
+++ b/teshsuite/simdag/availability/CMakeLists.txt
@@ -14,11 +14,6 @@ set(tesh_files
   ${CMAKE_CURRENT_SOURCE_DIR}/availability_test.tesh
   PARENT_SCOPE
   )
-set(xml_files
-  ${xml_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/simulacrum_7_hosts.xml
-  PARENT_SCOPE
-  )
 set(teshsuite_src
   ${teshsuite_src}
   ${CMAKE_CURRENT_SOURCE_DIR}/availability_test.c

diff --git a/teshsuite/simdag/availability/availability_test.tesh b/teshsuite/simdag/availability/availability_test.tesh
index 1db14b1..d975690 100644 (file)
--- a/teshsuite/simdag/availability/availability_test.tesh
+++ b/teshsuite/simdag/availability/availability_test.tesh
@@ -1,6 +1,6 @@
 ! output sort
 
-$ simdag/availability/availability_test ${srcdir:=.}/simdag/availability/simulacrum_7_hosts.xml --cfg=path:${srcdir:=.}/simdag/availability/ ${srcdir:=.}/../examples/simdag/scheduling/Montage_25.xml --cfg=network/TCP_gamma:4194304 --log=sd_daxparse.thresh:critical
+$ simdag/availability/availability_test ${srcdir:=.}/../examples/platforms/simulacrum_7_hosts.xml --cfg=path:${srcdir:=.}/simdag/availability/ ${srcdir:=.}/../examples/simdag/scheduling/Montage_25.xml --cfg=network/TCP_gamma:4194304 --log=sd_daxparse.thresh:critical
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304'
 > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > Scheduling DAX...

diff --git a/teshsuite/simdag/availability/simulacrum_7_hosts.xml b/teshsuite/simdag/availability/simulacrum_7_hosts.xml
deleted file mode 100644 (file)
index 2e664a5..0000000
--- a/teshsuite/simdag/availability/simulacrum_7_hosts.xml
+++ /dev/null
@@ -1,225 +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="Host 26" power="3.300140519709234Gf" />
-  <host id="Host 27" power="3.867398877553016Gf" />
-  <host id="Host 28" power="1.6522665718098645Gf" />
-  <host id="Host 29" power="1.0759376792481766Gf" />
-  <host id="Host 30" power="2.4818410475340424Gf" />
-  <host id="Host 31" power="1.773869555571436Gf" />
-  <host id="Host 32" power="1.7843609176927505Gf" />
-
-  <link id="l152" bandwidth="125MBps"  latency="100us" />
-  <link id="l153" bandwidth="125MBps"  latency="100us" />
-  <link id="l154" bandwidth="125MBps"  latency="100us" />
-  <link id="l155" bandwidth="125MBps"  latency="100us" />
-  <link id="l156" bandwidth="125MBps"  latency="100us" />
-  <link id="l157" bandwidth="125MBps"  latency="100us" />
-  <link id="l159" bandwidth="125MBps" bandwidth_file="linkBandwidth7.bw"  latency="100us" />
-  <link id="l160" bandwidth="125MBps" latency="100us" />
-  <link id="l161" bandwidth="125MBps" latency="100us" />
-  <link id="l162" bandwidth="125MBps" latency="100us" />
-  <link id="l163" bandwidth="125MBps" latency="100us" />
-  <link id="l164" bandwidth="125MBps" latency="100us" />
-  <link id="l165" bandwidth="125MBps" latency="100us" />
-  <link id="l166" bandwidth="125MBps" latency="100us" />
-  <link id="l167" bandwidth="125MBps" latency="100us" />
-  <link id="l168" bandwidth="125MBps" latency="100us" />
-  <link id="l169" bandwidth="125MBps" latency="100us" />
-  <link id="l170" bandwidth="125MBps" latency="100us" />
-  <link id="l171" bandwidth="125MBps" latency="100us" />
-  <link id="l172" bandwidth="125MBps" latency="100us" />
-  <link id="l173" bandwidth="125MBps" latency="100us" />
-
-  <route symmetrical="NO" src="Host 26" dst="Host 27">
-    <link_ctn id="l155"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 26" dst="Host 28">
-    <link_ctn id="l155"/>
-    <link_ctn id="l154"/>
-    <link_ctn id="l156"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 26" dst="Host 29">
-    <link_ctn id="l152"/>
-    <link_ctn id="l157"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 26" dst="Host 30">
-    <link_ctn id="l152"/>
-    <link_ctn id="l161"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 26" dst="Host 31">
-    <link_ctn id="l166"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 26" dst="Host 32">
-    <link_ctn id="l152"/>
-    <link_ctn id="l169"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 27" dst="Host 26">
-    <link_ctn id="l155"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 27" dst="Host 28">
-    <link_ctn id="l154"/>
-    <link_ctn id="l156"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 27" dst="Host 29">
-    <link_ctn id="l159"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 27" dst="Host 30">
-    <link_ctn id="l162"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 27" dst="Host 31">
-    <link_ctn id="l167"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 27" dst="Host 32">
-    <link_ctn id="l154"/>
-    <link_ctn id="l170"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 28" dst="Host 26">
-    <link_ctn id="l156"/>
-    <link_ctn id="l154"/>
-    <link_ctn id="l155"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 28" dst="Host 27">
-    <link_ctn id="l156"/>
-    <link_ctn id="l154"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 28" dst="Host 29">
-    <link_ctn id="l160"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 28" dst="Host 30">
-    <link_ctn id="l163"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 28" dst="Host 31">
-    <link_ctn id="l163"/>
-    <link_ctn id="l168"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 28" dst="Host 32">
-    <link_ctn id="l156"/>
-    <link_ctn id="l170"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 29" dst="Host 26">
-    <link_ctn id="l157"/>
-    <link_ctn id="l152"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 29" dst="Host 27">
-    <link_ctn id="l159"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 29" dst="Host 28">
-    <link_ctn id="l160"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 29" dst="Host 30">
-    <link_ctn id="l164"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 29" dst="Host 31">
-    <link_ctn id="l159"/>
-    <link_ctn id="l167"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 29" dst="Host 32">
-    <link_ctn id="l171"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 30" dst="Host 26">
-    <link_ctn id="l161"/>
-    <link_ctn id="l152"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 30" dst="Host 27">
-    <link_ctn id="l162"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 30" dst="Host 28">
-    <link_ctn id="l163"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 30" dst="Host 29">
-    <link_ctn id="l164"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 30" dst="Host 31">
-    <link_ctn id="l168"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 30" dst="Host 32">
-    <link_ctn id="l172"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 31" dst="Host 26">
-    <link_ctn id="l166"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 31" dst="Host 27">
-    <link_ctn id="l167"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 31" dst="Host 28">
-    <link_ctn id="l168"/>
-    <link_ctn id="l163"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 31" dst="Host 29">
-    <link_ctn id="l167"/>
-    <link_ctn id="l159"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 31" dst="Host 30">
-    <link_ctn id="l168"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 31" dst="Host 32">
-    <link_ctn id="l173"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 32" dst="Host 26">
-    <link_ctn id="l169"/>
-    <link_ctn id="l152"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 32" dst="Host 27">
-    <link_ctn id="l170"/>
-    <link_ctn id="l154"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 32" dst="Host 28">
-    <link_ctn id="l170"/>
-    <link_ctn id="l156"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 32" dst="Host 29">
-    <link_ctn id="l171"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 32" dst="Host 30">
-    <link_ctn id="l172"/>
-  </route>
-
-  <route symmetrical="NO" src="Host 32" dst="Host 31">
-    <link_ctn id="l173"/>
-  </route>
-
-</AS>
-</platform>
-

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 7049c5a..c6c5889 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -1254,6 +1254,7 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/conf/transform_optorsim_platform.pl
   examples/platforms/config.xml
   examples/platforms/config_tracing.xml
+  examples/platforms/trace/linkBandwidth7.bw
   examples/platforms/trace/trace_A_failure.txt
   examples/platforms/trace/trace_A.txt
   examples/platforms/trace/trace_B.txt
@@ -1274,6 +1275,7 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/routing_cluster.xml
   examples/platforms/routing_cluster.lua
   examples/platforms/routing_none.xml
+  examples/platforms/simulacrum_7_hosts.xml
   examples/platforms/storage/content/small_content.txt
   examples/platforms/storage/content/storage_content.txt
   examples/platforms/storage/content/win_storage_content.txt