[Platforms] Created folder 'storage' for storage specific platforms

diff --git a/examples/msg/io/io.tesh b/examples/msg/io/io.tesh
index bf22827..01b3c6a 100644 (file)
--- a/examples/msg/io/io.tesh
+++ b/examples/msg/io/io.tesh
@@ -1,6 +1,6 @@
 #! ./tesh
 
 #! ./tesh
 

-$ ${bindir:=.}/io/file ${srcdir:=.}/examples/platforms/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${bindir:=.}/io/file ${srcdir:=.}/examples/platforms/storage/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (0:@) Number of host '4'
 > [  0.000000] (2:1@alice)     Open file 'c:\Windows\setupact.log'
 > [  0.000000] (3:2@carl)      Open file '/home/doc/simgrid/examples/platforms/g5k_cabinets.xml'
 > [  0.000000] (0:@) Number of host '4'
 > [  0.000000] (2:1@alice)     Open file 'c:\Windows\setupact.log'
 > [  0.000000] (3:2@carl)      Open file '/home/doc/simgrid/examples/platforms/g5k_cabinets.xml'


@@ -55,7 +55,7 @@ $ ${bindir:=.}/io/file ${srcdir:=.}/examples/platforms/storage.xml "--log=root.f
 > [  0.008326] (3:2@carl)      Close file '/home/doc/simgrid/examples/platforms/g5k_cabinets.xml'
 > [  0.008326] (0:@) Simulation time 0.00832645
 
 > [  0.008326] (3:2@carl)      Close file '/home/doc/simgrid/examples/platforms/g5k_cabinets.xml'
 > [  0.008326] (0:@) Simulation time 0.00832645
 

-$ ${bindir:=.}/io/file_unlink ${srcdir:=.}/examples/platforms/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${bindir:=.}/io/file_unlink ${srcdir:=.}/examples/platforms/storage/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (0:@) Number of host '4'
 > [  0.000000] (1:0@denise)    Open file '/home/doc/simgrid/examples/platforms/g5k.xml'
 > [  0.000000] (1:0@denise)    Unlink file '/home/doc/simgrid/examples/platforms/g5k.xml'
 > [  0.000000] (0:@) Number of host '4'
 > [  0.000000] (1:0@denise)    Open file '/home/doc/simgrid/examples/platforms/g5k.xml'
 > [  0.000000] (1:0@denise)    Unlink file '/home/doc/simgrid/examples/platforms/g5k.xml'

diff --git a/examples/msg/io/remote.tesh b/examples/msg/io/remote.tesh
index ddc15bc..e3ca838 100644 (file)
--- a/examples/msg/io/remote.tesh
+++ b/examples/msg/io/remote.tesh
@@ -1,6 +1,6 @@
 #! ./tesh
 
 #! ./tesh
 

-$ ${bindir:=.}/io/remote$EXEEXT ${srcdir:=.}/examples/platforms/remote_io.xml ${srcdir:=.}/examples/platforms/deployment_remote_io.xml "--log=root.fmt:[%10.6r]%e(%i@%5h)%e%m%n"
+$ ${bindir:=.}/io/remote$EXEEXT ${srcdir:=.}/examples/platforms/storage/remote_io.xml ${srcdir:=.}/examples/platforms/storage/remote_io.deployment.xml "--log=root.fmt:[%10.6r]%e(%i@%5h)%e%m%n"

 > [  0.000000] (0@     ) Init: 12 MiB used on 'Disk1'
 > [  0.000000] (0@     ) Init: 2280 MiB used on 'Disk2'
 > [  0.000000] (1@alice) Opened file 'c:\Windows\setupact.log'
 > [  0.000000] (0@     ) Init: 12 MiB used on 'Disk1'
 > [  0.000000] (0@     ) Init: 2280 MiB used on 'Disk2'
 > [  0.000000] (1@alice) Opened file 'c:\Windows\setupact.log'

diff --git a/examples/msg/io/storage.tesh b/examples/msg/io/storage.tesh
index 93393fc..00412a4 100644 (file)
--- a/examples/msg/io/storage.tesh
+++ b/examples/msg/io/storage.tesh
@@ -1,6 +1,6 @@
 #! ./tesh
 
 #! ./tesh
 

-$ ${bindir:=.}/io/storage$EXEEXT ${srcdir:=.}/examples/platforms/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${bindir:=.}/io/storage$EXEEXT ${srcdir:=.}/examples/platforms/storage/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (1:(null)@denise) *** Storage info on denise ***
 > [  0.000000] (1:(null)@denise) Storage name: Disk2, mount name: c:
 > [  0.000000] (1:(null)@denise) Total size: 536870912000 bytes
 > [  0.000000] (1:(null)@denise) *** Storage info on denise ***
 > [  0.000000] (1:(null)@denise) Storage name: Disk2, mount name: c:
 > [  0.000000] (1:(null)@denise) Total size: 536870912000 bytes

diff --git a/examples/platforms/deployment_remote_io.xml b/examples/platforms/storage/remote_io.deployment.xml
similarity index 100%
rename from examples/platforms/deployment_remote_io.xml
rename to examples/platforms/storage/remote_io.deployment.xml

diff --git a/examples/platforms/remote_io.xml b/examples/platforms/storage/remote_io.xml
similarity index 100%
rename from examples/platforms/remote_io.xml
rename to examples/platforms/storage/remote_io.xml

diff --git a/examples/platforms/storage.xml b/examples/platforms/storage/storage.xml
similarity index 100%
rename from examples/platforms/storage.xml
rename to examples/platforms/storage/storage.xml

diff --git a/examples/simdag/io/io.tesh b/examples/simdag/io/io.tesh
index 2f2ceed..7e17983 100644 (file)
--- a/examples/simdag/io/io.tesh
+++ b/examples/simdag/io/io.tesh
@@ -1,6 +1,6 @@
 #! ./tesh
 
 #! ./tesh
 

-$ ${bindir:=.}/io/sd_io ${srcdir:=.}/examples/platforms/storage.xml 
+$ ${bindir:=.}/io/sd_io ${srcdir:=.}/examples/platforms/storage/storage.xml 

 > [0.000000] [sd_io/INFO] Workstation 'denise' mounts 'c:'
 > [0.000000] [sd_io/INFO] Workstation 'denise' mounts '/home'
 > [0.000000] [sd_io/INFO] Workstation 'alice' mounts 'c:'
 > [0.000000] [sd_io/INFO] Workstation 'denise' mounts 'c:'
 > [0.000000] [sd_io/INFO] Workstation 'denise' mounts '/home'
 > [0.000000] [sd_io/INFO] Workstation 'alice' mounts 'c:'