Merge branch 'hypervisor' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into hypervisor

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

diff --git a/examples/platforms/storage.xml b/examples/platforms/storage.xml
index 41c2bb6..69516b8 100644 (file)
--- a/examples/platforms/storage.xml
+++ b/examples/platforms/storage.xml
@@ -9,49 +9,48 @@
 
        <AS id="AS0" routing="Full">
 
-               <storage_type id="samsung" model="RAID5" content="storage_content.txt">
-                       <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="">
-                       <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="">
-                       <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" 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:"/>                   
+               <host id="bob" power="1Gf">
+                       <mount id="Disk1" name="/home"/>                        
                </host>         
                
-               <host id="alice" power="1000000000">
-                       <mount id="Disk1" name="C:"/>
+               <host id="alice" power="1Gf">
+                       <mount id="Disk2" name="/home"/>
                </host>
 
-               <storage id="Disk4" typeId="wdigital"/>
-               <host id="carl" power="1000000000">             
-                       <mount id="Disk4" name="C:"/>
-                       <mount id="Disk1" name="D:"/>                   
+               <host id="carl" power="1Gf">            
+                       <mount id="Disk3" name="/home"/>                
                </host>
                
-               <host id="denise" power="1000000000">
-                       <mount id="Disk4" name="C:"/>   
+               <host id="denise" power="1Gf">
+                       <mount id="Disk4" 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" />
+               <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" />