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

diff --git a/src/surf/simgrid.dtd b/src/surf/simgrid.dtd
index 0a47fdf838..9aae03f99b 100644
--- a/src/surf/simgrid.dtd
+++ b/src/surf/simgrid.dtd
@@ -1,7 +1,10 @@
 <!-- Small DTD for SURF based tools. -->
-<!ELEMENT platform ((config|include|cluster|AS|trace|trace_connect)*,(include|process)*)>
+<!ELEMENT platform ((config|random)*,(include|cluster|peer|AS|trace|trace_connect)*,(include|process)*)>
 <!ATTLIST platform version CDATA "0.0">
 
+<!ELEMENT include EMPTY>
+<!ATTLIST include file CDATA #REQUIRED>
+
 <!ELEMENT trace (#PCDATA)>
 <!ATTLIST trace id CDATA #REQUIRED>
 <!ATTLIST trace file CDATA "">
@@ -13,25 +16,29 @@
 <!ATTLIST random max CDATA #REQUIRED>
 <!ATTLIST random mean CDATA #REQUIRED>
 <!ATTLIST random std_deviation CDATA #REQUIRED>
-<!ATTLIST random generator (DRAND48|RAND) "DRAND48">
+<!ATTLIST random seed CDATA "2147483647">
+<!ATTLIST random radical CDATA "">
+<!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|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|link|cluster|peer|trace|trace_connect)*,(ASroute|trace|trace_connect)*,(bypassRoute|trace|trace_connect)*)|((include|host|router|link|trace|trace_connect)*,(route|trace|trace_connect)*))>
+
 <!ATTLIST AS id CDATA #REQUIRED>
 <!ATTLIST AS routing CDATA #REQUIRED>
 
 <!ELEMENT host (prop*)>
 <!ATTLIST host id CDATA #REQUIRED>
 <!ATTLIST host power CDATA #REQUIRED>
+<!ATTLIST host core  CDATA "1">
 <!ATTLIST host availability CDATA "1.0">
 <!ATTLIST host availability_file CDATA "">
 <!ATTLIST host state (ON|OFF) "ON">
 <!ATTLIST host state_file CDATA "">
-<!ATTLIST host vivaldi  CDATA "0 0 0">
+<!ATTLIST host coordinates  CDATA "">
 
 <!ELEMENT cluster EMPTY>
 <!ATTLIST cluster id CDATA #REQUIRED>
@@ -39,13 +46,30 @@
 <!ATTLIST cluster suffix CDATA #REQUIRED>
 <!ATTLIST cluster radical CDATA #REQUIRED>
 <!ATTLIST cluster power CDATA #REQUIRED>
+<!ATTLIST cluster core CDATA "1">
 <!ATTLIST cluster bw CDATA #REQUIRED>
 <!ATTLIST cluster lat CDATA #REQUIRED>
-<!ATTLIST cluster bb_bw CDATA #REQUIRED>
-<!ATTLIST cluster bb_lat CDATA #REQUIRED>
+<!ATTLIST cluster sharing_policy (SHARED|FULLDUPLEX|FATPIPE) "SHARED">
+<!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>
+<!ATTLIST peer power CDATA #REQUIRED>
+<!ATTLIST peer bw_in CDATA #REQUIRED>
+<!ATTLIST peer bw_out CDATA #REQUIRED>
+<!ATTLIST peer lat CDATA #REQUIRED>
+<!ATTLIST peer coordinates CDATA "">
+<!ATTLIST peer availability_file CDATA "">
+<!ATTLIST peer state_file CDATA "">
 
 <!ELEMENT router EMPTY>
 <!ATTLIST router id CDATA #REQUIRED>
+<!ATTLIST router coordinates  CDATA "">
 
 <!ELEMENT link (prop*)>
 <!ATTLIST link id CDATA #REQUIRED>
@@ -55,20 +79,23 @@
 <!ATTLIST link latency_file CDATA "">
 <!ATTLIST link state (ON|OFF) "ON">
 <!ATTLIST link state_file CDATA "">
-<!ATTLIST link sharing_policy (SHARED|FATPIPE) "SHARED">
+<!ATTLIST link sharing_policy (SHARED|FATPIPE|FULLDUPLEX) "SHARED">
 
 <!ELEMENT route (link_ctn*)>
 <!ATTLIST route src CDATA #REQUIRED>
 <!ATTLIST route dst CDATA #REQUIRED>
+<!ATTLIST route symmetrical (YES|NO) "YES">
 
 <!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">
 
 <!ELEMENT link_ctn EMPTY>
 <!ATTLIST link_ctn id CDATA #REQUIRED>
+<!ATTLIST link_ctn direction (UP|DOWN|NONE) "NONE">
 
 <!ELEMENT bypassRoute (link_ctn*)>
 <!ATTLIST bypassRoute src CDATA #REQUIRED>
@@ -85,9 +112,9 @@
 <!ELEMENT argument EMPTY>
 <!ATTLIST argument value CDATA #REQUIRED>
 
-<!ELEMENT config (prop*|random)>
+<!ELEMENT config (prop*)>
 <!ATTLIST config id CDATA "">
 
 <!ELEMENT prop EMPTY>
 <!ATTLIST prop id CDATA #REQUIRED> <!-- <!ATTLIST prop key CDATA #REQUIRED> -->
-<!ATTLIST prop value CDATA #REQUIRED>
\ No newline at end of file
+<!ATTLIST prop value CDATA #REQUIRED>