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 b59a8d1..7d77749 100644 (file)
--- 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="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">
     </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" />
     </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 e5fe1ca..0ff50eb 100644 (file)
--- 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
 
 $ ${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!
 > [  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 a1967ac..f1906a8 100644 (file)
--- 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
 $ ${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 ***
 > [  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 ***