X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0e80c1ab49011f9512b4278979123375d9135ff2..e9f14f31c5d4ff8707a517cc4cb5dfb07cd6aae2:/src/surf/xml/simgrid.dtd?ds=sidebyside

diff --git a/src/surf/xml/simgrid.dtd b/src/surf/xml/simgrid.dtd
index 0e9eb83d30..ba78c64a3d 100644
--- a/src/surf/xml/simgrid.dtd
+++ b/src/surf/xml/simgrid.dtd
@@ -1,7 +1,7 @@
 <!--
              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):
@@ -11,14 +11,14 @@ To upgrade your files, use the tool simgrid_update_xml
     - <as>, <asroute>, <bypassZoneRoute> and <process>, deprecated in DTD4.1
   - FULLDUPLEX sharing will be removed, deprecated in DTD4.2 (v3.19)
 
-* New in DTD version 4.2 (in SimGrid 3.19): backward compatible change (v4 files are valid v4.2 files)
-   - SPLITDUPLEX is the new spelling of the deprecated FULLDUPLEX
-
 * 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>
    - <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)
+  - In <host> and <peer> availability_file is now speed_file (SimGrid v3.22)
 
 * New in DTD version 4 (in SimGrid 3.13):
    - Rename (power->speed) the attributes describing the amount of flop
@@ -27,9 +27,9 @@ To upgrade your files, use the tool simgrid_update_xml
    - In <trace_connect>, attribute kind="POWER" is now kind="SPEED".
 
    - In <host> and <link>, attributes availability and state are gone.
-     It was redundent with state and availability traces, and with peak values.
+     It was redundant with state and availability profiles, and with peak values.
 
-   - In <cluster>, cannot set the availability nor state traces.
+   - In <cluster>, cannot set the availability nor state profiles.
      This was too complex and unused.
 
    - The DOCTYPE points to the right URL (this file).
@@ -135,15 +135,21 @@ To upgrade your files, use the tool simgrid_update_xml
 <!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">
-<!ATTLIST host availability_file CDATA "">
+<!ATTLIST host speed_file CDATA "">
+<!ATTLIST host availability_file CDATA ""> <!-- deprecated -->
 <!ATTLIST host state_file CDATA "">
 <!ATTLIST host coordinates  CDATA "">
 <!ATTLIST host pstate CDATA "0.0">
 
+<!ELEMENT disk (prop*)>
+<!ATTLIST disk id CDATA "/">
+<!ATTLIST disk read_bw CDATA #REQUIRED>
+<!ATTLIST disk write_bw CDATA #REQUIRED>
+
 <!ELEMENT storage (prop*)>
 <!ATTLIST storage id CDATA #REQUIRED>
 <!ATTLIST storage typeId CDATA #REQUIRED>
@@ -191,7 +197,8 @@ To upgrade your files, use the tool simgrid_update_xml
 <!ATTLIST peer bw_out CDATA #REQUIRED>
 <!ATTLIST peer lat CDATA "0">
 <!ATTLIST peer coordinates CDATA "">
-<!ATTLIST peer availability_file CDATA "">
+<!ATTLIST peer speed_file CDATA ""> 
+<!ATTLIST peer availability_file CDATA ""> <!-- deprecated -->
 <!ATTLIST peer state_file CDATA "">
 
 <!ELEMENT router EMPTY>
@@ -210,7 +217,7 @@ 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>