reorg io examples

diff --git a/.gitignore b/.gitignore
index 4ef4269..a177594 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -141,10 +141,10 @@ examples/msg/energy-pstate/energy-pstate
 examples/msg/energy-ptask/energy-ptask
 examples/msg/energy-vm/energy-vm
 examples/msg/gtnets/gtnets
-examples/msg/io/file
-examples/msg/io/file_unlink
-examples/msg/io/remote
-examples/msg/io/storage
+examples/msg/io-file/io-file
+examples/msg/io-file-unlink/io-file-unlink
+examples/msg/io-remote/io-remote
+examples/msg/io-storage/io-storage
 examples/msg/irc_isend/peer
 examples/msg/irc_isend/toto.txt
 examples/msg/masterslave/masterslave_arg

diff --git a/examples/msg/CMakeLists.txt b/examples/msg/CMakeLists.txt
index 01ce6d2..ad8a77f 100644 (file)
--- a/examples/msg/CMakeLists.txt
+++ b/examples/msg/CMakeLists.txt
@@ -1,6 +1,7 @@
 foreach(x actions-mpi actions-storage async-wait async-waitall async-waitany dht-chord dht-pastry 
-          exception energy-consumption energy-onoff energy-pstate energy-ptask energy-vm pmm priority process-kill 
-          process-migration process-suspend properties sendrecv set-maestro start_kill_time synchro token_ring)
+          exception energy-consumption energy-onoff energy-pstate energy-ptask energy-vm io-file io-file-unlink 
+          io-remote io-storage pmm priority process-kill process-migration process-suspend properties sendrecv
+          set-maestro start_kill_time synchro token_ring)
   add_executable       (${x}     ${x}/${x}.c)
   target_link_libraries(${x}     simgrid)
   set_target_properties(${x}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
@@ -33,6 +34,7 @@ set(xml_files    ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/actions-mpi/action
                                   ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/chord10.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/dht-pastry/pastry10.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/energy-onoff/platform_onoff.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/io-remote/io-remote_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/priority/priority_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/properties/properties_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/sendrecv/sendrecv_d.xml
@@ -42,8 +44,9 @@ set(xml_files    ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/actions-mpi/action
                                   ${CMAKE_CURRENT_SOURCE_DIR}/start_kill_time/start_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/start_kill_time/start_kill_d.xml             PARENT_SCOPE)
 
-foreach(x actions-mpi actions-storage async-wait async-waitall async-waitany dht-chord priority process-kill
-        process-migration process-suspend properties sendrecv synchro start_kill_time token_ring)
+foreach(x actions-mpi actions-storage async-wait async-waitall async-waitany dht-chord io-file io-file-unlink io-remote
+        io-storage priority process-kill process-migration process-suspend properties sendrecv synchro start_kill_time
+        token_ring)
   ADD_TESH_FACTORIES(msg-${x} "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/${x} ${x}.tesh)
 endforeach()
 

diff --git a/examples/msg/io/file_unlink.c b/examples/msg/io-file-unlink/io-file-unlink.c
similarity index 100%
rename from examples/msg/io/file_unlink.c
rename to examples/msg/io-file-unlink/io-file-unlink.c

diff --git a/examples/msg/io/file_unlink.tesh b/examples/msg/io-file-unlink/io-file-unlink.tesh
similarity index 83%
rename from examples/msg/io/file_unlink.tesh
rename to examples/msg/io-file-unlink/io-file-unlink.tesh
index 0764c4c..77549ba 100644 (file)
--- a/examples/msg/io/file_unlink.tesh
+++ b/examples/msg/io-file-unlink/io-file-unlink.tesh
@@ -1,6 +1,6 @@
 #! ./tesh
 
-$ ${bindir:=.}/io/file_unlink ${srcdir:=.}/examples/platforms/storage/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${bindir:=.}/io-file-unlink ${srcdir:=.}/storage/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) 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/file.c b/examples/msg/io-file/io-file.c
similarity index 100%
rename from examples/msg/io/file.c
rename to examples/msg/io-file/io-file.c

diff --git a/examples/msg/io/file.tesh b/examples/msg/io-file/io-file.tesh
similarity index 97%
rename from examples/msg/io/file.tesh
rename to examples/msg/io-file/io-file.tesh
index 78af0bb..5bde55c 100644 (file)
--- a/examples/msg/io/file.tesh
+++ b/examples/msg/io-file/io-file.tesh
@@ -1,6 +1,6 @@
 #! ./tesh
 
-$ ${bindir:=.}/io/file ${srcdir:=.}/examples/platforms/storage/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${bindir:=.}/io-file ${srcdir:=.}/storage/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) 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'

diff --git a/examples/msg/io/remote.c b/examples/msg/io-remote/io-remote.c
similarity index 100%
rename from examples/msg/io/remote.c
rename to examples/msg/io-remote/io-remote.c

diff --git a/examples/msg/io/remote.tesh b/examples/msg/io-remote/io-remote.tesh
similarity index 95%
rename from examples/msg/io/remote.tesh
rename to examples/msg/io-remote/io-remote.tesh
index a6b057e..6d04727 100644 (file)
--- a/examples/msg/io/remote.tesh
+++ b/examples/msg/io-remote/io-remote.tesh
@@ -1,6 +1,6 @@
 #! ./tesh
 
-$ ${bindir:=.}/io/remote$EXEEXT ${srcdir:=.}/examples/platforms/storage/remote_io.xml ${srcdir:=.}/examples/msg/io/remote_io.deployment.xml "--log=root.fmt:[%10.6r]%e(%i@%5h)%e%m%n"
+$ ${bindir:=.}/io-remote$EXEEXT ${srcdir:=.}/storage/remote_io.xml ${srcdir:=.}/../msg/io-remote/io-remote_d.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'

diff --git a/examples/msg/io/remote_io.deployment.xml b/examples/msg/io-remote/io-remote_d.xml
similarity index 100%
rename from examples/msg/io/remote_io.deployment.xml
rename to examples/msg/io-remote/io-remote_d.xml

diff --git a/examples/msg/io/storage.c b/examples/msg/io-storage/io-storage.c
similarity index 100%
rename from examples/msg/io/storage.c
rename to examples/msg/io-storage/io-storage.c

diff --git a/examples/msg/io/storage.tesh b/examples/msg/io-storage/io-storage.tesh
similarity index 98%
rename from examples/msg/io/storage.tesh
rename to examples/msg/io-storage/io-storage.tesh
index fa55648..0f1f69d 100644 (file)
--- a/examples/msg/io/storage.tesh
+++ b/examples/msg/io-storage/io-storage.tesh
@@ -1,6 +1,6 @@
 #! ./tesh
 
-$ ${bindir:=.}/io/storage$EXEEXT ${srcdir:=.}/examples/platforms/storage/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${bindir:=.}/io-storage$EXEEXT ${srcdir:=.}/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

diff --git a/examples/msg/io/CMakeLists.txt b/examples/msg/io/CMakeLists.txt
deleted file mode 100644 (file)
index 9497595..0000000
--- a/examples/msg/io/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-foreach (example file file_unlink storage remote)
-  add_executable       (${example}  ${example}.c)
-  target_link_libraries(${example}  simgrid)
-  set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/${example}.c)
-  set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/${example}.tesh)
-
-  ADD_TESH(msg-${example} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/ --setenv srcdir=${CMAKE_HOME_DIRECTORY}/ --cd ${CMAKE_HOME_DIRECTORY}/examples/ ${CMAKE_HOME_DIRECTORY}/examples/msg/io/${example}.tesh)
-endforeach()
-
-set(examples_src  ${examples_src}                                           PARENT_SCOPE)
-set(tesh_files    ${tesh_files}                                             PARENT_SCOPE)
-set(xml_files     ${xml_files}    examples/msg/io/remote_io.deployment.xml  PARENT_SCOPE)

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index c8cc38e..62d64f4 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -954,7 +954,6 @@ set(CMAKEFILES_TXT
     examples/msg/cloud/CMakeLists.txt
     examples/msg/dht-kademlia/CMakeLists.txt
     examples/msg/gtnets/CMakeLists.txt 
-    examples/msg/io/CMakeLists.txt
     examples/msg/masterslave/CMakeLists.txt
     examples/msg/mc/CMakeLists.txt
     examples/msg/ns3/CMakeLists.txt