X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2db530ae7af2f2d5b9b80877117816279279d7c3..b24f30653c7107b2c85ea2f3704f722efe8648e6:/examples/platforms/storage.xml

diff --git a/examples/platforms/storage.xml b/examples/platforms/storage.xml
index 1f6e4ac926..1f32718879 100644
--- a/examples/platforms/storage.xml
+++ b/examples/platforms/storage.xml
@@ -2,42 +2,46 @@
 <!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_type id="samsung" model="RAID5" content="content.txt_optionnel">
-			<prop id="Bwrite" value="30" />
-			<prop id="Bread" value="80" />
+		<storage_type id="samsung" model="RAID5" content="content/storage_content.txt" size="500">
+			<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.txt">
-			<prop id="Bwrite" value="30" />
-			<prop id="Bread" value="80" />
+		<storage_type id="crucial" model="SSD" content="content/storage_content.txt" size="500">
+			<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.txt">
-			<prop id="Bwrite" value="30" />
-			<prop id="Bread" value="80" />
+		<storage_type id="wdigital" model="RAID0" content="content/storage_content.txt" size="500">
+			<prop id="Bwrite" value="30000000" />
+			<prop id="Bread" value="100000000" />
+			<prop id="Bconnection" value="150000000" />
 		</storage_type>
 
-		<storage id="Disk1" type_id="crucial"/>
-		<storage id="Disk2" type_id="samsung"/>
-		<storage id="Disk3" type_id="wdigital"/>
+		<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:"/>
-			<mount id="Disk2" name="D:"/>
-			<mount id="Disk3" name="E:"/>
-			<mount id="Disk1" name="F:"/>			
+			<mount id="Disk1" name="C:"/>			
 		</host>		
 		
 		<host id="alice" power="1000000000">
-			<mstorage type_id="crucial" name="C:"/>
+			<mount id="Disk2" name="C:"/>
 		</host>
 
-		<storage id="Disk4" type_id="wdigital"/>
 		<host id="carl" power="1000000000">		
-			<mount id="Disk4" name="C:"/>
-			<mount id="Disk1" name="D:"/>			
+			<mount id="Disk3" name="C:"/>		
 		</host>
 		
 		<host id="denise" power="1000000000">