From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Mon, 9 Sep 2019 12:09:50 +0000 (+0200)
Subject: extend platorm with disks
X-Git-Tag: v3.24~100
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/3cd6e9e5e584d89e9a8303c8ea6cc9cd5ab71257

extend platorm with disks
* have two disks on bob
* share same disk name between bob and alice
* revalidate tesh files after modifications
---

diff --git a/examples/platforms/hosts_with_disks.xml b/examples/platforms/hosts_with_disks.xml
index b59a8d197c..7d77749599 100644
--- a/examples/platforms/hosts_with_disks.xml
+++ b/examples/platforms/hosts_with_disks.xml
@@ -6,10 +6,11 @@
       <disk id="Disk1" read_bw="100MBps" write_bw="40MBps">
         <prop id="size" value="500GiB"/>
       </disk>
+      <disk id="Disk2" read_bw="200MBps" write_bw="80MBps"/>
     </host>
 
     <host id="alice" speed="1Gf">
-      <disk id="Disk2" read_bw="200MBps" write_bw="80MBps"/>
+      <disk id="Disk1" read_bw="200MBps" write_bw="80MBps"/>
     </host>
 
     <link id="link1" bandwidth="125MBps" latency="150us" />
diff --git a/examples/s4u/io-async/s4u-io-async.tesh b/examples/s4u/io-async/s4u-io-async.tesh
index e5fe1ca742..0ff50eb845 100644
--- a/examples/s4u/io-async/s4u-io-async.tesh
+++ b/examples/s4u/io-async/s4u-io-async.tesh
@@ -2,7 +2,7 @@
 
 $ ${bindir:=.}/s4u-io-async ${platfdir}/hosts_with_disks.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:test@bob) Hello! read 20000000 bytes from Disk1
-> [  0.000000] (2:test_cancel@alice) Hello! write 50000000 bytes from Disk2
+> [  0.000000] (2:test_cancel@alice) Hello! write 50000000 bytes from Disk1
 > [  0.200000] (1:test@bob) Goodbye now!
 > [  0.500000] (2:test_cancel@alice) I changed my mind, cancel!
 > [  0.500000] (2:test_cancel@alice) Goodbye now!
diff --git a/examples/s4u/io-disk-raw/s4u-io-disk-raw.tesh b/examples/s4u/io-disk-raw/s4u-io-disk-raw.tesh
index a1967ac6f1..f1906a81c2 100644
--- a/examples/s4u/io-disk-raw/s4u-io-disk-raw.tesh
+++ b/examples/s4u/io-disk-raw/s4u-io-disk-raw.tesh
@@ -3,6 +3,7 @@
 $ ${bindir}/s4u-io-disk-raw ${platfdir}/hosts_with_disks.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:@bob) *** Storage info on bob ***
 > [  0.000000] (1:@bob) Disk name: Disk1
+> [  0.000000] (1:@bob) Disk name: Disk2
 > [  0.010000] (1:@bob) Wrote 400000 bytes on 'Disk1'
 > [  0.012000] (1:@bob) Read 200000 bytes on 'Disk1'
 > [  0.012000] (1:@bob) *** Get/set data for storage element: Disk1 ***