X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/57b90564eadd2524ddba7e76fdc2d60263354d5d..c6a09c2eef1932b44c4c85564ce2c8327814102b:/examples/platforms/storage.xml?ds=sidebyside

diff --git a/examples/platforms/storage.xml b/examples/platforms/storage.xml
index 1c4b834feb..c1eb980bb7 100644
--- a/examples/platforms/storage.xml
+++ b/examples/platforms/storage.xml
@@ -2,37 +2,55 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 
 <platform version="3">
-	<AS id="AS0" routing="Full">
-
-		<storage id="Disk1" model="HDD" content="content.txt">
-			<prop id="Bwrite" value="30" />
-			<prop id="Bread" value="80" />
-		</storage>
-		<storage id="Disk2" model="SSD" content="content.txt">
-			<prop id="Bwrite" value="110" />
-			<prop id="Bread" value="300" />
-		</storage>
-		<storage id="Disk3" model="RAID0" content="content.txt">
-			<prop id="Bwrite" value="60" />
-			<prop id="Bread" value="160" />
-		</storage>
-
-		<host id="bob" power="1000000000">
-			<prop id="storage" value="Disk1" />
-		</host>
-		
-		<storage id="Disk4" model="RAID1" content="content.txt">
-			<prop id="Bwrite" value="30" />
-			<prop id="Bread" value="80" />
-		</storage>
+
+<config>
+  <prop id="path" value="../examples/platforms/"/>
+</config>
+
+  <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">
+			<prop id="Bwrite" value="30MBps" />
+			<prop id="Bread" value="100MBps" />
+			<prop id="Bconnection" value="150MBps" />
+   </storage_type>
+
+   <storage_type id="single_SSD" model="linear_no_lat"
+                 content="content/storage_content.txt" size="500GiB">
+			<prop id="Bwrite" value="30MBps" />
+			<prop id="Bread" value="100MBps" />
+			<prop id="Bconnection" value="150MBps" />
+		</storage_type>
+
+		<storage id="Disk1" typeId="single_HDD"/>
+		<storage id="Disk2" typeId="single_SSD"/>
+		<storage id="Disk3" typeId="single_HDD"
+                         content="content/storage_content.txt" 
+			 content_type="txt_unix"/>
+		<storage id="Disk4" typeId="single_SSD"/>
+
+		<host id="bob" power="1Gf">
+			<mount storageId="Disk1" name="/home"/>			
+		</host>		
 		
-		<host id="alice" power="1000000000">
-			<prop id="storage" value="Disk4" />
-		</host>	
+		<host id="alice" power="1Gf">
+			<mount storageId="Disk2" name="/home"/>
+		</host>
+
+		<host id="carl" power="1Gf">		
+			<mount storageId="Disk3" name="/home"/>		
+		</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" />
+		<host id="denise" power="1Gf">
+			<mount storageId="Disk1" name="/sd1"/>	
+			<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" />