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

diff --git a/src/surf/simgrid.dtd b/src/surf/simgrid.dtd
index 4a6adf21bc..e35313ae31 100644
--- a/src/surf/simgrid.dtd
+++ b/src/surf/simgrid.dtd
@@ -1,8 +1,8 @@
 <!-- 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 EMPTY>
+<!ELEMENT include (include|cluster|peer|AS|trace|trace_connect)*>
 <!ATTLIST include file CDATA #REQUIRED>
 
 <!ELEMENT trace (#PCDATA)>
@@ -25,17 +25,30 @@
 <!ATTLIST trace_connect trace CDATA #REQUIRED>
 <!ATTLIST trace_connect element CDATA #REQUIRED>
 
-<!ELEMENT AS (((AS|include|storage|link|cluster|peer|trace|trace_connect)*,(ASroute|trace|trace_connect)*,(bypassRoute|trace|trace_connect)*)|((include|storage|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>
 
+<!ELEMENT storage_type (prop*)>
+<!ATTLIST storage_type id       CDATA #REQUIRED>
+<!ATTLIST storage_type model    CDATA #REQUIRED>
+<!ATTLIST storage_type size     CDATA #REQUIRED>
+<!ATTLIST storage_type content  CDATA "0">
+
 <!ELEMENT storage (prop*)>
 <!ATTLIST storage id CDATA #REQUIRED>
-<!ATTLIST storage type CDATA #REQUIRED>
-<!ATTLIST storage content  CDATA "0">
+<!ATTLIST storage typeId CDATA #REQUIRED>
+
+<!ELEMENT mount EMPTY>
+<!ATTLIST mount id CDATA #REQUIRED>
+<!ATTLIST mount name CDATA #REQUIRED>
 
-<!ELEMENT host (prop*)>
+<!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">
@@ -105,8 +118,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>