X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/539916de848562683cf2e5425d5160c2a43f135a..54b039b2cb830d851ebe173aaad0a2bbf3129174:/buildtools/Cmake/DefinePackages.cmake

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index fe6385844a..ea972cb9a2 100644
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -6,7 +6,8 @@ set(EXTRA_DIST
   src/include/mc/datatypes.h
   src/include/mc/mc.h
   src/mc/mc_mmu.h
-  src/mc/mc_page_store.h
+  src/mc/PageStore.hpp
+  src/mc/mc_record.h
   src/include/simgrid/platf_interface.h
   src/include/simgrid/sg_config.h
   src/include/smpi/smpi_interface.h
@@ -128,8 +129,8 @@ set(EXTRA_DIST
   tools/tesh/run_context.h
   tools/tesh/tesh.h
   tools/tesh/generate_tesh
+  examples/smpi/mc/only_send_deterministic.tesh
   examples/smpi/mc/non_deterministic.tesh
-  examples/smpi/mc/send_deterministic.tesh
   )
 
 set(SMPI_SRC
@@ -539,13 +540,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
@@ -573,52 +569,104 @@ 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.cpp
+  src/mc/mc_base.h
+  src/mc/mc_record.h
+  src/mc/mc_replay.h
+  src/mc/mc_record.cpp
+  src/mc/mc_config.cpp
+  src/mc/mc_global.cpp
+  )
+
 set(MC_SRC
-  src/mc/mc_checkpoint.c
-  src/mc/mc_snapshot.c
-  src/mc/mc_page_store.cpp
+  src/mc/AddressSpace.hpp
+  src/mc/AddressSpace.cpp
+  src/mc/mc_forward.h
+  src/mc/mc_process.h
+  src/mc/mc_process.cpp
+  src/mc/mc_unw.h
+  src/mc/mc_unw.cpp
+  src/mc/mc_unw_vmread.cpp
+  src/mc/mc_mmalloc.h
+  src/mc/ModelChecker.hpp
+  src/mc/ModelChecker.cpp
+  src/mc/mc_object_info.h
+  src/mc/mc_object_info.cpp
+  src/mc/mc_checkpoint.cpp
+  src/mc/mc_snapshot.h
+  src/mc/mc_snapshot.cpp
+  src/mc/RegionSnapshot.cpp
+  src/mc/RegionSnapshot.hpp
+  src/mc/PageStore.hpp
+  src/mc/PageStore.cpp
   src/mc/mc_page_snapshot.cpp
-  src/mc/mc_comm_determinism.c
+  src/mc/mc_comm_pattern.h
+  src/mc/mc_comm_pattern.cpp
+  src/mc/mc_comm_determinism.cpp
   src/mc/mc_compare.cpp
-  src/mc/mc_config.c
-  src/mc/mc_diff.c
-  src/mc/mc_dwarf.c
+  src/mc/mc_diff.cpp
+  src/mc/mc_dwarf.cpp
   src/mc/mc_dwarf_attrnames.h
-  src/mc/mc_dwarf_expression.c
+  src/mc/mc_dwarf_expression.cpp
   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.c
-  src/mc/mc_member.c
-  src/mc/mc_memory.c
-  src/mc/mc_pair.c
+  src/mc/mc_hash.cpp
+  src/mc/mc_ignore.cpp
+  src/mc/mcer_ignore.cpp
+  src/mc/mcer_ignore.h
+  src/mc/mc_ignore.h
+  src/mc/mc_liveness.h
+  src/mc/mc_location.h
+  src/mc/mc_liveness.cpp
+  src/mc/mc_record.cpp
+  src/mc/mc_member.cpp
+  src/mc/mc_memory.cpp
+  src/mc/mc_pair.cpp
   src/mc/mc_private.h
-  src/mc/mc_request.c
-  src/mc/mc_safety.c
-  src/mc/mc_set.cpp
-  src/mc/mc_state.c
-  src/mc/mc_visited.c
-  src/mc/memory_map.c
+  src/mc/mc_request.h
+  src/mc/mc_request.cpp
+  src/mc/mc_safety.h
+  src/mc/mc_safety.cpp
+  src/mc/mc_state.h
+  src/mc/mc_state.cpp
+  src/mc/mc_visited.cpp
+  src/mc/mc_memory_map.h
+  src/mc/memory_map.cpp
+  src/mc/mc_client.cpp
+  src/mc/mc_client_api.cpp
+  src/mc/mc_client.h
+  src/mc/mc_protocol.h
+  src/mc/mc_protocol.cpp
+  src/mc/mc_server.cpp
+  src/mc/mc_server.h
+  src/mc/mc_smx.h
+  src/mc/mc_smx.cpp
+  src/mc/mc_xbt.hpp
+  src/mc/mc_xbt.cpp
   )
 
+set(MC_SIMGRID_MC_SRC
+  src/mc/simgrid_mc.cpp)
+
 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
@@ -748,17 +796,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
@@ -827,7 +873,7 @@ set(DOC_SOURCES
   doc/doxygen/header.html
   doc/doxygen/help.doc
   doc/doxygen/index.doc
-  doc/doxygen/inside_autotests.doc
+  doc/doxygen/inside_ci.doc
   doc/doxygen/inside_cmake.doc
   doc/doxygen/inside_doxygen.doc
   doc/doxygen/inside_extending.doc
@@ -969,7 +1015,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
@@ -1022,6 +1068,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