X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cd69f8c66886ae218c6a9b38125b27fe157e6bb2..b5b78d30ccd8b5e3658ae83c51dd7501be7c9f48:/buildtools/Cmake/DefinePackages.cmake

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 8da0636620..75b1d8aaad 100644
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -7,6 +7,7 @@ set(EXTRA_DIST
   src/include/mc/mc.h
   src/mc/mc_mmu.h
   src/mc/mc_page_store.h
+  src/mc/mc_record.h
   src/include/simgrid/platf_interface.h
   src/include/simgrid/sg_config.h
   src/include/smpi/smpi_interface.h
@@ -23,23 +24,23 @@ set(EXTRA_DIST
   src/msg/msg_mailbox.h
   src/msg/msg_private.h
   src/portable.h
+  src/probes.tp
   src/simdag/dax.dtd
   src/simdag/dax_dtd.c
   src/simdag/dax_dtd.h
   src/simdag/private.h
   src/simix/simcalls.in
   src/simix/simcalls.py
-  src/simix/simcalls_generated_args_getter_setter.h
-  src/simix/simcalls_generated_body.c
-  src/simix/smx_popping_generated.c
-  src/simix/smx_popping_generated.h
-  src/simix/simcalls_generated_res_getter_setter.h
+  src/simix/popping_private.h
+  src/simix/popping_bodies.c
+  src/simix/popping_generated.c
+  src/simix/popping_enum.h
+  src/simix/popping_accessors.h
   src/simix/smx_host_private.h
   src/simix/smx_io_private.h
   src/simix/smx_network_private.h
   src/simix/smx_private.h
   src/simix/smx_process_private.h
-  src/simix/smx_smurf_private.h
   src/simix/smx_synchro_private.h
   src/smpi/README
   src/smpi/colls/coll_tuned_topo.h
@@ -122,13 +123,13 @@ set(EXTRA_DIST
   src/xbt/mmalloc/mmprivate.h
   src/xbt/mmalloc/mmtrace.awk
   src/xbt/mmalloc/mrealloc.c
+  src/xbt/probes.h
   src/xbt/setset_private.h
   src/xbt/win32_ucontext.c
   tools/tesh/run_context.h
   tools/tesh/tesh.h
   tools/tesh/generate_tesh
-  examples/smpi/mc/non_deterministic.tesh
-  examples/smpi/mc/send_deterministic.tesh
+  examples/smpi/mc/only_send_deterministic.tesh
   )
 
 set(SMPI_SRC
@@ -360,9 +361,10 @@ set(SURF_SRC
   )
 
 set(SIMIX_GENERATED_SRC
-  src/simix/smx_popping_generated.c
+  src/simix/popping_generated.c
   )
 set(SIMIX_SRC
+  src/simix/libsmx.c
   src/simix/smx_context.c
   src/simix/smx_context_base.c
   src/simix/smx_context_raw.c
@@ -373,10 +375,9 @@ set(SIMIX_SRC
   src/simix/smx_io.c
   src/simix/smx_network.c
   src/simix/smx_process.c
-  src/simix/smx_smurf.c
   src/simix/smx_synchro.c
-  src/simix/smx_user.c
   src/simix/smx_vm.c
+  src/simix/popping.c
   ${SIMIX_GENERATED_SRC}
   )
 
@@ -538,13 +539,8 @@ set(JTRACE_JAVA_SRC
   src/bindings/java/org/simgrid/trace/Trace.java
 )
 
-if(HAVE_TRACING)
-  list(APPEND JMSG_C_SRC ${JTRACE_C_SRC})
-  list(APPEND JMSG_JAVA_SRC ${JTRACE_JAVA_SRC})
-else()
-  list(APPEND EXTRA_DIST ${JTRACE_C_SRC})
-  list(APPEND EXTRA_DIST ${JTRACE_JAVA_SRC})
-endif()
+list(APPEND JMSG_C_SRC ${JTRACE_C_SRC})
+list(APPEND JMSG_JAVA_SRC ${JTRACE_JAVA_SRC})
 
 set(LUA_SRC
   src/bindings/lua/lua_comm.c
@@ -572,52 +568,76 @@ set(TRACING_SRC
   )
 
 set(JEDULE_SRC
-  include/instr/jedule/jedule_events.h
-  include/instr/jedule/jedule_output.h
-  include/instr/jedule/jedule_platform.h
-  include/instr/jedule/jedule_sd_binding.h
+  include/simgrid/jedule/jedule_events.h
+  include/simgrid/jedule/jedule_output.h
+  include/simgrid/jedule/jedule_platform.h
+  include/simgrid/jedule/jedule_sd_binding.h
   src/instr/jedule/jedule_events.c
   src/instr/jedule/jedule_output.c
   src/instr/jedule/jedule_platform.c
   src/instr/jedule/jedule_sd_binding.c
   )
 
+set(MC_SRC_BASE
+  src/mc/mc_base.c
+  src/mc/mc_base.h
+  src/mc/mc_record.h
+  src/mc/mc_record.c
+  src/mc/mc_config.c
+  src/mc/mc_global.c
+  )
+
 set(MC_SRC
+  src/mc/mc_forward.h
+  src/mc/mc_mmalloc.h
+  src/mc/mc_model_checker.h
+  src/mc/mc_object_info.h
   src/mc/mc_checkpoint.c
+  src/mc/mc_snapshot.h
   src/mc/mc_snapshot.c
+  src/mc/mc_page_store.h
   src/mc/mc_page_store.cpp
   src/mc/mc_page_snapshot.cpp
+  src/mc/mc_comm_pattern.h
   src/mc/mc_comm_determinism.c
   src/mc/mc_compare.cpp
-  src/mc/mc_config.c
   src/mc/mc_diff.c
   src/mc/mc_dwarf.c
   src/mc/mc_dwarf_attrnames.h
   src/mc/mc_dwarf_expression.c
   src/mc/mc_dwarf_tagnames.h
-  src/mc/mc_global.c
   src/mc/mc_hash.c
   src/mc/mc_ignore.c
   src/mc/mc_interface.h
+  src/mc/mc_liveness.h
+  src/mc/mc_location.h
   src/mc/mc_liveness.c
+  src/mc/mc_record.c
   src/mc/mc_member.c
   src/mc/mc_memory.c
   src/mc/mc_pair.c
   src/mc/mc_private.h
+  src/mc/mc_request.h
   src/mc/mc_request.c
+  src/mc/mc_safety.h
   src/mc/mc_safety.c
   src/mc/mc_set.cpp
+  src/mc/mc_state.h
   src/mc/mc_state.c
   src/mc/mc_visited.c
+  src/mc/mc_memory_map.h
   src/mc/memory_map.c
   )
 
 set(headers_to_install
-  include/instr/instr.h
-  include/msg/datatypes.h
   include/msg/msg.h
-  include/simdag/datatypes.h
+  include/msg/datatypes.h
   include/simdag/simdag.h
+  include/simdag/datatypes.h
+  
+  include/simgrid/instr.h
+  include/simgrid/msg.h
+  include/simgrid/simdag.h
   include/simgrid.h
   include/simgrid/datatypes.h
   include/simgrid/modelchecker.h
@@ -747,17 +767,15 @@ if(enable_smpi)
     )
 endif()
 
-if(${HAVE_TRACING})
-  set(simgrid_sources
+set(simgrid_sources
     ${simgrid_sources}
     ${TRACING_SRC}
     )
-else()
-  set(EXTRA_DIST
-    ${EXTRA_DIST}
-    ${TRACING_SRC}
-    )
-endif()
+
+set(simgrid_sources
+  ${simgrid_sources}
+  ${MC_SRC_BASE}
+  )
 
 if(HAVE_MC)
   set(simgrid_sources
@@ -968,7 +986,7 @@ set(EXAMPLES_CMAKEFILES_TXT
   examples/msg/chainsend/CMakeLists.txt
   examples/msg/chord/CMakeLists.txt
   examples/msg/cloud/CMakeLists.txt
-  examples/msg/energy/e1/CMakeLists.txt
+  examples/msg/energy/pstate/CMakeLists.txt
   examples/msg/energy/e2/CMakeLists.txt
   examples/msg/energy/e3/CMakeLists.txt
   examples/msg/exception/CMakeLists.txt
@@ -1021,6 +1039,7 @@ set(TESHSUITE_CMAKEFILES_TXT
   teshsuite/mc/CMakeLists.txt
   teshsuite/mc/dwarf/CMakeLists.txt
   teshsuite/mc/dwarf_expression/CMakeLists.txt
+  teshsuite/mc/replay/CMakeLists.txt
   teshsuite/msg/CMakeLists.txt
   teshsuite/msg/get_sender/CMakeLists.txt
   teshsuite/msg/host_on_off/CMakeLists.txt
@@ -1067,6 +1086,7 @@ set(TESHSUITE_CMAKEFILES_TXT
   teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt
 #  teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt
   teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt
+  teshsuite/smpi/mpich3-test/f77/info/CMakeLists.txt
   teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt
   teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt
   teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt
@@ -1077,11 +1097,13 @@ set(TESHSUITE_CMAKEFILES_TXT
   teshsuite/smpi/mpich3-test/f77/rma/CMakeLists.txt
   teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt
   teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt
+  teshsuite/smpi/mpich3-test/f90/info/CMakeLists.txt
   teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt
   teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt
   teshsuite/smpi/mpich3-test/f90/util/CMakeLists.txt
   teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt
   teshsuite/smpi/mpich3-test/group/CMakeLists.txt
+  teshsuite/smpi/mpich3-test/info/CMakeLists.txt
   teshsuite/smpi/mpich3-test/init/CMakeLists.txt
   teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt
   teshsuite/smpi/mpich3-test/topo/CMakeLists.txt
@@ -1167,6 +1189,13 @@ set(CMAKE_SOURCE_FILES
   buildtools/Cmake/test_prog/prog_stacksetup.c
   buildtools/Cmake/test_prog/prog_thread_storage.c
   buildtools/Cmake/test_prog/prog_vsnprintf.c
+  tools/stack-cleaner/as
+  tools/stack-cleaner/cc
+  tools/stack-cleaner/c++
+  tools/stack-cleaner/fortran
+  tools/stack-cleaner/clean-stack-filter
+  tools/stack-cleaner/compiler-wrapper
+  tools/stack-cleaner/README
   )
 
 set(PLATFORMS_EXAMPLES
@@ -1234,6 +1263,23 @@ set(generated_src_files
   src/xbt/automaton/parserPromela.tab.hacc
   )
 
+if(enable_ust)
+  set(simgrid_sources ${CMAKE_CURRENT_BINARY_DIR}/src/simgrid_ust.c ${simgrid_sources})
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/src/simgrid_ust.c
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/src/simgrid_ust.h
+    COMMAND lttng-gen-tp -o simgrid_ust.c -o simgrid_ust.h ${CMAKE_CURRENT_SOURCE_DIR}/src/probes.tp
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/src/
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/probes.tp
+  )
+  ADD_CUSTOM_TARGET(simgrid_ust
+    DEPENDS
+      ${CMAKE_CURRENT_BINARY_DIR}/src/simgrid_ust.c
+      ${CMAKE_CURRENT_BINARY_DIR}/src/simgrid_ust.h
+    )
+  set(generated_src_files ${CMAKE_CURRENT_BINARY_DIR}/src/simgrid_ust.c ${generated_src_files})
+endif()
+
 foreach(file ${generated_src_files})
   set_source_files_properties(${file} PROPERTIES GENERATED true)
 endforeach(file ${generated_src_files})