[trace] moving traced smpi example to example/smpi/tracing/, plus new simple program

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index 54df0d1..d4e6d81 100644 (file)
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -426,7 +426,7 @@ if(HAVE_UCONTEXT_H)
        ADD_TEST(smpi-reduce-ucontext   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext                 --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/reduce.tesh)
 endif(HAVE_UCONTEXT_H)
 if(HAVE_TRACING)
-  ADD_TEST(smpi-tracing-ptp ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/smpi_traced.tesh)
+  ADD_TEST(smpi-tracing-ptp ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/tracing/smpi_traced.tesh)
 endif(HAVE_TRACING)
 endif(enable_smpi)
                                                                

diff --git a/buildtools/Cmake/AddTestsWin.cmake b/buildtools/Cmake/AddTestsWin.cmake
index b1d557f..da7a994 100644 (file)
--- a/buildtools/Cmake/AddTestsWin.cmake
+++ b/buildtools/Cmake/AddTestsWin.cmake
@@ -120,7 +120,7 @@ if(enable_smpi)
 ADD_TEST(smpi-bcast    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/bcast.tesh)\r
 ADD_TEST(smpi-reduce   perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/reduce.tesh)\r
 if(HAVE_TRACING)\r
-  ADD_TEST(smpi-tracing-ptp perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/smpi_traced.tesh)\r
+  ADD_TEST(smpi-tracing-ptp perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/tracing/smpi_traced.tesh)\r
 endif(HAVE_TRACING)\r
 endif(enable_smpi)\r
                                                                \r

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index c085b1b..132faf9 100644 (file)
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -869,7 +869,7 @@ ${CMAKE_BINARY_DIR}/bin/smpiff
 ${CMAKE_BINARY_DIR}/bin/smpirun
 ${CMAKE_BINARY_DIR}/bin/colorize
 ${CMAKE_BINARY_DIR}/bin/simgrid_update_xml
-${CMAKE_BINARY_DIR}/examples/smpi/smpi_traced.trace
+${CMAKE_BINARY_DIR}/examples/smpi/tracing/smpi_traced.trace
 ${CMAKE_BINARY_DIR}/src/supernovae_sg.c
 ${CMAKE_BINARY_DIR}/src/supernovae_gras.c
 ${CMAKE_BINARY_DIR}/src/supernovae_smpi.c

diff --git a/examples/smpi/CMakeLists.txt b/examples/smpi/CMakeLists.txt
index 410e492..2b248f3 100644 (file)
--- a/examples/smpi/CMakeLists.txt
+++ b/examples/smpi/CMakeLists.txt
@@ -24,7 +24,8 @@ add_executable(split split.c)
 add_executable(dsend dsend.c)
 add_executable(mvmul mvmul.c)
 add_executable(smpi_sendrecv sendrecv.c)
-add_executable(smpi_traced smpi_traced.c)
+add_executable(smpi_traced tracing/smpi_traced.c)
+add_executable(smpi_traced_simple tracing/smpi_traced_simple.c)
 add_executable(ttest01 ttest01.c)
 add_executable(mc_bugged1 mc_bugged1.c)
 add_executable(mc_bugged2 mc_bugged2.c)

diff --git a/examples/smpi/smpi_traced.c b/examples/smpi/tracing/smpi_traced.c
similarity index 100%
rename from examples/smpi/smpi_traced.c
rename to examples/smpi/tracing/smpi_traced.c

diff --git a/examples/smpi/smpi_traced.tesh b/examples/smpi/tracing/smpi_traced.tesh
similarity index 100%
rename from examples/smpi/smpi_traced.tesh
rename to examples/smpi/tracing/smpi_traced.tesh

diff --git a/examples/smpi/tracing/smpi_traced_simple.c b/examples/smpi/tracing/smpi_traced_simple.c
new file mode 100644 (file)
index 0000000..1de1115
--- /dev/null
+++ b/examples/smpi/tracing/smpi_traced_simple.c
@@ -0,0 +1,15 @@
+/* Copyright (c) 2012. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+#include <mpi.h>
+#include <stdio.h>
+
+int main(int argc, char *argv[])
+{
+  MPI_Init(&argc, &argv);
+  MPI_Barrier (MPI_COMM_WORLD);
+  MPI_Finalize();
+  return 0;
+}