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
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
examples
/
platforms
/
routing_cluster.xml
diff --git
a/examples/platforms/routing_cluster.xml
b/examples/platforms/routing_cluster.xml
index
a5e242e
..
1f2c7a1
100644
(file)
--- a/
examples/platforms/routing_cluster.xml
+++ b/
examples/platforms/routing_cluster.xml
@@
-1,6
+1,6
@@
<?xml version='1.0'?>
<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
<?xml version='1.0'?>
<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
+<platform version="4
.1
">
<!-- router1 - - - - - - link1-2 - - - - - - router2
__________________________ _________________________
| | | |
<!-- router1 - - - - - - link1-2 - - - - - - router2
__________________________ _________________________
| | | |
@@
-11,8
+11,8
@@
l1_up / / l1_down | l3 l2_up\ \ l2_down l4_up / / l4_down | l6 l5_up\ \
/ / | \ \ / / | \ \
host1 host3 host2 host4 host6 host5
-->
/ / | \ \ / / | \ \
host1 host3 host2 host4 host6 host5
-->
- <
AS
id="AS0" routing="Full">
- <
AS
id="my_cluster1" routing="Cluster">
+ <
zone
id="AS0" routing="Full">
+ <
zone
id="my_cluster1" routing="Cluster">
<router id="router1"/>
<host id="host1" speed="1Gf"/>
<router id="router1"/>
<host id="host1" speed="1Gf"/>
@@
-21,7
+21,7
@@
l1_up / / l1_down | l3 l2_up\ \ l2_down l4_up / / l4_down | l6 l5_up\ \
<host_link id="host1" up="l1_UP" down="l1_DOWN"/>
<host id="host2" speed="1Gf"/>
<host_link id="host1" up="l1_UP" down="l1_DOWN"/>
<host id="host2" speed="1Gf"/>
- <link id="l2" bandwidth="125MBps" latency="100us" sharing_policy="
FULL
DUPLEX"/>
+ <link id="l2" bandwidth="125MBps" latency="100us" sharing_policy="
SPLIT
DUPLEX"/>
<host_link id="host2" up="l2_UP" down="l2_DOWN"/>
<host id="host3" speed="1Gf"/>
<host_link id="host2" up="l2_UP" down="l2_DOWN"/>
<host id="host3" speed="1Gf"/>
@@
-29,9
+29,9
@@
l1_up / / l1_down | l3 l2_up\ \ l2_down l4_up / / l4_down | l6 l5_up\ \
<host_link id="host3" up="l3" down="l3"/>
<backbone id="backbone1" bandwidth="2.25GBps" latency="500us"/>
<host_link id="host3" up="l3" down="l3"/>
<backbone id="backbone1" bandwidth="2.25GBps" latency="500us"/>
- </
AS
>
+ </
zone
>
- <
AS
id="my_cluster2" routing="Cluster">
+ <
zone
id="my_cluster2" routing="Cluster">
<router id="router2"/>
<host id="host4" speed="1Gf"/>
<router id="router2"/>
<host id="host4" speed="1Gf"/>
@@
-40,7
+40,7
@@
l1_up / / l1_down | l3 l2_up\ \ l2_down l4_up / / l4_down | l6 l5_up\ \
<host_link id="host4" up="l4_UP" down="l4_DOWN"/>
<host id="host5" speed="1Gf"/>
<host_link id="host4" up="l4_UP" down="l4_DOWN"/>
<host id="host5" speed="1Gf"/>
- <link id="l5" bandwidth="125MBps" latency="100us" sharing_policy="
FULL
DUPLEX"/>
+ <link id="l5" bandwidth="125MBps" latency="100us" sharing_policy="
SPLIT
DUPLEX"/>
<host_link id="host5" up="l5_UP" down="l5_DOWN"/>
<host id="host6" speed="1Gf"/>
<host_link id="host5" up="l5_UP" down="l5_DOWN"/>
<host id="host6" speed="1Gf"/>
@@
-48,12
+48,12
@@
l1_up / / l1_down | l3 l2_up\ \ l2_down l4_up / / l4_down | l6 l5_up\ \
<host_link id="host6" up="l6" down="l6"/>
<backbone id="backbone2" bandwidth="2.25GBps" latency="500us"/>
<host_link id="host6" up="l6" down="l6"/>
<backbone id="backbone2" bandwidth="2.25GBps" latency="500us"/>
- </
AS
>
+ </
zone
>
<link id="link1-2" bandwidth="2.25GBps" latency="500us"/>
<link id="link1-2" bandwidth="2.25GBps" latency="500us"/>
- <
ASr
oute src="my_cluster1" dst="my_cluster2" gw_src="router1" gw_dst="router2">
+ <
zoneR
oute src="my_cluster1" dst="my_cluster2" gw_src="router1" gw_dst="router2">
<link_ctn id="link1-2" />
<link_ctn id="link1-2" />
- </
ASr
oute>
- </
AS
>
+ </
zoneR
oute>
+ </
zone
>
</platform>
</platform>