X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e0db756d6838ce418258f8e8f44cc37ce44123e5..c4ba80fc01212c53971f8bad7d34aa399669bcc6:/src/surf/simgrid.dtd

diff --git a/src/surf/simgrid.dtd b/src/surf/simgrid.dtd
index 390b3db926..9bacc7a84f 100644
--- a/src/surf/simgrid.dtd
+++ b/src/surf/simgrid.dtd
@@ -1,7 +1,10 @@
 <!-- Small DTD for SURF based tools. -->
-<!ELEMENT platform ((config|random)*,(include|cluster|peer|AS|trace|trace_connect)*,(include|process)*)>
+<!ELEMENT platform ((config|random)*,(include|cluster|peer|AS|trace|trace_connect)*,(process)*)>
 <!ATTLIST platform version CDATA "0.0">
 
+<!ELEMENT include (include|cluster|peer|AS|trace|trace_connect)*>
+<!ATTLIST include file CDATA #REQUIRED>
+
 <!ELEMENT trace (#PCDATA)>
 <!ATTLIST trace id CDATA #REQUIRED>
 <!ATTLIST trace file CDATA "">
@@ -15,20 +18,36 @@
 <!ATTLIST random std_deviation CDATA #REQUIRED>
 <!ATTLIST random seed CDATA "2147483647">
 <!ATTLIST random radical CDATA "">
-<!ATTLIST random generator (DRAND48|RAND) "DRAND48">
+<!ATTLIST random generator (DRAND48|RAND|RNGSTREAM|NONE) "DRAND48">
 
 <!ELEMENT trace_connect EMPTY>
 <!ATTLIST trace_connect kind (HOST_AVAIL|POWER|LINK_AVAIL|BANDWIDTH|LATENCY) "HOST_AVAIL">
 <!ATTLIST trace_connect trace CDATA #REQUIRED>
 <!ATTLIST trace_connect element CDATA #REQUIRED>
 
-<!ELEMENT AS (((AS|link|cluster|peer|trace|trace_connect)*,(ASroute|trace|trace_connect)*,(bypassRoute|trace|trace_connect)*)|((host|router|link|trace|trace_connect)*,(route|trace|trace_connect)*))>
+<!ELEMENT AS (((AS|include|storage_type|storage|link|cluster|peer|trace|trace_connect)*,(ASroute|trace|trace_connect|bypassASroute)*,(trace|trace_connect)*)|((include|storage_type|storage|host|router|link|trace|trace_connect)*,(route|trace|trace_connect|bypassRoute)*))>
 
 <!ATTLIST AS id CDATA #REQUIRED>
 <!ATTLIST AS routing CDATA #REQUIRED>
-<!ATTLIST AS coordinates  CDATA "">
 
-<!ELEMENT host (prop*)>
+<!ELEMENT storage_type (prop*)>
+<!ATTLIST storage_type id       CDATA #REQUIRED>
+<!ATTLIST storage_type model    CDATA #REQUIRED>
+<!ATTLIST storage_type content  CDATA "0">
+
+<!ELEMENT storage (prop*)>
+<!ATTLIST storage id CDATA #REQUIRED>
+<!ATTLIST storage typeId CDATA #REQUIRED>
+
+<!ELEMENT mount EMPTY>
+<!ATTLIST mount id CDATA #REQUIRED>
+<!ATTLIST mount name CDATA #REQUIRED>
+
+<!ELEMENT mstorage EMPTY>
+<!ATTLIST mstorage typeId CDATA #REQUIRED>
+<!ATTLIST mstorage name CDATA #REQUIRED>
+
+<!ELEMENT host (prop|mount|mstorage)*>
 <!ATTLIST host id CDATA #REQUIRED>
 <!ATTLIST host power CDATA #REQUIRED>
 <!ATTLIST host core  CDATA "1">
@@ -47,12 +66,13 @@
 <!ATTLIST cluster core CDATA "1">
 <!ATTLIST cluster bw CDATA #REQUIRED>
 <!ATTLIST cluster lat CDATA #REQUIRED>
-<!ATTLIST cluster sharing_policy (SHARED|FULLDUPLEX|FATPIPE) "SHARED">
-<!ATTLIST cluster bb_bw CDATA #REQUIRED>
-<!ATTLIST cluster bb_lat CDATA #REQUIRED>
+<!ATTLIST cluster sharing_policy (SHARED|FULLDUPLEX|FATPIPE) "FULLDUPLEX">
+<!ATTLIST cluster bb_bw CDATA "">
+<!ATTLIST cluster bb_lat CDATA "">
 <!ATTLIST cluster bb_sharing_policy (SHARED|FATPIPE) "SHARED">
 <!ATTLIST cluster availability_file CDATA "">
 <!ATTLIST cluster state_file CDATA "">
+<!ATTLIST cluster router_id CDATA "">
 
 <!ELEMENT peer EMPTY>
 <!ATTLIST peer id CDATA #REQUIRED>
@@ -61,7 +81,6 @@
 <!ATTLIST peer bw_out CDATA #REQUIRED>
 <!ATTLIST peer lat CDATA #REQUIRED>
 <!ATTLIST peer coordinates CDATA "">
-<!ATTLIST peer sharing_policy (SHARED|FULLDUPLEX) "FULLDUPLEX">
 <!ATTLIST peer availability_file CDATA "">
 <!ATTLIST peer state_file CDATA "">
 
@@ -98,8 +117,12 @@
 <!ELEMENT bypassRoute (link_ctn*)>
 <!ATTLIST bypassRoute src CDATA #REQUIRED>
 <!ATTLIST bypassRoute dst CDATA #REQUIRED>
-<!ATTLIST bypassRoute gw_src CDATA #REQUIRED>
-<!ATTLIST bypassRoute gw_dst CDATA #REQUIRED>
+
+<!ELEMENT bypassASroute (link_ctn*)>
+<!ATTLIST bypassASroute src CDATA #REQUIRED>
+<!ATTLIST bypassASroute dst CDATA #REQUIRED>
+<!ATTLIST bypassASroute gw_src CDATA #REQUIRED>
+<!ATTLIST bypassASroute gw_dst CDATA #REQUIRED>
 
 <!ELEMENT process ((argument|prop)*)>
 <!ATTLIST process host CDATA #REQUIRED>