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

diff --git a/src/surf/simgrid.dtd b/src/surf/simgrid.dtd
index dfd9943eee..241ae06626 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|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 "">
@@ -25,14 +22,9 @@
 <!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 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>
@@ -45,10 +37,7 @@
 <!ATTLIST host interference_recv CDATA "1.0">
 <!ATTLIST host interference_send_recv CDATA "1.0">
 <!ATTLIST host max_outgoing_rate CDATA "-1.0">
-
-<!ELEMENT prop EMPTY>
-<!ATTLIST prop id CDATA #REQUIRED>
-<!ATTLIST prop value CDATA #REQUIRED>
+<!ATTLIST host vivaldi  CDATA "0 0 0">
 
 <!ELEMENT cluster EMPTY>
 <!ATTLIST cluster id CDATA #REQUIRED>
@@ -74,24 +63,25 @@
 <!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*)>
 <!ATTLIST route src CDATA #REQUIRED>
 <!ATTLIST route dst CDATA #REQUIRED>
-<!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 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>
 <!ATTLIST process function CDATA #REQUIRED>
@@ -100,3 +90,7 @@
 
 <!ELEMENT argument EMPTY>
 <!ATTLIST argument value CDATA #REQUIRED>
+
+<!ELEMENT prop EMPTY>
+<!ATTLIST prop id CDATA #REQUIRED> <!-- <!ATTLIST prop key CDATA #REQUIRED> -->
+<!ATTLIST prop value CDATA #REQUIRED>