kill a couple of unused/redundant XML files

 + cosmetics

diff --git a/.gitignore b/.gitignore
index 20dac52..b6cdd30 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -299,8 +299,8 @@ teshsuite/simdag/comp-only-seq/comp-only-seq
 teshsuite/simdag/flatifier/flatifier
 teshsuite/simdag/incomplete/incomplete
 teshsuite/simdag/is-router/is-router
 teshsuite/simdag/flatifier/flatifier
 teshsuite/simdag/incomplete/incomplete
 teshsuite/simdag/is-router/is-router

-teshsuite/simdag/platforms/evaluate_get_route_time
-teshsuite/simdag/platforms/evaluate_parse_time
+teshsuite/simdag/evaluate-get-route-time/evaluate-get-route-time
+teshsuite/simdag/evaluate-parse-time/evaluate-parse-time

 teshsuite/simix/check_defaults/check_defaults
 teshsuite/simix/stack_overflow/stack_overflow
 teshsuite/smpi/bug-17132/bug-17132
 teshsuite/simix/check_defaults/check_defaults
 teshsuite/simix/stack_overflow/stack_overflow
 teshsuite/smpi/bug-17132/bug-17132

diff --git a/teshsuite/simdag/CMakeLists.txt b/teshsuite/simdag/CMakeLists.txt
index 249a4f9..0626755 100644 (file)
--- a/teshsuite/simdag/CMakeLists.txt
+++ b/teshsuite/simdag/CMakeLists.txt
@@ -63,9 +63,7 @@ set(tesh_files    ${tesh_files}     ${CMAKE_CURRENT_SOURCE_DIR}/flatifier/bogus_
                                     ${CMAKE_CURRENT_SOURCE_DIR}/basic-parsing-test/basic-parsing-test-sym-full.tesh
                                     ${CMAKE_CURRENT_SOURCE_DIR}/basic-parsing-test/basic-parsing-test-bypass.tesh
                                     PARENT_SCOPE)
                                     ${CMAKE_CURRENT_SOURCE_DIR}/basic-parsing-test/basic-parsing-test-sym-full.tesh
                                     ${CMAKE_CURRENT_SOURCE_DIR}/basic-parsing-test/basic-parsing-test-bypass.tesh
                                     PARENT_SCOPE)

-set(xml_files     ${xml_files}      ${CMAKE_CURRENT_SOURCE_DIR}/platforms/four_hosts_Dijkstra_ns3.xml
-                                    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/four_hosts_floyd_ns3.xml
-                                    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/four_hosts_floyd.xml
+set(xml_files     ${xml_files}      ${CMAKE_CURRENT_SOURCE_DIR}/platforms/four_hosts_floyd.xml

                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/two_hosts_multi_hop.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/host_attributes.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/link_attributes.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/two_hosts_multi_hop.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/host_attributes.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/link_attributes.xml


@@ -86,7 +84,6 @@ set(xml_files     ${xml_files}      ${CMAKE_CURRENT_SOURCE_DIR}/platforms/four_h
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/bogus_missing_dst_gateway.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/bogus_two_hosts_asymetric.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/two_hosts_one_link_fullduplex.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/bogus_missing_dst_gateway.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/bogus_two_hosts_asymetric.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/two_hosts_one_link_fullduplex.xml

-                                    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/two_hosts_one_link_symmetrical.xml

                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/two_hosts_one_link.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/clusterA.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/clusterB.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/two_hosts_one_link.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/clusterA.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/clusterB.xml

diff --git a/teshsuite/simdag/basic-parsing-test/basic-parsing-test-sym-full.tesh b/teshsuite/simdag/basic-parsing-test/basic-parsing-test-sym-full.tesh
index 0e647a1..f243b28 100644 (file)
--- a/teshsuite/simdag/basic-parsing-test/basic-parsing-test-sym-full.tesh
+++ b/teshsuite/simdag/basic-parsing-test/basic-parsing-test-sym-full.tesh
@@ -271,25 +271,21 @@ $ ${bindir:=.}/basic-parsing-test ../platforms/two_clusters.xml FULL_LINK "--log
 >   Link alice_cluster_link_1_DOWN: latency = 0.000050, bandwidth = 125000000.000000
 >   Route latency = 0.000600, route bandwidth = 125000000.000000
 
 >   Link alice_cluster_link_1_DOWN: latency = 0.000050, bandwidth = 125000000.000000
 >   Route latency = 0.000600, route bandwidth = 125000000.000000
 

-$ ${bindir:=.}/basic-parsing-test ../platforms/two_hosts_one_link_symmetrical.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${bindir:=.}/basic-parsing-test ../platforms/two_hosts_one_link.xml FULL_LINK "--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.
 > [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.

-> Workstation number: 2, link number: 4
+> Workstation number: 2, link number: 2

 > Route between alice and alice
 >   Route size 1
 >   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
 >   Route latency = 0.000015, route bandwidth = 498000000.000000
 > Route between alice and bob
 > Route between alice and alice
 >   Route size 1
 >   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
 >   Route latency = 0.000015, route bandwidth = 498000000.000000
 > Route between alice and bob

->   Route size 3
->   Link link3: latency = 0.000050, bandwidth = 125000000.000000
->   Link link2: latency = 0.000050, bandwidth = 125000000.000000
+>   Route size 1

 >   Link link1: latency = 0.000050, bandwidth = 125000000.000000
 >   Link link1: latency = 0.000050, bandwidth = 125000000.000000

->   Route latency = 0.000150, route bandwidth = 125000000.000000
+>   Route latency = 0.000050, route bandwidth = 125000000.000000

 > Route between bob and alice
 > Route between bob and alice

->   Route size 3
+>   Route size 1

 >   Link link1: latency = 0.000050, bandwidth = 125000000.000000
 >   Link link1: latency = 0.000050, bandwidth = 125000000.000000

->   Link link2: latency = 0.000050, bandwidth = 125000000.000000
->   Link link3: latency = 0.000050, bandwidth = 125000000.000000
->   Route latency = 0.000150, route bandwidth = 125000000.000000
+>   Route latency = 0.000050, route bandwidth = 125000000.000000

 > Route between bob and bob
 >   Route size 1
 >   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
 > Route between bob and bob
 >   Route size 1
 >   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000

diff --git a/teshsuite/simdag/flatifier/bogus_disk_attachment.tesh b/teshsuite/simdag/flatifier/bogus_disk_attachment.tesh
index 7a581f2..ad88ae7 100644 (file)
--- a/teshsuite/simdag/flatifier/bogus_disk_attachment.tesh
+++ b/teshsuite/simdag/flatifier/bogus_disk_attachment.tesh
@@ -1,5 +1,5 @@
 ! expect signal SIGABRT
 $ ${bindir:=.}/flatifier ../platforms/bogus_disk_attachment.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.
 ! expect signal SIGABRT
 $ ${bindir:=.}/flatifier ../platforms/bogus_disk_attachment.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.

-> [  0.000000] [0:maestro@] Parse error at ../platforms/bogus_disk_attachment.xml:21: Unable to attach storage cdisk: host plouf doesn't exist.
+> [  0.000000] [0:maestro@] Parse error at ../platforms/bogus_disk_attachment.xml:19: Unable to attach storage cdisk: host plouf doesn't exist.

 > [  0.000000] [0:maestro@] Exiting now
 > [  0.000000] [0:maestro@] Exiting now

diff --git a/teshsuite/simdag/flatifier/bogus_missing_gateway.tesh b/teshsuite/simdag/flatifier/bogus_missing_gateway.tesh
index 781b89f..6a28da6 100644 (file)
--- a/teshsuite/simdag/flatifier/bogus_missing_gateway.tesh
+++ b/teshsuite/simdag/flatifier/bogus_missing_gateway.tesh
@@ -1,11 +1,11 @@
 ! expect signal SIGABRT
 $ ${bindir:=.}/flatifier ../platforms/bogus_missing_src_gateway.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.
 ! expect signal SIGABRT
 $ ${bindir:=.}/flatifier ../platforms/bogus_missing_src_gateway.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.

-> [  0.000000] [0:maestro@] Parse error at ../platforms/bogus_missing_src_gateway.xml:16: ASroute gw_src='nod-cluster_router.cluster.us' does name a node.
+> [  0.000000] [0:maestro@] Parse error at ../platforms/bogus_missing_src_gateway.xml:14: ASroute gw_src='nod-cluster_router.cluster.us' does name a node.

 > [  0.000000] [0:maestro@] Exiting now
 
 ! expect signal SIGABRT
 $ ${bindir:=.}/flatifier ../platforms/bogus_missing_dst_gateway.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.
 > [  0.000000] [0:maestro@] Exiting now
 
 ! expect signal SIGABRT
 $ ${bindir:=.}/flatifier ../platforms/bogus_missing_dst_gateway.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.

-> [  0.000000] [0:maestro@] Parse error at ../platforms/bogus_missing_dst_gateway.xml:16: ASroute gw_dst='neud-grappe_router.grappe.fr' does name a node.
+> [  0.000000] [0:maestro@] Parse error at ../platforms/bogus_missing_dst_gateway.xml:14: ASroute gw_dst='neud-grappe_router.grappe.fr' does name a node.

 > [  0.000000] [0:maestro@] Exiting now
 > [  0.000000] [0:maestro@] Exiting now

diff --git a/teshsuite/simdag/platforms/Dijkstra.xml b/teshsuite/simdag/platforms/Dijkstra.xml
index 39e7fb3..9504826 100644 (file)
--- a/teshsuite/simdag/platforms/Dijkstra.xml
+++ b/teshsuite/simdag/platforms/Dijkstra.xml
@@ -9,7 +9,6 @@
 
    <link id="1" bandwidth="1MBps" latency="1ms"/>
    <link id="2" bandwidth="1MBps" latency="1ms"/>
 
    <link id="1" bandwidth="1MBps" latency="1ms"/>
    <link id="2" bandwidth="1MBps" latency="1ms"/>

-

    <link id="10" bandwidth="1MBps" latency="1ms"/>
    <link id="11" bandwidth="1MBps" latency="1ms"/>
    <link id="12" bandwidth="1MBps" latency="1ms"/>
    <link id="10" bandwidth="1MBps" latency="1ms"/>
    <link id="11" bandwidth="1MBps" latency="1ms"/>
    <link id="12" bandwidth="1MBps" latency="1ms"/>

diff --git a/teshsuite/simdag/platforms/bogus_disk_attachment.xml b/teshsuite/simdag/platforms/bogus_disk_attachment.xml
index b7c85a2..60c1468 100644 (file)
--- a/teshsuite/simdag/platforms/bogus_disk_attachment.xml
+++ b/teshsuite/simdag/platforms/bogus_disk_attachment.xml
@@ -1,7 +1,5 @@
 <!-- THIS FILE IS INVALID.
 <!-- THIS FILE IS INVALID.

-
-It declares a storage attached to a nonexistant host (plouf). See bogus_disk_attachment.tesh -->
-
+     It declares a storage attached to a nonexistant host (plouf). See bogus_disk_attachment.tesh -->

 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">

diff --git a/teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml b/teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml
index d92e7da..e237a2d 100644 (file)
--- a/teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml
+++ b/teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml
@@ -3,12 +3,10 @@
 <platform version="4">
   <AS id="World" routing="Full">
     <AS id="us" routing="Full">
 <platform version="4">
   <AS id="World" routing="Full">
     <AS id="us" routing="Full">

-       <cluster id="cluster" suffix=".cluster.us" prefix="node-" radical="1-4" core="24" speed="9.27114e8f"
-                bw="938e6Bps" lat="270us"/>
+       <cluster id="cluster" suffix=".cluster.us" prefix="node-" radical="1-4" speed="1Gf" bw="938MBps" lat="270us"/>

     </AS>
     <AS id="fr" routing="Full">
     </AS>
     <AS id="fr" routing="Full">

-       <cluster id="grappe" suffix=".grappe.fr" prefix="noeud-" radical="1-4" core="24" speed="9.27114e8f"
-                bw="938e6Bps" lat="270us"/>
+       <cluster id="grappe" suffix=".grappe.fr" prefix="noeud-" radical="1-4" speed="1Gf" bw="938MBps" lat="270us"/>

     </AS>
 
     <link id="backbone" bandwidth="1.25GBps" latency="500us"/>
     </AS>
 
     <link id="backbone" bandwidth="1.25GBps" latency="500us"/>

diff --git a/teshsuite/simdag/platforms/bogus_missing_src_gateway.xml b/teshsuite/simdag/platforms/bogus_missing_src_gateway.xml
index e9ce2fc..00d76f9 100644 (file)
--- a/teshsuite/simdag/platforms/bogus_missing_src_gateway.xml
+++ b/teshsuite/simdag/platforms/bogus_missing_src_gateway.xml
@@ -2,13 +2,11 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <AS id="World" routing="Full">
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <AS id="World" routing="Full">

-     <AS id="us" routing="Full">
-        <cluster id="cluster" suffix=".cluster.us" prefix="node-" radical="1-4" core="24" speed="9.27114e8f"
-                 bw="938e6Bps" lat="270us"/>
-      </AS>
+    <AS id="us" routing="Full">
+       <cluster id="cluster" suffix=".cluster.us" prefix="node-" radical="1-4" speed="1Gf" bw="938MBps" lat="270us"/>
+    </AS>

     <AS id="fr" routing="Full">
     <AS id="fr" routing="Full">

-        <cluster id="grappe" suffix=".grappe.fr" prefix="noeud-" radical="1-4" core="24" speed="9.27114e8f"
-                 bw="938e6Bps" lat="270us"/>
+        <cluster id="grappe" suffix=".grappe.fr" prefix="noeud-" radical="1-4" speed="1Gf" bw="938MBps" lat="270us"/>

     </AS>
 
     <link id="backbone" bandwidth="1.25GBps" latency="500us"/>
     </AS>
 
     <link id="backbone" bandwidth="1.25GBps" latency="500us"/>

diff --git a/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml b/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml
index 83c23c3..2c88726 100644 (file)
--- a/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml
+++ b/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml
@@ -1,8 +1,6 @@
 <!-- THIS FILE IS INVALID.
 <!-- THIS FILE IS INVALID.

-
-It declares a route alice->bob and another bob->alice, both being different.
-It is used to check that this (bogus) file is detected as is (see two_hosts_asymetric.tesh) -->
-
+     It declares a route alice->bob and another bob->alice, both being different.
+     It is used to check that this (bogus) file is detected as is (see two_hosts_asymetric.tesh) -->

 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">


@@ -14,7 +12,6 @@ It is used to check that this (bogus) file is detected as is (see two_hosts_asym
    <link id="link2" bandwidth="125MBps" latency="50us"/>
 
    <route src="bob" dst="alice"><link_ctn id="link1"/></route>
    <link id="link2" bandwidth="125MBps" latency="50us"/>
 
    <route src="bob" dst="alice"><link_ctn id="link1"/></route>

-

    <route src="alice" dst="bob"><link_ctn id="link2"/></route>
   </AS>
 </platform>
    <route src="alice" dst="bob"><link_ctn id="link2"/></route>
   </AS>
 </platform>

diff --git a/teshsuite/simdag/platforms/clusterB.xml b/teshsuite/simdag/platforms/clusterB.xml
index a1f69b3..45476ed 100644 (file)
--- a/teshsuite/simdag/platforms/clusterB.xml
+++ b/teshsuite/simdag/platforms/clusterB.xml
@@ -1,5 +1,4 @@
 <AS id="ASB" routing="Full">
 <AS id="ASB" routing="Full">

-  <cluster id="clusterB" prefix="B" suffix=".hamburger.edu"
-   radical="0,2-4,6" power="1Gf" bw="125MBps" lat="50us"
-   bb_bw="2.25GBps" bb_lat="500us"/>
+  <cluster id="clusterB" prefix="B" suffix=".hamburger.edu" radical="0,2-4,6" power="1Gf" bw="125MBps" lat="50us"
+           bb_bw="2.25GBps" bb_lat="500us"/>

 </AS>
 </AS>

diff --git a/teshsuite/simdag/platforms/four_hosts_Dijkstra_ns3.xml b/teshsuite/simdag/platforms/four_hosts_Dijkstra_ns3.xml
deleted file mode 100644 (file)
index b293a8a..0000000
--- a/teshsuite/simdag/platforms/four_hosts_Dijkstra_ns3.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS id="AS0" routing="Dijkstra">
-    <host id="host1" speed="1Gf"/>
-    <host id="host2" speed="1Gf"/>
-    <host id="host3" speed="1Gf"/>
-    <host id="host4" speed="1Gf"/>
-
-    <link id="link1" bandwidth="125GBps" latency="50us"/>
-    <link id="link2" bandwidth="125MBps" latency="5us"/>
-    <link id="link3" bandwidth="125kBps" latency="500ns"/>
-    <link id="link4" bandwidth="125Bps" latency="5ns"/>
-
-    <route src="host1" dst="host2"><link_ctn id="link1"/></route>
-    <route src="host1" dst="host3"><link_ctn id="link2"/></route>
-  </AS>
-</platform>

diff --git a/teshsuite/simdag/platforms/four_hosts_floyd_ns3.xml b/teshsuite/simdag/platforms/four_hosts_floyd_ns3.xml
deleted file mode 100644 (file)
index bf2c664..0000000
--- a/teshsuite/simdag/platforms/four_hosts_floyd_ns3.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS  id="AS0"  routing="Floyd">
-    <host id="host1" speed="1Gf"/>
-    <host id="host2" speed="1Gf"/>
-    <host id="host3" speed="1Gf"/>
-    <host id="host4" speed="1Gf"/>
- 
-    <link id="link1" bandwidth="125GBps" latency="50us"/>
-    <link id="link2" bandwidth="125MBps" latency="5us"/>
-    <link id="link3" bandwidth="125kBps" latency="500ns"/>
-    <link id="link4" bandwidth="1.25kBps" latency="5ns"/>  
-
-    <route src="host1" dst="host2"><link_ctn id="link1"/></route>
-    <route src="host2" dst="host3"><link_ctn id="link3"/></route>
-    <route src="host3" dst="host4"><link_ctn id="link4"/></route>
-  </AS>
-</platform>

diff --git a/teshsuite/simdag/platforms/two_hosts_one_link_symmetrical.xml b/teshsuite/simdag/platforms/two_hosts_one_link_symmetrical.xml
deleted file mode 100644 (file)
index a9f34b0..0000000
--- a/teshsuite/simdag/platforms/two_hosts_one_link_symmetrical.xml
+++ /dev/null
@@ -1,14 +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="1Gf"/>
-    <host id="alice" speed="500Mf"/>
-
-    <link id="link1" bandwidth="125MBps" latency="50us"/>
-    <link id="link2" bandwidth="125MBps" latency="50us"/>
-    <link id="link3" bandwidth="125MBps" latency="50us"/>
-
-    <route src="bob" dst="alice"><link_ctn id="link1"/><link_ctn id="link2"/><link_ctn id="link3"/></route>
-  </AS>
-</platform>