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

diff --git a/src/surf/simgrid.dtd b/src/surf/simgrid.dtd
index 999e4770ac..8b4b64edd8 100644
--- a/src/surf/simgrid.dtd
+++ b/src/surf/simgrid.dtd
@@ -1,11 +1,6 @@
 <!-- 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 ((config)?,(include|cluster|peer|AS|trace|trace_connect)*,(include|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>
@@ -20,36 +15,25 @@
 <!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 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 AS (((AS|link|cluster|peer|trace|trace_connect)*,(ASroute|trace|trace_connect)*,(bypassRoute|trace|trace_connect)*)|((host|router|link|trace|trace_connect)*,(route|trace|trace_connect)*))>
 
-<!ELEMENT foreach (host|(host,link)|link)>
-<!ATTLIST foreach set_id CDATA #REQUIRED>
+<!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 interference_send CDATA "1.0">
-<!ATTLIST host interference_recv CDATA "1.0">
-<!ATTLIST host interference_send_recv CDATA "1.0">
-<!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>
+<!ATTLIST host coordinates  CDATA "">
 
 <!ELEMENT cluster EMPTY>
 <!ATTLIST cluster id CDATA #REQUIRED>
@@ -57,13 +41,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 sharing_policy (SHARED|FULLDUPLEX|FATPIPE) "SHARED">
 <!ATTLIST cluster bb_bw CDATA #REQUIRED>
 <!ATTLIST cluster bb_lat CDATA #REQUIRED>
+<!ATTLIST cluster bb_sharing_policy (SHARED|FATPIPE) "SHARED">
+<!ATTLIST cluster availability_file CDATA "">
+<!ATTLIST cluster state_file 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 sharing_policy (SHARED|FULLDUPLEX) "FULLDUPLEX">
+<!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>
@@ -73,88 +74,42 @@
 <!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: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 process ((argument|prop)*)>
-<!ATTLIST process host CDATA #REQUIRED>
-<!ATTLIST process function CDATA #REQUIRED>
-<!ATTLIST process start_time CDATA "-1.0">
-<!ATTLIST process kill_time CDATA "-1.0">
-
-<!ELEMENT argument EMPTY>
-<!ATTLIST argument value CDATA #REQUIRED>
-
-<!-- start added by DAVID -->
-
-<!ELEMENT AS (((AS|link)*,ASroute*,bypassRoute*)|((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>-->
+<!ATTLIST route symmetrical (YES|NO) "YES">
 
-<!ELEMENT ASroute (link:ctn*)>
+<!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 bypassRoute (link:ctn*)>
+<!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>
 <!ATTLIST bypassRoute dst CDATA #REQUIRED>
 <!ATTLIST bypassRoute gw_src CDATA #REQUIRED>
 <!ATTLIST bypassRoute 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 process ((argument|prop)*)>
+<!ATTLIST process host CDATA #REQUIRED>
+<!ATTLIST process function CDATA #REQUIRED>
+<!ATTLIST process start_time CDATA "-1.0">
+<!ATTLIST process kill_time CDATA "-1.0">
 
-<!ELEMENT ASroute (ASlink*)>
-<!ATTLIST ASroute src CDATA #REQUIRED>
-<!ATTLIST ASroute dst CDATA #REQUIRED>
-<!ATTLIST ASroute symmetric (YES|NO) "YES">
+<!ELEMENT argument EMPTY>
+<!ATTLIST argument value CDATA #REQUIRED>
 
-<!ELEMENT ASlink EMPTY>
-<!ATTLIST ASlink id CDATA #REQUIRED>
+<!ELEMENT config (prop*|random)>
+<!ATTLIST config id CDATA "">
 
--->
-<!-- end added by DAVID -->
+<!ELEMENT prop EMPTY>
+<!ATTLIST prop id CDATA #REQUIRED> <!-- <!ATTLIST prop key CDATA #REQUIRED> -->
+<!ATTLIST prop value CDATA #REQUIRED>