From: Frederic Suter Date: Thu, 24 Mar 2016 10:19:56 +0000 (+0100) Subject: split actions in two dir X-Git-Tag: v3_13~313 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/65fb54463298816c1902c1a9167bf82d6bdb1339 split actions in two dir --- diff --git a/.gitignore b/.gitignore index c659083077..100e2be587 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/examples/msg/CMakeLists.txt b/examples/msg/CMakeLists.txt index d2ad44acb0..fd87a1dbf4 100644 --- a/examples/msg/CMakeLists.txt +++ b/examples/msg/CMakeLists.txt @@ -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() diff --git a/examples/msg/actions/mpi_actions.c b/examples/msg/actions-mpi/actions-mpi.c similarity index 100% rename from examples/msg/actions/mpi_actions.c rename to examples/msg/actions-mpi/actions-mpi.c diff --git a/examples/msg/actions/mpi_actions.tesh b/examples/msg/actions-mpi/actions-mpi.tesh similarity index 85% rename from examples/msg/actions/mpi_actions.tesh rename to examples/msg/actions-mpi/actions-mpi.tesh index 001fee7768..cc49d0a3db 100644 --- a/examples/msg/actions/mpi_actions.tesh +++ b/examples/msg/actions-mpi/actions-mpi.tesh @@ -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 diff --git a/examples/msg/actions/mpi_actions.txt b/examples/msg/actions-mpi/actions-mpi.txt similarity index 100% rename from examples/msg/actions/mpi_actions.txt rename to examples/msg/actions-mpi/actions-mpi.txt diff --git a/examples/msg/actions/mpi_deployment.xml b/examples/msg/actions-mpi/actions-mpi_d.xml similarity index 100% rename from examples/msg/actions/mpi_deployment.xml rename to examples/msg/actions-mpi/actions-mpi_d.xml diff --git a/examples/msg/actions/mpi_deployment_split.xml b/examples/msg/actions-mpi/actions-mpi_split_d.xml similarity index 62% rename from examples/msg/actions/mpi_deployment_split.xml rename to examples/msg/actions-mpi/actions-mpi_split_d.xml index e0984f7d18..b1419e71b3 100644 --- a/examples/msg/actions/mpi_deployment_split.xml +++ b/examples/msg/actions-mpi/actions-mpi_split_d.xml @@ -5,10 +5,6 @@ Launch it like this: ./mpi_actions homogeneous_3_hosts.xml mpi_deployment_split.xml --> - - - - - - + + diff --git a/examples/msg/actions/mpi_actions_split_p0.txt b/examples/msg/actions-mpi/actions-mpi_split_p0.txt similarity index 100% rename from examples/msg/actions/mpi_actions_split_p0.txt rename to examples/msg/actions-mpi/actions-mpi_split_p0.txt diff --git a/examples/msg/actions/mpi_actions_split_p1.txt b/examples/msg/actions-mpi/actions-mpi_split_p1.txt similarity index 100% rename from examples/msg/actions/mpi_actions_split_p1.txt rename to examples/msg/actions-mpi/actions-mpi_split_p1.txt diff --git a/examples/msg/actions/storage_actions.c b/examples/msg/actions-storage/actions-storage.c similarity index 100% rename from examples/msg/actions/storage_actions.c rename to examples/msg/actions-storage/actions-storage.c diff --git a/examples/msg/actions/storage_actions.tesh b/examples/msg/actions-storage/actions-storage.tesh similarity index 60% rename from examples/msg/actions/storage_actions.tesh rename to examples/msg/actions-storage/actions-storage.tesh index aab51500b7..e8219a17ea 100644 --- a/examples/msg/actions/storage_actions.tesh +++ b/examples/msg/actions-storage/actions-storage.tesh @@ -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/storage_actions.txt b/examples/msg/actions-storage/actions-storage.txt similarity index 100% rename from examples/msg/actions/storage_actions.txt rename to examples/msg/actions-storage/actions-storage.txt diff --git a/examples/msg/actions/storage_deployment.xml b/examples/msg/actions-storage/actions-storage_d.xml similarity index 100% rename from examples/msg/actions/storage_deployment.xml rename to examples/msg/actions-storage/actions-storage_d.xml diff --git a/examples/msg/actions/CMakeLists.txt b/examples/msg/actions/CMakeLists.txt deleted file mode 100644 index c92a963eb1..0000000000 --- a/examples/msg/actions/CMakeLists.txt +++ /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) diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 8c0195d0a2..adb99d6741 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -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