X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f4d90de0fffa1e2813b6b00e491f4f865c6e5389..07ab66b75202165f5f9fcb66837fd9bf8c372d66:/src/surf/xml/simgrid.dtd

diff --git a/src/surf/xml/simgrid.dtd b/src/surf/xml/simgrid.dtd
index 65543dc6e5..fa0205e41e 100644
--- a/src/surf/xml/simgrid.dtd
+++ b/src/surf/xml/simgrid.dtd
@@ -1,20 +1,20 @@
 <!--
              DTD of SimGrid platform and deployment files.
 
-More info: http://simgrid.gforge.inria.fr/simgrid/latest/doc/platform.html
+More info: https://simgrid.org/doc/latest/platform.html
 To upgrade your files, use the tool simgrid_update_xml
 
 * Things that will change in upcoming version 5 (TODO):
   - The following tags will be removed:
     - <include> spits an error since v3.18
-    - <random> does nothing since a very long time
-    - <as>, <asroute>, <bypassZoneRoute> and <process>, deprecated in DTD4.1
+    - <random> and <model_prop> do nothing since a very long time
+    - <as>, <asroute>, <bypassASRoute> and <process>, deprecated in DTD4.1
   - FULLDUPLEX sharing will be removed, deprecated in DTD4.2 (v3.19)
 
 * New in DTD version 4.1 (in SimGrid 3.16): backward compatible change (v4 files are valid v4.1 files)
    - <zone> can be used as a synonym for the now deprecated <as>
    - <zoneRoute> can be used as a synonym for the now deprecated <asroute>
-   - <bypassZoneRoute> an be used as a synonym for the now deprecated <bypassAsRoute>
+   - <bypassZoneRoute> can be used as a synonym for the now deprecated <bypassAsRoute>
    - <actor> can be used as a synonym for the now deprecated <process>
   Other backward-compatible changes for which we did not bump the DTD version.
   - SPLITDUPLEX is the new spelling of the deprecated FULLDUPLEX (SimGrid v3.19)
@@ -69,7 +69,7 @@ To upgrade your files, use the tool simgrid_update_xml
      - PLATFORM_DESCRIPTION -> PLATFORM
 
 * New in DTD version 1 (in SimGrid 3.3):
-   - DTD is now versionned with the version attribute of platform
+   - DTD is now versioned with the version attribute of platform
    - Unit change:
      - Link bandwidth: from Mb/s to b/s
      - CPU speed: from MFlop/s to Flop/s
@@ -88,6 +88,7 @@ To upgrade your files, use the tool simgrid_update_xml
 <!ATTLIST trace file CDATA "">
 <!ATTLIST trace periodicity CDATA #REQUIRED>
 
+<!-- random is deprecated -->
 <!ELEMENT random EMPTY>
 <!ATTLIST random id CDATA #REQUIRED>
 <!ATTLIST random min CDATA #REQUIRED>
@@ -103,8 +104,7 @@ To upgrade your files, use the tool simgrid_update_xml
 <!ATTLIST trace_connect trace CDATA #REQUIRED>
 <!ATTLIST trace_connect element CDATA #REQUIRED>
 
-<!-- A zone is either an internal node that contains other zones, 
-     or a  leaf containing hosts and other leaf-like elements -->
+<!-- AS is a deprecated equivalent of zone -->
 <!ELEMENT AS ((prop*),
           (((AS|zone|include|link|backbone|cabinet|cluster|peer|trace|trace_connect)*,
 	    (zoneRoute|ASroute|trace|trace_connect|bypassASroute|bypassZoneRoute)*,
@@ -112,7 +112,7 @@ To upgrade your files, use the tool simgrid_update_xml
 	   |((include|storage_type|storage|host|cabinet|router|link|backbone|trace|trace_connect|host_link)*,
 	     (route|trace|trace_connect|bypassRoute)*)))>
 <!ATTLIST AS id CDATA #REQUIRED>
-<!ATTLIST AS routing (Full|Floyd|Dijkstra|DijkstraCache|None|Vivaldi|Cluster|ClusterTorus|ClusterFatTree|ClusterDragonfly) #REQUIRED>
+<!ATTLIST AS routing CDATA #REQUIRED>
 
 <!-- A zone is either an internal node that contains other zones, 
      or a  leaf containing hosts and other leaf-like elements -->
@@ -123,19 +123,24 @@ To upgrade your files, use the tool simgrid_update_xml
 	   |((include|storage_type|storage|host|cabinet|router|link|backbone|trace|trace_connect|host_link)*,
 	     (route|trace|trace_connect|bypassRoute)*)))>
 <!ATTLIST zone id CDATA #REQUIRED>
-<!ATTLIST zone routing (Full|Floyd|Dijkstra|DijkstraCache|None|Vivaldi|Cluster|ClusterTorus|ClusterFatTree|ClusterDragonfly) #REQUIRED>
+<!ATTLIST zone routing CDATA #REQUIRED>
 
+<!-- storage, storage_type and mount are deprecated -->
 <!ELEMENT storage_type ((model_prop|prop)*)>
 <!ATTLIST storage_type id       CDATA #REQUIRED>
 <!ATTLIST storage_type model    CDATA "N11">
 <!ATTLIST storage_type size     CDATA #REQUIRED>
 <!ATTLIST storage_type content  CDATA "">
-
+<!ELEMENT storage (prop*)>
+<!ATTLIST storage id CDATA #REQUIRED>
+<!ATTLIST storage typeId CDATA #REQUIRED>
+<!ATTLIST storage content  CDATA "">
+<!ATTLIST storage attach CDATA #REQUIRED>
 <!ELEMENT mount EMPTY>
 <!ATTLIST mount storageId CDATA #REQUIRED>
 <!ATTLIST mount name CDATA #REQUIRED>
 
-<!ELEMENT host (prop|mount)*>
+<!ELEMENT host (disk|prop|mount)*>
 <!ATTLIST host id CDATA #REQUIRED>
 <!ATTLIST host speed CDATA #REQUIRED>
 <!ATTLIST host core  CDATA "1">
@@ -145,11 +150,10 @@ To upgrade your files, use the tool simgrid_update_xml
 <!ATTLIST host coordinates  CDATA "">
 <!ATTLIST host pstate CDATA "0.0">
 
-<!ELEMENT storage (prop*)>
-<!ATTLIST storage id CDATA #REQUIRED>
-<!ATTLIST storage typeId CDATA #REQUIRED>
-<!ATTLIST storage content  CDATA "">
-<!ATTLIST storage attach CDATA #REQUIRED>
+<!ELEMENT disk (prop*)>
+<!ATTLIST disk id CDATA "/">
+<!ATTLIST disk read_bw CDATA #REQUIRED>
+<!ATTLIST disk write_bw CDATA #REQUIRED>
 
 <!ELEMENT host_link EMPTY>
 <!ATTLIST host_link id CDATA #REQUIRED>
@@ -212,19 +216,25 @@ To upgrade your files, use the tool simgrid_update_xml
 <!ATTLIST link latency CDATA "0">
 <!ATTLIST link latency_file CDATA "">
 <!ATTLIST link state_file CDATA "">
-<!ATTLIST link sharing_policy (SHARED|SPLITDUPLEX|FULLDUPLEX|FATPIPE) "SHARED">
+<!ATTLIST link sharing_policy (SHARED|SPLITDUPLEX|FULLDUPLEX|FATPIPE|WIFI) "SHARED">
 
 <!ELEMENT route (link_ctn*)>
 <!ATTLIST route src CDATA #REQUIRED>
 <!ATTLIST route dst CDATA #REQUIRED>
 <!ATTLIST route symmetrical (YES|NO|yes|no) "YES">
 
+<!-- ASroute bypassASRoute are deprecated (prefer zoneRoute and friends) -->
 <!ELEMENT ASroute (link_ctn*)>
 <!ATTLIST ASroute src CDATA #REQUIRED>
 <!ATTLIST ASroute dst CDATA #REQUIRED>
 <!ATTLIST ASroute gw_src CDATA #REQUIRED>
 <!ATTLIST ASroute gw_dst CDATA #REQUIRED>
 <!ATTLIST ASroute symmetrical (YES|NO|yes|no) "YES">
+<!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 zoneRoute (link_ctn*)>
 <!ATTLIST zoneRoute src CDATA #REQUIRED>
@@ -241,18 +251,13 @@ To upgrade your files, use the tool simgrid_update_xml
 <!ATTLIST bypassRoute src CDATA #REQUIRED>
 <!ATTLIST bypassRoute 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 bypassZoneRoute (link_ctn*)>
 <!ATTLIST bypassZoneRoute src CDATA #REQUIRED>
 <!ATTLIST bypassZoneRoute dst CDATA #REQUIRED>
 <!ATTLIST bypassZoneRoute gw_src CDATA #REQUIRED>
 <!ATTLIST bypassZoneRoute gw_dst CDATA #REQUIRED>
 
+<!-- process is deprecated -->
 <!ELEMENT process ((argument|prop)*)>
 <!ATTLIST process host CDATA #REQUIRED>
 <!ATTLIST process function CDATA #REQUIRED>