start to factor dummy platforms

diff --git a/teshsuite/simdag/platforms/CMakeLists.txt b/teshsuite/simdag/platforms/CMakeLists.txt
index cb70819..f0962e9 100644 (file)
--- a/teshsuite/simdag/platforms/CMakeLists.txt
+++ b/teshsuite/simdag/platforms/CMakeLists.txt
@@ -30,6 +30,7 @@ set(xml_files
   ${CMAKE_CURRENT_SOURCE_DIR}/four_hosts_floyd_ns3.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/four_hosts_floyd.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/two_hosts_multi_hop.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/link_attributes.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_file.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_multicore.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_fullduplex.xml
@@ -41,10 +42,6 @@ set(xml_files
   ${CMAKE_CURRENT_SOURCE_DIR}/one_host_trace_file.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/one_host_trace_inside.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/one_host.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/one_link_availability.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/one_link_fatpipe.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/one_link_shared.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/one_link_state_file.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/platform_include.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/properties.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/test_of_is_router.xml

diff --git a/teshsuite/simdag/platforms/basic_parsing_test.tesh b/teshsuite/simdag/platforms/basic_parsing_test.tesh
index 20c33d7..5fa9374 100644 (file)
--- a/teshsuite/simdag/platforms/basic_parsing_test.tesh
+++ b/teshsuite/simdag/platforms/basic_parsing_test.tesh
@@ -28,21 +28,9 @@ $ ${bindir:=.}/basic_parsing_test one_host.xml "--log=root.fmt:[%10.6r]%e(%i:%P@
 > [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
 > Workstation number: 1, link number: 1
 
-$ ${bindir:=.}/basic_parsing_test one_link_availability.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${bindir:=.}/basic_parsing_test link_attributes.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
-> Workstation number: 1, link number: 2
-
-$ ${bindir:=.}/basic_parsing_test one_link_fatpipe.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
-> Workstation number: 1, link number: 2
-
-$ ${bindir:=.}/basic_parsing_test one_link_shared.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
-> Workstation number: 1, link number: 2
-
-$ ${bindir:=.}/basic_parsing_test one_link_state_file.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
-> Workstation number: 1, link number: 2
+> Workstation number: 1, link number: 5
 
 $ ${bindir:=.}/basic_parsing_test three_hosts_non_symmetric_route.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.

diff --git a/teshsuite/simdag/platforms/flatifier.tesh b/teshsuite/simdag/platforms/flatifier.tesh
index c9103c2..3db5c7c 100644 (file)
--- a/teshsuite/simdag/platforms/flatifier.tesh
+++ b/teshsuite/simdag/platforms/flatifier.tesh
@@ -357,37 +357,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h
 > </AS>
 > </platform>
 
-$ ${bindir:=.}/flatifier$EXEEXT one_link_availability.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
-> [  0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
-> <?xml version='1.0'?>
-> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-> <platform version="3">
-> <AS id="AS0" routing="Full">
->   <host id="bob" power="500000000"/>
->   <link id="__loopback__" bandwidth="498000000" latency="0.000015000" sharing_policy="FATPIPE"/>
->   <link id="link1" bandwidth="80000000" latency="0.000100000"/>
->   <route src="bob" dst="bob">
->   <link_ctn id="__loopback__"/>
->   </route>
-> </AS>
-> </platform>
-
-$ ${bindir:=.}/flatifier$EXEEXT one_link_fatpipe.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
-> [  0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
-> <?xml version='1.0'?>
-> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-> <platform version="3">
-> <AS id="AS0" routing="Full">
->   <host id="bob" power="500000000"/>
->   <link id="__loopback__" bandwidth="498000000" latency="0.000015000" sharing_policy="FATPIPE"/>
->   <link id="link1" bandwidth="125000000" latency="0.000050000" sharing_policy="FATPIPE"/>
->   <route src="bob" dst="bob">
->   <link_ctn id="__loopback__"/>
->   </route>
-> </AS>
-> </platform>
-
-$ ${bindir:=.}/flatifier$EXEEXT one_link_shared.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
+$ ${bindir:=.}/flatifier$EXEEXT link_attributes.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
 > [  0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
 > <?xml version='1.0'?>
 > <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
@@ -396,21 +366,9 @@ $ ${bindir:=.}/flatifier$EXEEXT one_link_shared.xml "--log=root.fmt:[%10.6r]%e[%
 >   <host id="bob" power="500000000"/>
 >   <link id="__loopback__" bandwidth="498000000" latency="0.000015000" sharing_policy="FATPIPE"/>
 >   <link id="link1" bandwidth="125000000" latency="0.000050000"/>
->   <route src="bob" dst="bob">
->   <link_ctn id="__loopback__"/>
->   </route>
-> </AS>
-> </platform>
-
-$ ${bindir:=.}/flatifier$EXEEXT one_link_state_file.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
-> [  0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
-> <?xml version='1.0'?>
-> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-> <platform version="3">
-> <AS id="AS0" routing="Full">
->   <host id="bob" power="500000000"/>
->   <link id="__loopback__" bandwidth="498000000" latency="0.000015000" sharing_policy="FATPIPE"/>
->   <link id="link1" bandwidth="80000000" latency="0.000100000"/>
+>   <link id="link2" bandwidth="125000000" latency="0.000050000" sharing_policy="FATPIPE"/>
+>   <link id="link3" bandwidth="80000000" latency="0.000100000"/>
+>   <link id="link4" bandwidth="80000000" latency="0.000100000"/>
 >   <route src="bob" dst="bob">
 >   <link_ctn id="__loopback__"/>
 >   </route>

diff --git a/teshsuite/simdag/platforms/link1.bw b/teshsuite/simdag/platforms/link.bw
similarity index 100%
rename from teshsuite/simdag/platforms/link1.bw
rename to teshsuite/simdag/platforms/link.bw

diff --git a/teshsuite/simdag/platforms/link1.fail b/teshsuite/simdag/platforms/link.fail
similarity index 100%
rename from teshsuite/simdag/platforms/link1.fail
rename to teshsuite/simdag/platforms/link.fail

diff --git a/teshsuite/simdag/platforms/link1.lat b/teshsuite/simdag/platforms/link.lat
similarity index 100%
rename from teshsuite/simdag/platforms/link1.lat
rename to teshsuite/simdag/platforms/link.lat

diff --git a/teshsuite/simdag/platforms/link_attributes.xml b/teshsuite/simdag/platforms/link_attributes.xml
new file mode 100644 (file)
index 0000000..ee94405
--- /dev/null
+++ b/teshsuite/simdag/platforms/link_attributes.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4">
+<AS  id="AS0"  routing="Full">
+  <host id="bob" speed="500Mf"/>
+
+  <link id="link1" bandwidth="125MBps" latency="50us"/>
+  <link id="link2" bandwidth="125MBps" latency="50us" sharing_policy="FATPIPE"/>
+  <link id="link3" bandwidth="80MBps" latency="100us" bandwidth_file="link.bw" latency_file="link.lat"/>
+  <link id="link4" bandwidth="80MBps" latency="100us" state_file="link.fail"/>
+</AS>
+</platform>

diff --git a/teshsuite/simdag/platforms/one_link_availability.xml b/teshsuite/simdag/platforms/one_link_availability.xml
deleted file mode 100644 (file)
index 85dd598..0000000
--- a/teshsuite/simdag/platforms/one_link_availability.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-<AS  id="AS0"  routing="Full">
-  <host id="bob" speed="500Mf"/>
-  <link id="link1" bandwidth="80MBps" latency="100us" bandwidth_file="link1.bw" latency_file="link1.lat"/>
-</AS>
-</platform>

diff --git a/teshsuite/simdag/platforms/one_link_fatpipe.xml b/teshsuite/simdag/platforms/one_link_fatpipe.xml
deleted file mode 100644 (file)
index 103a540..0000000
--- a/teshsuite/simdag/platforms/one_link_fatpipe.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS  id="AS0"  routing="Full">
-    <host id="bob" speed="500Mf"/>
-    <link id="link1" bandwidth="125MBps" latency="50us" sharing_policy="FATPIPE"/>
-  </AS>
-</platform>

diff --git a/teshsuite/simdag/platforms/one_link_shared.xml b/teshsuite/simdag/platforms/one_link_shared.xml
deleted file mode 100644 (file)
index 1b427f0..0000000
--- a/teshsuite/simdag/platforms/one_link_shared.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS  id="AS0"  routing="Full">
-    <host id="bob" speed="500Mf"/>
-    <link id="link1" bandwidth="125MBps" latency="50us"/>
-  </AS>
-</platform>

diff --git a/teshsuite/simdag/platforms/one_link_state_file.xml b/teshsuite/simdag/platforms/one_link_state_file.xml
deleted file mode 100644 (file)
index 7eeea58..0000000
--- a/teshsuite/simdag/platforms/one_link_state_file.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS  id="AS0"  routing="Full">
-    <host id="bob" speed="500Mf"/>
-    <link id="link1" bandwidth="80MBps" latency="100us" state_file="link1.fail"/>
-  </AS>
-</platform>