Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
split actions in two dir
authorFrederic Suter <frederic.suter@cc.in2p3.fr>
Thu, 24 Mar 2016 10:19:56 +0000 (11:19 +0100)
committerFrederic Suter <frederic.suter@cc.in2p3.fr>
Thu, 24 Mar 2016 10:19:56 +0000 (11:19 +0100)
15 files changed:
.gitignore
examples/msg/CMakeLists.txt
examples/msg/actions-mpi/actions-mpi.c [moved from examples/msg/actions/mpi_actions.c with 100% similarity]
examples/msg/actions-mpi/actions-mpi.tesh [moved from examples/msg/actions/mpi_actions.tesh with 85% similarity]
examples/msg/actions-mpi/actions-mpi.txt [moved from examples/msg/actions/mpi_actions.txt with 100% similarity]
examples/msg/actions-mpi/actions-mpi_d.xml [moved from examples/msg/actions/mpi_deployment.xml with 100% similarity]
examples/msg/actions-mpi/actions-mpi_split_d.xml [moved from examples/msg/actions/mpi_deployment_split.xml with 62% similarity]
examples/msg/actions-mpi/actions-mpi_split_p0.txt [moved from examples/msg/actions/mpi_actions_split_p0.txt with 100% similarity]
examples/msg/actions-mpi/actions-mpi_split_p1.txt [moved from examples/msg/actions/mpi_actions_split_p1.txt with 100% similarity]
examples/msg/actions-storage/actions-storage.c [moved from examples/msg/actions/storage_actions.c with 100% similarity]
examples/msg/actions-storage/actions-storage.tesh [moved from examples/msg/actions/storage_actions.tesh with 60% similarity]
examples/msg/actions-storage/actions-storage.txt [moved from examples/msg/actions/storage_actions.txt with 100% similarity]
examples/msg/actions-storage/actions-storage_d.xml [moved from examples/msg/actions/storage_deployment.xml with 100% similarity]
examples/msg/actions/CMakeLists.txt [deleted file]
tools/cmake/DefinePackages.cmake

index c659083..100e2be 100644 (file)
@@ -117,8 +117,8 @@ tags
 callgrind.out.*
 ### Examples and traces
 *.exe
-examples/msg/actions/mpi_actions
-examples/msg/actions/storage_actions
+examples/msg/actions-mpi/actions-mpi
+examples/msg/actions-storage/actions-storage
 examples/msg/bittorrent/bittorrent
 examples/msg/bittorrent/bittorrent_platfgen
 examples/msg/categories.trace
index d2ad44a..fd87a1d 100644 (file)
@@ -1,4 +1,5 @@
-foreach(x dht-chord dht-pastry exception energy-consumption energy-onoff energy-pstate energy-ptask energy-vm 
+foreach(x actions-mpi actions-storage dht-chord dht-pastry 
+          exception energy-consumption energy-onoff energy-pstate energy-ptask energy-vm 
           migration pmm priority properties suspend synchro token_ring)
   add_executable       (${x}     ${x}/${x}.c)
   target_link_libraries(${x}     simgrid)
@@ -11,18 +12,25 @@ foreach(file bourassa fafard ginette jupiter link3 link4 link5)
   set(txt_files ${txt_files} ${CMAKE_CURRENT_SOURCE_DIR}/${file}_state.trace)
 endforeach()
 
-set(txt_files    ${txt_files}     ${CMAKE_CURRENT_SOURCE_DIR}/README                                       PARENT_SCOPE)
+set(txt_files    ${txt_files}     ${CMAKE_CURRENT_SOURCE_DIR}/README
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/actions-mpi/actions-mpi.txt
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/actions-mpi/actions-mpi_split_p0.txt
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/actions-mpi/actions-mpi_split_p1.txt
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/actions-storage/actions-storage.txt          PARENT_SCOPE)
 set(bin_files    ${bin_files}     ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/generate.py                        PARENT_SCOPE)
 set(examples_src ${examples_src}                                                                           PARENT_SCOPE)
 set(tesh_files   ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/dht-chord_crosstraffic.tesh        PARENT_SCOPE)
-set(xml_files    ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/chord.xml
+set(xml_files    ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/actions-mpi/actions-mpi_d.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/actions-mpi/actions-mpi_split_d.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/actions-storage/actions-storage_d.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/chord.xml
                                   ${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}/priority/priority_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/properties/properties_d.xml                  PARENT_SCOPE)
 
-foreach(x dht-chord migration priority properties suspend synchro token_ring)
+foreach(x actions-mpi actions-storage dht-chord migration priority properties suspend synchro 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()
 
similarity index 85%
rename from examples/msg/actions/mpi_actions.tesh
rename to examples/msg/actions-mpi/actions-mpi.tesh
index 001fee7..cc49d0a 100644 (file)
@@ -1,7 +1,7 @@
 # A little tesh file testing most MPI-related actions
 
 ! output sort 19
-$ ${bindir:=.}/mpi_actions --log=actions.thres=verbose ${srcdir:=.}/../../platforms/small_platform_fatpipe.xml mpi_deployment_split.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${bindir:=.}/actions-mpi --log=actions.thres=verbose ${srcdir:=.}/small_platform_fatpipe.xml actions-mpi_split_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > WARNING: THIS BINARY IS KINDA DEPRECATED
 > This example is still relevant if you want to learn about MSG-based trace replay, but if you want to simulate MPI-like traces, you should use the newer version that is in the examples/smpi/replay directory instead.
 > [ 20.703314] (1:p0@Tremblay) p0 recv p1 20.703314
@@ -11,7 +11,7 @@ $ ${bindir:=.}/mpi_actions --log=actions.thres=verbose ${srcdir:=.}/../../platfo
 > [ 32.703314] (0:maestro@) Simulation time 32.7033
 
 ! output sort 19
-$ ${bindir:=.}/mpi_actions --log=actions.thres=verbose ${srcdir:=.}/../../platforms/small_platform_fatpipe.xml mpi_deployment.xml mpi_actions.txt "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${bindir:=.}/actions-mpi --log=actions.thres=verbose ${srcdir:=.}/small_platform_fatpipe.xml actions-mpi_d.xml actions-mpi.txt "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > WARNING: THIS BINARY IS KINDA DEPRECATED
 > This example is still relevant if you want to learn about MSG-based trace replay, but if you want to simulate MPI-like traces, you should use the newer version that is in the examples/smpi/replay directory instead.
 > [  0.000000] (1:p0@Tremblay) p0 comm_size 3 0.000000
@@ -5,10 +5,6 @@
      Launch it like this:
          ./mpi_actions homogeneous_3_hosts.xml mpi_deployment_split.xml  -->
 
-  <process host="Tremblay" function="p0">
-    <argument value="mpi_actions_split_p0.txt"/>
-  </process>
-  <process host="Ruby" function="p1">
-    <argument value="mpi_actions_split_p1.txt"/>
-  </process>
+  <process host="Tremblay" function="p0">    <argument value="actions-mpi_split_p0.txt"/>  </process>
+  <process host="Ruby" function="p1">        <argument value="actions-mpi_split_p1.txt"/>  </process>
 </platform>
@@ -1,5 +1,5 @@
 ! output sort 19
-$ ${bindir:=.}/storage_actions --log=storage_actions.thres=verbose ${srcdir:=.}/../../platforms/storage/storage.xml storage_deployment.xml storage_actions.txt "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${bindir:=.}/actions-storage --log=storage_actions.thres=verbose ${srcdir:=.}/storage/storage.xml actions-storage_d.xml actions-storage.txt "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:p0@denise) p0 open /home/lib/libsimgrid.so.3.6.2 0.000000
 > [  0.063552] (1:p0@denise) p0 read /home/lib/libsimgrid.so.3.6.2 12710497 0.063552
 > [  0.063552] (1:p0@denise) p0 close /home/lib/libsimgrid.so.3.6.2 0.000000
diff --git a/examples/msg/actions/CMakeLists.txt b/examples/msg/actions/CMakeLists.txt
deleted file mode 100644 (file)
index c92a963..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-foreach (example mpi storage)
-  add_executable       (${example}_actions  ${example}_actions.c)
-  target_link_libraries(${example}_actions  simgrid)
-
-  set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/${example}_actions.tesh)
-  set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/${example}_actions.c)
-  set(txt_files     ${txt_files}     ${CMAKE_CURRENT_SOURCE_DIR}/${example}_actions.txt)
-  set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/${example}_deployment.xml)
-
-  ADD_TESH_FACTORIES(msg-${example}-actions  "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/actions --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/actions ${example}_actions.tesh)
-endforeach()
-
-set(examples_src  ${examples_src}                                                          PARENT_SCOPE)
-set(tesh_files    ${tesh_files}                                                            PARENT_SCOPE)
-set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/mpi_deployment_split.xml    PARENT_SCOPE)
-set(txt_files     ${txt_files}     ${CMAKE_CURRENT_SOURCE_DIR}/mpi_actions_split_p0.txt
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/mpi_actions_split_p1.txt    PARENT_SCOPE)
index 8c0195d..adb99d6 100644 (file)
@@ -948,7 +948,6 @@ set(CMAKEFILES_TXT
   examples/java/tracing/CMakeLists.txt
   
   examples/msg/CMakeLists.txt
-    examples/msg/actions/CMakeLists.txt
     examples/msg/bittorrent/CMakeLists.txt
     examples/msg/chainsend/CMakeLists.txt
     examples/msg/cloud/CMakeLists.txt