[mc] Simplify lookup of maps

[simgrid.git] / buildtools / Cmake / DefinePackages.cmake

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index bf6b18c..c31683e 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -6,7 +6,7 @@ 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
@@ -15,8 +15,6 @@ set(EXTRA_DIST
   src/include/surf/maxmin.h
   src/include/surf/random_mgr.h
   src/include/surf/surf.h
-  src/include/surf/surf_resource.h
-  src/include/surf/surf_resource_lmm.h
   src/include/surf/surfxml_parse_values.h
   src/include/surf/trace_mgr.h
   src/include/xbt/win32_ucontext.h
@@ -88,11 +86,11 @@ set(EXTRA_DIST
   src/surf/surf_routing_vivaldi.hpp
   src/surf/surfxml_parse.c
   src/surf/trace_mgr_private.h
-  src/surf/vm_workstation_hl13.hpp
-  src/surf/vm_workstation_interface.hpp
-  src/surf/workstation_clm03.hpp
-  src/surf/workstation_interface.hpp
-  src/surf/workstation_ptask_L07.hpp
+  src/surf/vm_hl13.hpp
+  src/surf/vm_interface.hpp
+  src/surf/host_clm03.hpp
+  src/surf/host_interface.hpp
+  src/surf/host_ptask_L07.hpp
   src/win32/config.h
   src/xbt/automaton/automaton_lexer.yy.c
   src/xbt/automaton/parserPromela.lex
@@ -129,8 +127,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
@@ -353,11 +351,11 @@ set(SURF_SRC
   src/surf/surfxml_parse.c
   src/surf/surfxml_parseplatf.c
   src/surf/trace_mgr.c
-  src/surf/vm_workstation_hl13.cpp
-  src/surf/vm_workstation_interface.cpp
-  src/surf/workstation_clm03.cpp
-  src/surf/workstation_interface.cpp
-  src/surf/workstation_ptask_L07.cpp
+  src/surf/vm_hl13.cpp
+  src/surf/vm_interface.cpp
+  src/surf/host_clm03.cpp
+  src/surf/host_interface.cpp
+  src/surf/host_ptask_L07.cpp
   src/xbt/xbt_sg_stubs.c
   )
 
@@ -379,11 +377,23 @@ set(SIMIX_SRC
   src/simix/smx_synchro.c
   src/simix/smx_vm.c
   src/simix/popping.c
+
   ${SIMIX_GENERATED_SRC}
   )
 
+if (HAVE_BOOST_CONTEXT)
+  set(SIMIX_SRC
+      ${SIMIX_SRC}
+      src/simix/smx_context_boost.cpp)
+else()
+  set(EXTRA_DIST
+      ${EXTRA_DIST}
+      src/simix/smx_context_boost.cpp)
+endif()
+
 set(SIMGRID_SRC
   src/simgrid/sg_config.c
+  src/simgrid/util.hpp
   )
 
 set(MSG_SRC
@@ -498,8 +508,8 @@ set(JMSG_C_SRC
 )
 
 set(JSURF_C_SRC
-  src/bindings/java/surfJAVA_wrap.cxx
-  src/bindings/java/surfJAVA_wrap.h
+  src/bindings/java/org/simgrid/surf/surfJAVA_wrap.cxx
+  src/bindings/java/org/simgrid/surf/surfJAVA_wrap.h
   ${JSURF_JAVA_C_SRC}
 )
 
@@ -540,13 +550,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
@@ -574,10 +579,10 @@ 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
@@ -585,83 +590,95 @@ set(JEDULE_SRC
   )
 
 set(MC_SRC_BASE
-  src/mc/mc_base.c
+  src/mc/mc_base.cpp
   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
+  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_address_space.h
-  src/mc/mc_address_space.c
+  src/mc/AddressSpace.hpp
+  src/mc/AddressSpace.cpp
   src/mc/mc_forward.h
   src/mc/mc_process.h
-  src/mc/mc_process.c
+  src/mc/mc_process.cpp
   src/mc/mc_unw.h
-  src/mc/mc_unw.c
-  src/mc/mc_unw_vmread.c
+  src/mc/mc_unw.cpp
+  src/mc/mc_unw_vmread.cpp
   src/mc/mc_mmalloc.h
-  src/mc/mc_model_checker.h
-  src/mc/mc_model_checker.c
+  src/mc/ModelChecker.hpp
+  src/mc/ModelChecker.cpp
   src/mc/mc_object_info.h
-  src/mc/mc_object_info.c
-  src/mc/mc_checkpoint.c
+  src/mc/mc_object_info.cpp
+  src/mc/mc_checkpoint.cpp
   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_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_pattern.h
-  src/mc/mc_comm_determinism.c
+  src/mc/mc_comm_pattern.cpp
+  src/mc/mc_comm_determinism.cpp
   src/mc/mc_compare.cpp
-  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_hash.c
-  src/mc/mc_ignore.c
-  src/mc/mc_interface.h
+  src/mc/mc_diff.cpp
+  src/mc/mc_dwarf.cpp
+  src/mc/mc_dwarf_attrnames.cpp
+  src/mc/mc_dwarf_expression.cpp
+  src/mc/mc_dwarf_tagnames.cpp
+  src/mc/mc_hash.hpp
+  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.c
-  src/mc/mc_record.c
-  src/mc/mc_member.c
-  src/mc/mc_memory.c
-  src/mc/mc_pair.c
+  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.h
-  src/mc/mc_request.c
+  src/mc/mc_request.cpp
   src/mc/mc_safety.h
-  src/mc/mc_safety.c
-  src/mc/mc_set.cpp
+  src/mc/mc_safety.cpp
   src/mc/mc_state.h
-  src/mc/mc_state.c
-  src/mc/mc_visited.c
+  src/mc/mc_state.cpp
+  src/mc/mc_visited.cpp
   src/mc/mc_memory_map.h
-  src/mc/memory_map.c
-  src/mc/mc_client.c
-  src/mc/mc_client_api.c
+  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.c
+  src/mc/mc_protocol.cpp
   src/mc/mc_server.cpp
   src/mc/mc_server.h
   src/mc/mc_smx.h
-  src/mc/mc_smx.c
+  src/mc/mc_smx.cpp
+  src/mc/mc_xbt.hpp
+  src/mc/mc_xbt.cpp
+  src/mc/mc_exit.h
   )
 
 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
@@ -680,6 +697,7 @@ set(headers_to_install
   include/xbt/RngStream.h
   include/xbt/asserts.h
   include/xbt/automaton.h
+  include/xbt/base.h
   include/xbt/config.h
   include/xbt/cunit.h
   include/xbt/dict.h
@@ -791,17 +809,10 @@ 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}
@@ -875,7 +886,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
@@ -1017,9 +1028,9 @@ 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/e2/CMakeLists.txt
-  examples/msg/energy/e3/CMakeLists.txt
+  examples/msg/energy/consumption/CMakeLists.txt
+  examples/msg/energy/onoff/CMakeLists.txt
+  examples/msg/energy/pstate/CMakeLists.txt
   examples/msg/exception/CMakeLists.txt
   examples/msg/gpu/CMakeLists.txt
   examples/msg/gtnets/CMakeLists.txt
@@ -1211,7 +1222,6 @@ set(CMAKE_SOURCE_FILES
   buildtools/Cmake/test_prog/prog_gnu_dynlinker.c
   buildtools/Cmake/test_prog/prog_gtnets.cpp
   buildtools/Cmake/test_prog/prog_mutex_timedlock.c
-  buildtools/Cmake/test_prog/prog_printf_null.c
   buildtools/Cmake/test_prog/prog_sem_init.c
   buildtools/Cmake/test_prog/prog_sem_open.c
   buildtools/Cmake/test_prog/prog_sem_timedwait.c
@@ -1220,6 +1230,7 @@ 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
+  buildtools/Cross/Mingw.cmake
   tools/stack-cleaner/as
   tools/stack-cleaner/cc
   tools/stack-cleaner/c++