Import of Frederic's files and set up a very basic test (juste parsing the files).

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5770 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/teshsuite/Makefile.am b/teshsuite/Makefile.am
index 2f85a79..5f2dd44 100644 (file)
--- a/teshsuite/Makefile.am
+++ b/teshsuite/Makefile.am
@@ -164,6 +164,11 @@ simdag_network_test_reinit_costs_LDADD   =   $(LDADD_SG)
 TESTS += \
   simdag/network/test_reinit_costs.tesh
 
 TESTS += \
   simdag/network/test_reinit_costs.tesh
 

+noinst_PROGRAMS += simdag/platforms/basic_parsing_test
+simdag_platforms_basic_parsing_test_SOURCES = simdag/platforms/basic_parsing_test.c
+simdag_platforms_basic_parsing_test_LDADD = $(LDADD_SG)
+TESTS += simdag/platforms/basic_parsing_test.tesh
+

 # from L.C. Canon
 noinst_PROGRAMS += simdag/basic0 \
                    simdag/basic1 \
 # from L.C. Canon
 noinst_PROGRAMS += simdag/basic0 \
                    simdag/basic1 \

diff --git a/teshsuite/simdag/platforms/basic_parsing_test.c b/teshsuite/simdag/platforms/basic_parsing_test.c
new file mode 100644 (file)
index 0000000..12705e9
--- /dev/null
+++ b/teshsuite/simdag/platforms/basic_parsing_test.c
@@ -0,0 +1,15 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include "simdag/simdag.h"
+
+int main(int argc, char **argv) {
+  /* initialisation of SD */
+  SD_init(&argc, argv);
+
+  /* creation of the environment */
+  SD_create_environment(argv[1]);
+
+  SD_exit();
+  return 0;
+}
+

diff --git a/teshsuite/simdag/platforms/basic_parsing_test.tesh b/teshsuite/simdag/platforms/basic_parsing_test.tesh
new file mode 100644 (file)
index 0000000..3746230
--- /dev/null
+++ b/teshsuite/simdag/platforms/basic_parsing_test.tesh
@@ -0,0 +1,14 @@
+$ simdag/platforms/basic_parsing_test --surf-path=simdag/platforms one_host_availability.xml
+$ simdag/platforms/basic_parsing_test --surf-path=simdag/platforms one_host_state_file.xml
+$ simdag/platforms/basic_parsing_test --surf-path=simdag/platforms one_host_state_off.xml
+$ simdag/platforms/basic_parsing_test --surf-path=simdag/platforms one_host_state_on.xml
+$ simdag/platforms/basic_parsing_test --surf-path=simdag/platforms one_host.xml
+$ simdag/platforms/basic_parsing_test --surf-path=simdag/platforms one_link_availability.xml
+$ simdag/platforms/basic_parsing_test --surf-path=simdag/platforms one_link_fatpipe.xml
+$ simdag/platforms/basic_parsing_test --surf-path=simdag/platforms one_link_shared.xml
+$ simdag/platforms/basic_parsing_test --surf-path=simdag/platforms one_link_state_file.xml
+$ simdag/platforms/basic_parsing_test --surf-path=simdag/platforms three_hosts_non_symmetric_route.xml
+$ simdag/platforms/basic_parsing_test --surf-path=simdag/platforms two_hosts_multi_hop.xml
+$ simdag/platforms/basic_parsing_test --surf-path=simdag/platforms two_hosts_one_link.xml
+
+

diff --git a/teshsuite/simdag/platforms/bob.fail b/teshsuite/simdag/platforms/bob.fail
new file mode 100644 (file)
index 0000000..0610bcf
--- /dev/null
+++ b/teshsuite/simdag/platforms/bob.fail
@@ -0,0 +1,3 @@
+PERIODICITY 10.0
+1.0 -1.0
+2.0 1.0

diff --git a/teshsuite/simdag/platforms/bob.trace b/teshsuite/simdag/platforms/bob.trace
new file mode 100644 (file)
index 0000000..019c2c8
--- /dev/null
+++ b/teshsuite/simdag/platforms/bob.trace
@@ -0,0 +1,4 @@
+PERIODICITY 1.0
+0.0 1.0
+11.0 0.5
+20.0 0.8

diff --git a/teshsuite/simdag/platforms/link1.bw b/teshsuite/simdag/platforms/link1.bw
new file mode 100644 (file)
index 0000000..ac0d5aa
--- /dev/null
+++ b/teshsuite/simdag/platforms/link1.bw
@@ -0,0 +1,3 @@
+PERIODICITY 12.0
+4.0 40000000
+8.0 60000000

diff --git a/teshsuite/simdag/platforms/link1.fail b/teshsuite/simdag/platforms/link1.fail
new file mode 100644 (file)
index 0000000..0610bcf
--- /dev/null
+++ b/teshsuite/simdag/platforms/link1.fail
@@ -0,0 +1,3 @@
+PERIODICITY 10.0
+1.0 -1.0
+2.0 1.0

diff --git a/teshsuite/simdag/platforms/link1.lat b/teshsuite/simdag/platforms/link1.lat
new file mode 100644 (file)
index 0000000..f4a4bb3
--- /dev/null
+++ b/teshsuite/simdag/platforms/link1.lat
@@ -0,0 +1,4 @@
+PERIODICITY 5.0
+1.0 0.001
+2.0 0.01
+3.0 0.001

diff --git a/teshsuite/simdag/platforms/one_host.xml b/teshsuite/simdag/platforms/one_host.xml
new file mode 100644 (file)
index 0000000..6beabde
--- /dev/null
+++ b/teshsuite/simdag/platforms/one_host.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "simgrid.dtd">
+<platform version="2">
+  <host id="bob" power="500000000"/>
+</platform>

diff --git a/teshsuite/simdag/platforms/one_host_availability.xml b/teshsuite/simdag/platforms/one_host_availability.xml
new file mode 100644 (file)
index 0000000..3fc4f9f
--- /dev/null
+++ b/teshsuite/simdag/platforms/one_host_availability.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "simgrid.dtd">
+<platform version="2">
+  <host id="bob" power="500000000"
+        availability_file="bob.trace"/>
+</platform>

diff --git a/teshsuite/simdag/platforms/one_host_state_file.xml b/teshsuite/simdag/platforms/one_host_state_file.xml
new file mode 100644 (file)
index 0000000..1d14b44
--- /dev/null
+++ b/teshsuite/simdag/platforms/one_host_state_file.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "simgrid.dtd">
+<platform version="2">
+  <host id="bob" power="500000000"
+        state_file="bob.fail"/>
+</platform>

diff --git a/teshsuite/simdag/platforms/one_host_state_off.xml b/teshsuite/simdag/platforms/one_host_state_off.xml
new file mode 100644 (file)
index 0000000..d870c37
--- /dev/null
+++ b/teshsuite/simdag/platforms/one_host_state_off.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "simgrid.dtd">
+<platform version="2">
+  <host id="bob" power="500000000"
+        state="OFF"/>
+</platform>

diff --git a/teshsuite/simdag/platforms/one_host_state_on.xml b/teshsuite/simdag/platforms/one_host_state_on.xml
new file mode 100644 (file)
index 0000000..b08db76
--- /dev/null
+++ b/teshsuite/simdag/platforms/one_host_state_on.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "simgrid.dtd">
+<platform version="2">
+  <host id="bob" power="500000000"
+        state="ON"/>
+</platform>

diff --git a/teshsuite/simdag/platforms/one_link_availability.xml b/teshsuite/simdag/platforms/one_link_availability.xml
new file mode 100644 (file)
index 0000000..c6b7a70
--- /dev/null
+++ b/teshsuite/simdag/platforms/one_link_availability.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "simgrid.dtd">
+<platform version="2">
+  <host id="bob" power="500000000"/>
+  <link id="link1" bandwidth="80000000" latency="0.0001"
+        bandwidth_file="link1.bw" latency_file="link1.lat"/>
+</platform>

diff --git a/teshsuite/simdag/platforms/one_link_fatpipe.xml b/teshsuite/simdag/platforms/one_link_fatpipe.xml
new file mode 100644 (file)
index 0000000..1155bc6
--- /dev/null
+++ b/teshsuite/simdag/platforms/one_link_fatpipe.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "simgrid.dtd">
+<platform version="2">
+  <host id="bob" power="500000000"/>
+  <link id="link1" bandwidth="125000000" latency="5E-5"
+        sharing_policy="FATPIPE"/>
+</platform>

diff --git a/teshsuite/simdag/platforms/one_link_shared.xml b/teshsuite/simdag/platforms/one_link_shared.xml
new file mode 100644 (file)
index 0000000..ac4dd3d
--- /dev/null
+++ b/teshsuite/simdag/platforms/one_link_shared.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "simgrid.dtd">
+<platform version="2">
+  <host id="bob" power="500000000"/>
+  <link id="link1" bandwidth="125000000" latency="5E-5"/>
+</platform>

diff --git a/teshsuite/simdag/platforms/one_link_state_file.xml b/teshsuite/simdag/platforms/one_link_state_file.xml
new file mode 100644 (file)
index 0000000..17773b9
--- /dev/null
+++ b/teshsuite/simdag/platforms/one_link_state_file.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "simgrid.dtd">
+<platform version="2">
+  <host id="bob" power="500000000"/>
+  <link id="link1" bandwidth="80000000" latency="0.0001"
+        state_file="link1.fail"/>
+</platform>

diff --git a/teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml b/teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml
new file mode 100644 (file)
index 0000000..22cff32
--- /dev/null
+++ b/teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml
@@ -0,0 +1,34 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "simgrid.dtd">
+<platform version="2">
+  <host id="bob" power="1000000000"/>
+  <host id="alice" power="500000000"/>
+  <host id="trudy" power="250000000"/>
+
+  <link id="link1" bandwidth="125000000" latency="5E-5"/>
+  <link id="link2" bandwidth="125000000" latency="5E-5"/>
+  <link id="link3" bandwidth="125000000" latency="5E-5"/>
+
+  <route src="bob" dst="alice">
+    <link:ctn id="link1"/>
+  </route>
+  <route src="alice" dst="bob">
+    <link:ctn id="link2"/>
+    <link:ctn id="link3"/>
+  </route>
+
+  <route src="bob" dst="trudy">
+    <link:ctn id="link2"/>
+  </route>
+
+  <route src="trudy" dst="bob">
+    <link:ctn id="link2"/>
+  </route>
+
+  <route src="trudy" dst="alice">
+    <link:ctn id="link3"/>
+  </route>
+  <route src="alice" dst="trudy">
+    <link:ctn id="link3"/>
+  </route>
+</platform>

diff --git a/teshsuite/simdag/platforms/two_hosts_multi_hop.xml b/teshsuite/simdag/platforms/two_hosts_multi_hop.xml
new file mode 100644 (file)
index 0000000..01cad53
--- /dev/null
+++ b/teshsuite/simdag/platforms/two_hosts_multi_hop.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "simgrid.dtd">
+<platform version="2">
+  <host id="bob" power="1000000000"/>
+  <host id="alice" power="500000000"/>
+
+  <link id="link_bob" bandwidth="125000000" latency="5E-5"/>
+  <link id="link_alice" bandwidth="125000000" latency="5E-5"/>
+  <link id="switch" bandwidth="125000000" latency="5E-5"
+        sharing_policy="FATPIPE"/>
+
+  <route src="bob" dst="alice">
+    <link:ctn id="link_bob"/>
+    <link:ctn id="switch"/>
+    <link:ctn id="link_alice"/>
+  </route>
+
+  <route src="alice" dst="bob">
+    <link:ctn id="link_alice"/>
+    <link:ctn id="switch"/>
+    <link:ctn id="link_bob"/>
+  </route>
+</platform>

diff --git a/teshsuite/simdag/platforms/two_hosts_one_link.xml b/teshsuite/simdag/platforms/two_hosts_one_link.xml
new file mode 100644 (file)
index 0000000..306d168
--- /dev/null
+++ b/teshsuite/simdag/platforms/two_hosts_one_link.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "simgrid.dtd">
+<platform version="2">
+  <host id="bob" power="1000000000"/>
+  <host id="alice" power="500000000"/>
+
+  <link id="link1" bandwidth="125000000" latency="5E-5"/>
+
+  <route src="bob" dst="alice">
+    <link:ctn id="link1"/>
+  </route>
+
+  <route src="alice" dst="bob">
+    <link:ctn id="link1"/>
+  </route>
+</platform>