Update example for return values and more files.

[simgrid.git] / examples / platforms / storage.xml

diff --git a/examples/platforms/storage.xml b/examples/platforms/storage.xml
index bcf9995..91ef507 100644 (file)
--- a/examples/platforms/storage.xml
+++ b/examples/platforms/storage.xml
@@ -2,33 +2,61 @@
 <!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" 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>
+               <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="30000000" />
+                       <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="30000000" />
+                       <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">
-                       <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>
+                       <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>
+               
+               <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>
 </platform>