A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't use xbt_assert for error checking.
[simgrid.git]
/
src
/
surf
/
simgrid.dtd
diff --git
a/src/surf/simgrid.dtd
b/src/surf/simgrid.dtd
index
a55762e
..
15d00b1
100644
(file)
--- a/
src/surf/simgrid.dtd
+++ b/
src/surf/simgrid.dtd
@@
-29,19
+29,13
@@
<!ATTLIST AS id CDATA #REQUIRED>
<!ATTLIST AS routing (Full|Floyd|Dijkstra|DijkstraCache|None|Vivaldi|Cluster|Cluster_torus) #REQUIRED>
<!ATTLIST AS id CDATA #REQUIRED>
<!ATTLIST AS routing (Full|Floyd|Dijkstra|DijkstraCache|None|Vivaldi|Cluster|Cluster_torus) #REQUIRED>
-<!ELEMENT storage_type (
prop
*)>
+<!ELEMENT storage_type (
(model_prop|prop)
*)>
<!ATTLIST storage_type id CDATA #REQUIRED>
<!ATTLIST storage_type model CDATA #REQUIRED>
<!ATTLIST storage_type size CDATA #REQUIRED>
<!ATTLIST storage_type content CDATA "">
<!ATTLIST storage_type content_type CDATA "txt_unix">
<!ATTLIST storage_type id CDATA #REQUIRED>
<!ATTLIST storage_type model CDATA #REQUIRED>
<!ATTLIST storage_type size CDATA #REQUIRED>
<!ATTLIST storage_type content CDATA "">
<!ATTLIST storage_type content_type CDATA "txt_unix">
-<!ELEMENT storage (prop*)>
-<!ATTLIST storage id CDATA #REQUIRED>
-<!ATTLIST storage typeId CDATA #REQUIRED>
-<!ATTLIST storage content CDATA "">
-<!ATTLIST storage content_type CDATA "txt_unix">
-
<!ELEMENT mount EMPTY>
<!ATTLIST mount storageId CDATA #REQUIRED>
<!ATTLIST mount name CDATA #REQUIRED>
<!ELEMENT mount EMPTY>
<!ATTLIST mount storageId CDATA #REQUIRED>
<!ATTLIST mount name CDATA #REQUIRED>
@@
-61,6
+55,13
@@
<!ATTLIST host coordinates CDATA "">
<!ATTLIST host pstate CDATA "0.0">
<!ATTLIST host coordinates CDATA "">
<!ATTLIST host pstate CDATA "0.0">
+<!ELEMENT storage (prop*)>
+<!ATTLIST storage id CDATA #REQUIRED>
+<!ATTLIST storage typeId CDATA #REQUIRED>
+<!ATTLIST storage content CDATA "">
+<!ATTLIST storage content_type CDATA "txt_unix">
+<!ATTLIST storage attach CDATA #REQUIRED>
+
<!ELEMENT gpu EMPTY>
<!ATTLIST gpu name CDATA #REQUIRED>
<!ELEMENT gpu EMPTY>
<!ATTLIST gpu name CDATA #REQUIRED>
@@
-171,3
+172,7
@@
<!ELEMENT prop EMPTY>
<!ATTLIST prop id CDATA #REQUIRED> <!-- <!ATTLIST prop key CDATA #REQUIRED> -->
<!ATTLIST prop value CDATA #REQUIRED>
<!ELEMENT prop EMPTY>
<!ATTLIST prop id CDATA #REQUIRED> <!-- <!ATTLIST prop key CDATA #REQUIRED> -->
<!ATTLIST prop value CDATA #REQUIRED>
+
+<!ELEMENT model_prop EMPTY>
+<!ATTLIST model_prop id CDATA #REQUIRED> <!-- <!ATTLIST model_prop key CDATA #REQUIRED> -->
+<!ATTLIST model_prop value CDATA #REQUIRED>