X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1d8f0c4dd4000a44d53f4ba97bd2a657deb18213..76ae11e09dec419fb20f7c1bb4778a612a2d5bce:/buildtools/Cmake/DefinePackages.cmake diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index ad84be8bac..dcb025e62e 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 @@ -14,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 @@ -23,6 +22,7 @@ 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 @@ -86,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 @@ -121,13 +121,12 @@ 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/only_send_deterministic.tesh examples/smpi/mc/non_deterministic.tesh - examples/smpi/mc/send_deterministic.tesh ) set(SMPI_SRC @@ -350,11 +349,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 ) @@ -376,11 +375,24 @@ 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/host.cpp + src/simgrid/util.hpp ) set(MSG_SRC @@ -451,7 +463,7 @@ set(JSURF_JAVA_GENERATED_SRC src/bindings/java/org/simgrid/surf/LmmVariable.java src/bindings/java/org/simgrid/surf/Model.java src/bindings/java/org/simgrid/surf/NetworkAction.java - src/bindings/java/org/simgrid/surf/NetworkLink.java + src/bindings/java/org/simgrid/surf/Link.java src/bindings/java/org/simgrid/surf/Plugin.java src/bindings/java/org/simgrid/surf/Resource.java src/bindings/java/org/simgrid/surf/ResourceState.java @@ -495,8 +507,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} ) @@ -537,13 +549,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 @@ -571,52 +578,107 @@ 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_forward.hpp + 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_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.c - src/mc/mc_member.c - src/mc/mc_memory.c - src/mc/mc_pair.c + 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.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 + 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 @@ -624,6 +686,8 @@ set(headers_to_install include/simgrid/platf_generator.h include/simgrid/plugins.h include/simgrid/simix.h + include/simgrid/host.h + include/simgrid/link.h include/smpi/mpi.h include/smpi/smpi.h include/smpi/smpi_cocci.h @@ -635,6 +699,8 @@ set(headers_to_install include/xbt/RngStream.h include/xbt/asserts.h include/xbt/automaton.h + include/xbt/automaton.hpp + include/xbt/base.h include/xbt/config.h include/xbt/cunit.h include/xbt/dict.h @@ -746,17 +812,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 @@ -825,7 +889,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 @@ -967,9 +1031,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 @@ -1020,6 +1084,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 @@ -1066,6 +1131,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 @@ -1076,11 +1142,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 @@ -1148,7 +1216,6 @@ set(CMAKE_SOURCE_FILES buildtools/Cmake/Scripts/my_valgrind.pl buildtools/Cmake/Scripts/postinstall.sh buildtools/Cmake/Scripts/preinstall.sh - buildtools/Cmake/Scripts/tesh.pl buildtools/Cmake/Scripts/update_tesh.pl buildtools/Cmake/UnitTesting.cmake buildtools/Cmake/src/internal_config.h.in @@ -1157,7 +1224,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 @@ -1166,6 +1232,14 @@ 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++ + tools/stack-cleaner/fortran + tools/stack-cleaner/clean-stack-filter + tools/stack-cleaner/compiler-wrapper + tools/stack-cleaner/README ) set(PLATFORMS_EXAMPLES @@ -1183,14 +1257,10 @@ set(PLATFORMS_EXAMPLES examples/platforms/conf/transform_optorsim_platform.pl examples/platforms/config.xml examples/platforms/config_tracing.xml - examples/platforms/content/small_content.txt - examples/platforms/content/storage_content.txt - examples/platforms/content/win_storage_content.txt examples/platforms/trace/trace_A_failure.txt examples/platforms/trace/trace_A.txt examples/platforms/trace/trace_B.txt examples/platforms/data_center.xml - examples/platforms/deployment_remote_io.xml examples/platforms/energy_platform.xml examples/platforms/fat_tree_cluster.xml examples/platforms/g5k.xml @@ -1203,9 +1273,13 @@ set(PLATFORMS_EXAMPLES examples/platforms/multicore_machine.xml examples/platforms/platform.xml examples/platforms/prop.xml - examples/platforms/remote_io.xml examples/platforms/routing_cluster.xml - examples/platforms/storage.xml + examples/platforms/storage/content/small_content.txt + examples/platforms/storage/content/storage_content.txt + examples/platforms/storage/content/win_storage_content.txt + examples/platforms/storage/remote_io.deployment.xml + examples/platforms/storage/remote_io.xml + examples/platforms/storage/storage.xml examples/platforms/small_platform.xml examples/platforms/small_platform_fatpipe.xml examples/platforms/small_platform_one_link_routes.xml @@ -1233,6 +1307,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})