X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ceb3245dffa315620721c8d8a26efad60732e6bf..18ba8a3fabab08a493038a2e11e5df5b4b6de4f0:/examples/platforms/storage.xml

diff --git a/examples/platforms/storage.xml b/examples/platforms/storage.xml
index 280c1909b2..988e40b709 100644
--- a/examples/platforms/storage.xml
+++ b/examples/platforms/storage.xml
@@ -4,59 +4,59 @@
 <platform version="3">
 
 <config>
-	<prop id="path" value="../examples/platforms/"/>
+  <prop id="path" value="../examples/platforms/"/>
 </config>
 
-	<AS id="AS0" routing="Full">
-
-		<storage_type id="samsung" model="RAID5" content="storage_content.txt">
-			<prop id="Bwrite" value="30000000" /> <!-- 30Mo/s -->
-			<prop id="Bread" value="100000000" /> <!-- 100Mo/s -->
-			<prop id="Bconnexion" value="6000000000" /> <!-- 6Go/s -->
-		</storage_type>
-
-		<storage_type id="crucial" model="SSD" content="storage_content.txt">
-			<prop id="Bwrite" value="80" />
-			<prop id="Bread" value="100000000" />
-			<prop id="Bconnexion" value="6000000000" />
-		</storage_type>
-
-		<storage_type id="wdigital" model="RAID0" content="storage_content.txt">
-			<prop id="Bwrite" value="60" />
-			<prop id="Bread" value="100000000" />
-			<prop id="Bconnexion" value="6000000000" />
-		</storage_type>
-
-		<storage id="Disk1" typeId="crucial"/>
-		<storage id="Disk2" typeId="samsung"/>
-		<storage id="Disk3" typeId="wdigital"/>
-		<storage id="Disk4" typeId="wdigital"/>
-
-		<host id="bob" power="1000000000">
-			<mount id="Disk1" name="C:"/>			
-		</host>		
-		
-		<host id="alice" power="1000000000">
-			<mount id="Disk2" name="C:"/>
-		</host>
-
-		<host id="carl" power="1000000000">		
-			<mount id="Disk3" name="C:"/>		
-		</host>
-		
-		<host id="denise" power="1000000000">
-			<mount id="Disk4" name="C:"/>	
-		</host>
-
-		<link id="link1" bandwidth="125000000" latency="5E-5" />
-		<link id="link2" bandwidth="125000000" latency="5E-5" />
-		<link id="link3" bandwidth="125000000" latency="5E-5" />
-	
-		<route src="bob" dst="alice" symmetrical="YES">
-			<link_ctn id="link1" />
-			<link_ctn id="link2" />
-			<link_ctn id="link3" />
-   		</route>	
-
-	</AS>
+  <AS id="AS0" routing="Full">
+
+   <storage_type id="single_HDD" model="linear_no_lat" 
+                 content="content/storage_content.txt" size="500GiB"
+                 content_type="txt_unix">
+      <model_prop id="Bwrite" value="30MBps" />
+      <model_prop id="Bread" value="100MBps" />
+      <model_prop id="Bconnection" value="120MBps" />
+   </storage_type>
+
+   <storage_type id="single_SSD" model="linear_no_lat" size="500GiB">
+      <model_prop id="Bwrite" value="60MBps" />
+      <model_prop id="Bread" value="200MBps" />
+      <model_prop id="Bconnection" value="220MBps" />
+   </storage_type>
+
+    <storage id="Disk1" typeId="single_HDD" attach="bob" />
+    <storage id="Disk2" typeId="single_SSD"
+             content="content/win_storage_content.txt"
+             content_type="txt_windows" attach="alice" />
+    <storage id="Disk3" typeId="single_HDD" attach="carl" />
+    <storage id="Disk4" typeId="single_SSD"
+             content="content/small_content.txt"
+             content_type="txt_unix" attach="denise"/>
+
+    <host id="bob" power="1Gf">
+      <mount storageId="Disk1" name="/home"/>
+    </host>
+
+    <host id="alice" power="1Gf">
+      <mount storageId="Disk2" name="c:"/>
+    </host>
+
+    <host id="carl" power="1Gf">
+      <mount storageId="Disk3" name="/home"/>
+    </host>
+
+    <host id="denise" power="1Gf">
+      <mount storageId="Disk2" name="c:"/>	
+      <mount storageId="Disk4" name="/home"/>	
+    </host>
+
+    <link id="link1" bandwidth="125MBps" latency="50us" />
+    <link id="link2" bandwidth="125MBps" latency="50us" />
+    <link id="link3" bandwidth="125MBps" latency="50us" />
+
+    <route src="bob" dst="alice" symmetrical="YES">
+      <link_ctn id="link1" />
+      <link_ctn id="link2" />
+      <link_ctn id="link3" />
+    </route>
+  </AS>
 </platform>