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 9495b89..91ef507 100644 (file)
--- 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="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="content.txt">
-                       <prop id="Bwrite" value="30" />
-                       <prop id="Bread" value="80" />
+               <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="content.txt">
-                       <prop id="Bwrite" value="30" />
-                       <prop id="Bread" value="80" />
+               <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">
-                       <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 typeId="crucial" name="C:"/>
+                       <mount id="Disk2" name="C:"/>
                </host>
 
-               <storage id="Disk4" typeId="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">