update storage.xml to prepare the field for the new example. impacts

io.tesh, hence revalidation

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index c8652bd..23b4b96 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -1027,6 +1027,7 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/conf/lcg_sept2004_grid.xml
   examples/platforms/conf/transform_optorsim_platform.pl
   examples/platforms/config.xml
+  examples/platforms/content/small_content.txt
   examples/platforms/content/storage_content.txt
   examples/platforms/content/win_storage_content.txt
   examples/platforms/data_center.xml

diff --git a/examples/msg/io/io.tesh b/examples/msg/io/io.tesh
index bf4bdc2..65a31f8 100644 (file)
--- a/examples/msg/io/io.tesh
+++ b/examples/msg/io/io.tesh
@@ -9,27 +9,27 @@ $ ${bindir:=.}/io/file ${srcdir:=.}/examples/platforms/storage.xml "--log=root.f
 >              Full name: './doc/simgrid/examples/platforms/g5k.xml'
 >              Size: 17028
 >              Mount point: '/home'
->              Storage Id: 'Disk4'
->              Storage Type: 'single_SSD'
+>              Storage Id: 'Disk1'
+>              Storage Type: 'single_HDD'
 >              Content Type: 'txt_unix'
 > [  0.000000] (1:0@denise)    Open file './doc/simgrid/examples/platforms/g5k.xml'
-> [  0.000005] (2:1@alice)     Have read    482 on ./doc/simgrid/examples/platforms/One_cluster_no_backbone.xml
-> [  0.000040] (4:3@bob)       Have read    4028 on ./doc/simgrid/examples/platforms/nancy.xml
-> [  0.000170] (1:0@denise)    Have read    17028 on ./doc/simgrid/examples/platforms/g5k.xml
+> [  0.000002] (2:1@alice)     Have read    482 on ./doc/simgrid/examples/platforms/One_cluster_no_backbone.xml
+> [  0.000081] (4:3@bob)       Have read    4028 on ./doc/simgrid/examples/platforms/nancy.xml
+> [  0.000225] (1:0@denise)    Have read    17028 on ./doc/simgrid/examples/platforms/g5k.xml
 > [  0.000226] (3:2@carl)      Have read    22645 on ./doc/simgrid/examples/platforms/g5k_cabinets.xml
-> [  0.003338] (2:1@alice)     Have written 100000 on ./doc/simgrid/examples/platforms/One_cluster_no_backbone.xml
-> [  0.003374] (4:3@bob)       Have written 100000 on ./doc/simgrid/examples/platforms/nancy.xml
-> [  0.003504] (1:0@denise)    Have written 100000 on ./doc/simgrid/examples/platforms/g5k.xml
+> [  0.001669] (2:1@alice)     Have written 100000 on ./doc/simgrid/examples/platforms/One_cluster_no_backbone.xml
+> [  0.002297] (2:1@alice)     Have read    100480 on ./doc/simgrid/examples/platforms/One_cluster_no_backbone.xml (of size 100480)
+> [  0.002297] (2:1@alice)     Close file './doc/simgrid/examples/platforms/One_cluster_no_backbone.xml'
 > [  0.003560] (3:2@carl)      Have written 100000 on ./doc/simgrid/examples/platforms/g5k_cabinets.xml
-> [  0.004343] (2:1@alice)     Have read    100481 on ./doc/simgrid/examples/platforms/One_cluster_no_backbone.xml (of size 100481)
-> [  0.004343] (2:1@alice)     Close file './doc/simgrid/examples/platforms/One_cluster_no_backbone.xml'
-> [  0.004414] (4:3@bob)       Have read    104027 on ./doc/simgrid/examples/platforms/nancy.xml (of size 104027)
-> [  0.004414] (4:3@bob)       Close file './doc/simgrid/examples/platforms/nancy.xml'
-> [  0.004604] (1:0@denise)    Have read    110000 on ./doc/simgrid/examples/platforms/g5k.xml (of size 117027)
-> [  0.004604] (1:0@denise)    Close file './doc/simgrid/examples/platforms/g5k.xml'
-> [  0.004660] (3:2@carl)      Have read    110000 on ./doc/simgrid/examples/platforms/g5k_cabinets.xml (of size 122644)
-> [  0.004660] (3:2@carl)      Close file './doc/simgrid/examples/platforms/g5k_cabinets.xml'
-> [  0.004660] (0:@) Simulation time 0.00465978
+> [  0.004782] (3:2@carl)      Have read    110000 on ./doc/simgrid/examples/platforms/g5k_cabinets.xml (of size 122644)
+> [  0.004782] (3:2@carl)      Close file './doc/simgrid/examples/platforms/g5k_cabinets.xml'
+> [  0.006603] (4:3@bob)       Have written 100000 on ./doc/simgrid/examples/platforms/nancy.xml
+> [  0.006892] (1:0@denise)    Have written 100000 on ./doc/simgrid/examples/platforms/g5k.xml
+> [  0.008626] (4:3@bob)       Have read    104025 on ./doc/simgrid/examples/platforms/nancy.xml (of size 104025)
+> [  0.008626] (4:3@bob)       Close file './doc/simgrid/examples/platforms/nancy.xml'
+> [  0.008981] (1:0@denise)    Have read    110000 on ./doc/simgrid/examples/platforms/g5k.xml (of size 117025)
+> [  0.008981] (1:0@denise)    Close file './doc/simgrid/examples/platforms/g5k.xml'
+> [  0.008981] (0:@) Simulation time 0.00898084
 
 $ ${bindir:=.}/io/file_unlink ${srcdir:=.}/examples/platforms/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:@) Number of host '4'

diff --git a/examples/platforms/content/small_content.txt b/examples/platforms/content/small_content.txt
new file mode 100644 (file)
index 0000000..fddb4a2
--- /dev/null
+++ b/examples/platforms/content/small_content.txt
@@ -0,0 +1,30 @@
+./doc/simgrid/examples/cxx/autoDestination/autoDestination_platform.xml  2133932
+./doc/simgrid/examples/smpi/mc_bugged2.c  1387
+./doc/simgrid/examples/smpi/NAS/README  1857
+./doc/simgrid/examples/smpi/NAS/MPI_dummy/README 2406
+./doc/simgrid/examples/smpi/NAS/common/randdp.c 1441
+./doc/simgrid/examples/smpi/NAS/sys/README  1461
+./doc/simgrid/examples/smpi/NAS/SP/README  926
+./doc/simgrid/examples/smpi/NAS/FT/README  276
+./doc/simgrid/examples/smpi/NAS/DT/README  999
+./doc/simgrid/examples/smpi/NAS/EP/README  347
+./doc/simgrid/examples/smpi/NAS/EP/randlc.c  3300
+./doc/simgrid/examples/smpi/NAS/MG/README  5465
+./doc/simgrid/examples/xbt/sem_basic.c  1970
+./doc/simgrid/examples/msg/README  4805
+./doc/simgrid/examples/msg/icomms/small_platform.xml 972
+./doc/simgrid/examples/msg/parallel_task/test_ptask_deployment.xml  654
+./doc/simgrid/examples/msg/alias/masterslave_forwarder_with_alias.c  6217
+./doc/simgrid/examples/msg/trace/test9.xml  598
+./doc/simgrid/html/group__XBT__str.html  36192
+./include/smpi/mpif.h  4826
+./include/xbt/fifo.h  3626
+./include/msg/datatypes.h 4635
+./include/mc/modelchecker.h  96
+./include/surf/simgrid_dtd.h  23583
+./include/instr/instr.h  5750
+./include/simdag/simdag.h  10325
+./include/simix/simix.h  13003
+./lib/libsimgrid.so.3.6.2  12710497
+./bin/smpicc  918
+./bin/tesh  356434
\ No newline at end of file

diff --git a/examples/platforms/storage.xml b/examples/platforms/storage.xml
index c1eb980..142ee85 100644 (file)
--- a/examples/platforms/storage.xml
+++ b/examples/platforms/storage.xml
@@ -12,51 +12,51 @@
    <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" />
+      <prop id="Bwrite" value="30MBps" />
+      <prop id="Bread" value="100MBps" />
+      <prop id="Bconnection" value="120MBps" />
    </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="1Gf">
-                       <mount storageId="Disk2" name="/home"/>
-               </host>
-
-               <host id="carl" power="1Gf">            
-                       <mount storageId="Disk3" name="/home"/>         
-               </host>
-               
-               <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" />
-                       <link_ctn id="link2" />
-                       <link_ctn id="link3" />
-               </route>        
-
-       </AS>
+   <storage_type id="single_SSD" model="linear_no_lat" size="500GiB">
+      <prop id="Bwrite" value="60MBps" />
+      <prop id="Bread" value="200MBps" />
+      <prop id="Bconnection" value="220MBps" />
+   </storage_type>
+
+    <storage id="Disk1" typeId="single_HDD" />
+    <storage id="Disk2" typeId="single_SSD"
+             content="content/storage_content.txt"
+             content_type="txt_unix" />
+    <storage id="Disk3" typeId="single_HDD" />
+    <storage id="Disk4" typeId="single_SSD"
+             content="content/small_content.txt"
+             content_type="txt_unix" />
+
+    <host id="bob" power="1Gf">
+      <mount storageId="Disk1" name="/home"/>
+    </host>
+
+    <host id="alice" power="1Gf">
+      <mount storageId="Disk2" name="/home"/>
+    </host>
+
+    <host id="carl" power="1Gf">
+      <mount storageId="Disk3" name="/home"/>
+    </host>
+
+    <host id="denise" power="1Gf">
+      <mount storageId="Disk1" name="/home"/>  
+      <mount storageId="Disk4" name="/sd1"/>   
+    </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" />
+      <link_ctn id="link2" />
+      <link_ctn id="link3" />
+    </route>
+  </AS>
 </platform>