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
stop being a stupidly rushing boar (hopefuly)
[simgrid.git]
/
examples
/
platforms
/
wifi.xml
diff --git
a/examples/platforms/wifi.xml
b/examples/platforms/wifi.xml
index 1cd232e80aa67c77c7ce493eda17606c3b2db208..16306c92b45713aad957c3e4dbba5b69c443b60b 100755
(executable)
--- a/
examples/platforms/wifi.xml
+++ b/
examples/platforms/wifi.xml
@@
-4,33
+4,30
@@
<platform version="4.1">
<zone id="world" routing="Full">
<platform version="4.1">
<zone id="world" routing="Full">
- <zone id="WIFI zone" routing="Cluster">
- <!-- First declare the Access Point (ie, the wifi media) -->
- <link id="AP1" sharing_policy="WIFI" bandwidth="54Mbps,36Mbps,24Mbps" latency="0ms" />
+ <zone id="WIFI zone" routing="Wifi">
+ <prop id="access_point" value="WIFI router" />
- <!--
Two stations in the
wifi zone -->
+ <!--
Declare the stations of this
wifi zone -->
<host id="Station 1" speed="100.0Mf,50.0Mf,20.0Mf" />
<host id="Station 2" speed="100.0Mf,50.0Mf,20.0Mf" />
<host id="Station 1" speed="100.0Mf,50.0Mf,20.0Mf" />
<host id="Station 2" speed="100.0Mf,50.0Mf,20.0Mf" />
- <!-- Specify that stations use the WIFI link for every communication (incoming or outgoing) -->
- <host_link id="Station 1" up="AP1" down="AP1"/>
- <host_link id="Station 2" up="AP1" down="AP1"/>
+ <!-- Declare the wifi media (after hosts because our parser is sometimes annoying) -->
+ <link id="AP1" sharing_policy="WIFI" bandwidth="54Mbps,36Mbps,24Mbps" latency="0ms" />
<router id="WIFI router"/>
</zone>
<router id="WIFI router"/>
</zone>
-
<!-- NODE1 AS -->
<zone id="Wired zone" routing="Full">
<!-- NODE1 AS -->
<zone id="Wired zone" routing="Full">
- <host id="
NODE
1" speed="100.0Mf,50.0Mf,20.0Mf" />
+ <host id="
node
1" speed="100.0Mf,50.0Mf,20.0Mf" />
</zone>
</zone>
-
+
<!-- AS Routing -->
<link id="Collector" sharing_policy="SHARED" bandwidth="100Mbps" latency="0ms" />
<!-- AS Routing -->
<link id="Collector" sharing_policy="SHARED" bandwidth="100Mbps" latency="0ms" />
- <zoneRoute src="WIFI zone" dst="Wired zone" gw_src="WIFI router" gw_dst="
NODE
1">
+ <zoneRoute src="WIFI zone" dst="Wired zone" gw_src="WIFI router" gw_dst="
node
1">
<link_ctn id="Collector" />
</zoneRoute>
<link_ctn id="Collector" />
</zoneRoute>
-
+
</zone>
</platform>
</zone>
</platform>