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

diff --git a/src/surf/simgrid.dtd b/src/surf/simgrid.dtd
index ab5fb0afbb..f6fb5970f8 100644
--- a/src/surf/simgrid.dtd
+++ b/src/surf/simgrid.dtd
@@ -1,12 +1,9 @@
 <!-- Small DTD for SURF based tools. -->
-<!ELEMENT platform ((include|trace|random|AS|trace:connect)*,(include|trace|random|cluster|set|foreach|host|router|link|trace:connect)*,(include|route:multi|route|trace:connect|process)*)>
+<!ELEMENT platform ((include|trace|random|cluster|AS|trace_connect)*,(include|trace|random|cluster|AS|set|foreach|host|router|link|trace_connect)*,(include|route|trace_connect|process)*)>
 <!ATTLIST platform version CDATA "0.0">
 <!ATTLIST platform xmlns:link CDATA "http://simgrid.gforge.inria.fr/">
 <!ATTLIST platform xmlns:route CDATA "http://simgrid.gforge.inria.fr/">
 
-<!ELEMENT include EMPTY>
-<!ATTLIST include file CDATA #REQUIRED>
-
 <!ELEMENT trace (#PCDATA)>
 <!ATTLIST trace id CDATA #REQUIRED>
 <!ATTLIST trace file CDATA "">
@@ -20,19 +17,14 @@
 <!ATTLIST random std_deviation CDATA #REQUIRED>
 <!ATTLIST random generator (DRAND48|RAND) "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 set EMPTY>
-<!ATTLIST set id CDATA #REQUIRED>
-<!ATTLIST set prefix CDATA #REQUIRED>
-<!ATTLIST set suffix CDATA #REQUIRED>
-<!ATTLIST set radical CDATA #REQUIRED>
+<!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 foreach (host|(host,link)|link)>
-<!ATTLIST foreach set_id CDATA #REQUIRED>
+<!ELEMENT AS (((AS|link|cluster)*,ASroute*,bypassRoute*)|((host|router|link)*,route*))>
+<!ATTLIST AS id CDATA #REQUIRED>
+<!ATTLIST AS routing CDATA #REQUIRED>
 
 <!ELEMENT host (prop*)>
 <!ATTLIST host id CDATA #REQUIRED>
@@ -47,10 +39,6 @@
 <!ATTLIST host max_outgoing_rate CDATA "-1.0">
 <!ATTLIST host vivaldi  CDATA "0 0 0">
 
-<!ELEMENT prop EMPTY>
-<!ATTLIST prop id CDATA #REQUIRED>
-<!ATTLIST prop value CDATA #REQUIRED>
-
 <!ELEMENT cluster EMPTY>
 <!ATTLIST cluster id CDATA #REQUIRED>
 <!ATTLIST cluster prefix CDATA #REQUIRED>
@@ -75,25 +63,24 @@
 <!ATTLIST link state_file CDATA "">
 <!ATTLIST link sharing_policy (SHARED|FATPIPE) "SHARED">
 
-<!ELEMENT route:multi (link:ctn+)>
-<!ATTLIST route:multi src CDATA #REQUIRED>
-<!ATTLIST route:multi dst CDATA #REQUIRED>
-<!ATTLIST route:multi action (POSTPEND|PREPEND|OVERRIDE) "POSTPEND">
-<!ATTLIST route:multi symmetric (YES|NO) "YES">
-
-<!ELEMENT route (link:ctn*)>
+<!ELEMENT route (link_ctn*)>
 <!ATTLIST route src CDATA #REQUIRED>
 <!ATTLIST route dst CDATA #REQUIRED>
-<!ATTLIST route gw_src CDATA "">
-<!ATTLIST route gw_dst CDATA "">
-<!ATTLIST route impact_on_src CDATA "0.0">
-<!ATTLIST route impact_on_dst CDATA "0.0">
-<!ATTLIST route impact_on_src_with_other_recv CDATA "0.0">
-<!ATTLIST route impact_on_dst_with_other_send CDATA "0.0">
-<!ATTLIST route action (POSTPEND|PREPEND|OVERRIDE) "POSTPEND">
 
-<!ELEMENT link:ctn EMPTY>
-<!ATTLIST link:ctn id CDATA #REQUIRED>
+<!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>
+
+<!ELEMENT link_ctn EMPTY>
+<!ATTLIST link_ctn id CDATA #REQUIRED>
+
+<!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 process ((argument|prop)*)>
 <!ATTLIST process host CDATA #REQUIRED>
@@ -104,52 +91,6 @@
 <!ELEMENT argument EMPTY>
 <!ATTLIST argument value CDATA #REQUIRED>
 
-<!-- start added by DAVID -->
-
-<!ELEMENT AS (((AS|link)*,ASroute*)|((host|router|link)*,route*))>
-<!ATTLIST AS id CDATA #REQUIRED>
-<!ATTLIST AS routing CDATA #REQUIRED>
-
-<!--<!ELEMENT route (link:ctn*)>
-<!ATTLIST route src CDATA #REQUIRED>
-<!ATTLIST route dst CDATA #REQUIRED>-->
-
-<!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>
-
-
-<!--<!ELEMENT AS ((AS|host|gateway|router|link|route)*)>
-<!ATTLIST AS id CDATA #REQUIRED>
-<!ATTLIST AS routing CDATA #REQUIRED>
-
-<!ELEMENT gateway EMPTY>
-<!ATTLIST gateway id CDATA #REQUIRED>-->
-
-<!-- 
-
-<!ELEMENT AS ((AS|hostDef|routerDef|ASroute)*)>
-<!ATTLIST AS id CDATA #REQUIRED>
-
-<!ELEMENT hostDef (hostAdd*)>
-
-<!ELEMENT hostAdd EMPTY>
-<!ATTLIST hostAdd id CDATA #REQUIRED>
-
-<!ELEMENT routerDef (routerAdd*)>
-
-<!ELEMENT routerAdd EMPTY>
-<!ATTLIST routerAdd id CDATA #REQUIRED>
-
-<!ELEMENT ASroute (ASlink*)>
-<!ATTLIST ASroute src CDATA #REQUIRED>
-<!ATTLIST ASroute dst CDATA #REQUIRED>
-<!ATTLIST ASroute symmetric (YES|NO) "YES">
-
-<!ELEMENT ASlink EMPTY>
-<!ATTLIST ASlink id CDATA #REQUIRED>
-
--->
-<!-- end added by DAVID -->
+<!ELEMENT prop EMPTY>
+<!ATTLIST prop id CDATA #REQUIRED> <!-- <!ATTLIST prop key CDATA #REQUIRED> -->
+<!ATTLIST prop value CDATA #REQUIRED>