Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Add test for cluster tag with state_file and availability_file.
authornavarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Thu, 13 Jan 2011 15:15:10 +0000 (15:15 +0000)
committernavarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Thu, 13 Jan 2011 15:15:10 +0000 (15:15 +0000)
Can now add state file and availability file with regex.
For example :
state_file="${prefix}${radical}_state_file.trace"
availability_file="${prefix}${radical}_availability_file.trace"

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

teshsuite/simdag/platforms/basic_parsing_test.tesh
teshsuite/simdag/platforms/bob0_availability_file.trace [new file with mode: 0644]
teshsuite/simdag/platforms/bob0_state_file.trace [new file with mode: 0644]
teshsuite/simdag/platforms/bob2_availability_file.trace [new file with mode: 0644]
teshsuite/simdag/platforms/bob2_state_file.trace [new file with mode: 0644]
teshsuite/simdag/platforms/one_cluster_file.xml [new file with mode: 0644]

index d4ee225..14102d8 100644 (file)
@@ -80,4 +80,8 @@ $ ${bindir:=.}/basic_parsing_test ./properties.xml
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'Vegas'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to '~/'
-> Workstation number: 1, link number: 1
\ No newline at end of file
+> Workstation number: 1, link number: 1
+
+$ ${bindir:=.}/basic_parsing_test ./one_cluster_file.xml
+> [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07
+> Workstation number: 2, link number: 5
\ No newline at end of file
diff --git a/teshsuite/simdag/platforms/bob0_availability_file.trace b/teshsuite/simdag/platforms/bob0_availability_file.trace
new file mode 100644 (file)
index 0000000..019c2c8
--- /dev/null
@@ -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/bob0_state_file.trace b/teshsuite/simdag/platforms/bob0_state_file.trace
new file mode 100644 (file)
index 0000000..019c2c8
--- /dev/null
@@ -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/bob2_availability_file.trace b/teshsuite/simdag/platforms/bob2_availability_file.trace
new file mode 100644 (file)
index 0000000..019c2c8
--- /dev/null
@@ -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/bob2_state_file.trace b/teshsuite/simdag/platforms/bob2_state_file.trace
new file mode 100644 (file)
index 0000000..019c2c8
--- /dev/null
@@ -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/one_cluster_file.xml b/teshsuite/simdag/platforms/one_cluster_file.xml
new file mode 100644 (file)
index 0000000..11776f5
--- /dev/null
@@ -0,0 +1,11 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "simgrid.dtd">
+<platform version="3">
+<AS id="AS0" routing="Full">
+  <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu"
+   radical="0,2" power="1000000000.00" bw="125000000.00" lat="5e-5"
+   bb_bw="2250000000.00" bb_lat="5e-4"
+   state_file="${prefix}${radical}_state_file.trace"
+   availability_file="${prefix}${radical}_availability_file.trace"/>
+</AS>
+</platform>