X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0a3d07aa08b06d0d82481ceabb1ba4ccac5de3e3..dda9405f7ee3f80c4b9c225117d08ec734f2a0f8:/examples/platforms/storage.xml

diff --git a/examples/platforms/storage.xml b/examples/platforms/storage.xml
index 3aea6ba0c2..20a0f5a29a 100644
--- a/examples/platforms/storage.xml
+++ b/examples/platforms/storage.xml
@@ -2,35 +2,53 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 
 <platform version="3">
+
+<config>
+	<prop id="path" value="../examples/platforms/"/>
+</config>
+
 	<AS id="AS0" routing="Full">
 
-		<storage id="Disk1" type="HDD" content="content.txt">
-			<prop id="Bwrite" value="30" />
-			<prop id="Bread" value="80" />
-		</storage>
-		<storage id="Disk2" type="SSD" content="content.txt">
-			<prop id="Bwrite" value="110" />
-			<prop id="Bread" value="300" />
-		</storage>
-		<storage id="Disk3" type="RAID0" content="content.txt">
-			<prop id="Bwrite" value="60" />
-			<prop id="Bread" value="160" />
-		</storage>
+		<storage_type id="samsung" model="RAID5" content="content/storage_content.txt">
+			<prop id="Bwrite" value="30000000" /> <!-- 30Mo/s -->
+			<prop id="Bread" value="100000000" /> <!-- 100Mo/s -->
+			<prop id="Bconnection" value="150000000" /> <!-- 150Mo/s -->
+		</storage_type>
+
+		<storage_type id="crucial" model="SSD" content="content/storage_content.txt">
+			<prop id="Bwrite" value="30000000" />
+			<prop id="Bread" value="100000000" />
+			<prop id="Bconnection" value="150000000" />
+		</storage_type>
+
+		<storage_type id="wdigital" model="RAID0" content="content/storage_content.txt">
+			<prop id="Bwrite" value="30000000" />
+			<prop id="Bread" value="100000000" />
+			<prop id="Bconnection" value="150000000" />
+		</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">
-			<prop id="storage" value="Disk1" />
-		</host>
-		
-		<storage id="Disk4" type="RAID1" content="content.txt">
-			<prop id="Bwrite" value="30" />
-			<prop id="Bread" value="80" />
-		</storage>
+			<mount id="Disk1" name="C:"/>			
+		</host>		
 		
 		<host id="alice" power="1000000000">
-			<prop id="storage" value="Disk4" />
-		</host>	
+			<mount id="Disk2" name="C:"/>
+		</host>
+
+		<host id="carl" power="1000000000">		
+			<mount id="Disk3" name="C:"/>		
+		</host>
 		
-		<link id="link1" bandwidth="125000000" latency="5E-5"/>
+		<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" />