X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3080c6b0d097d6b3b7d5b3dda0592154ce438f64..ad1dc29bdc5f65345b3718cd696b67d167551b75:/buildtools/Cmake/DefinePackages.cmake diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 7f3a592b38..79652e1ad5 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -5,6 +5,9 @@ set(EXTRA_DIST src/include/instr/instr_interface.h src/include/mc/datatypes.h 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 @@ -21,29 +24,29 @@ 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/simcalls_generated_case.c - src/simix/simcalls_generated_enum.h - src/simix/simcalls_generated_res_getter_setter.h - src/simix/simcalls_generated_string.c + 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 src/smpi/colls/colls.h src/smpi/colls/colls_private.h + src/smpi/colls/smpi_mvapich2_selector_stampede.h src/smpi/private.h src/smpi/smpi_mpi_dt_private.h src/surf/cpu_cas01.hpp @@ -120,10 +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/only_send_deterministic.tesh ) set(SMPI_SRC @@ -137,6 +143,7 @@ set(SMPI_SRC src/smpi/colls/allgather-loosely-lr.c src/smpi/colls/allgather-ompi-neighborexchange.c src/smpi/colls/allgather-pair.c + src/smpi/colls/allgather-mvapich-smp.c src/smpi/colls/allgather-rdb.c src/smpi/colls/allgather-rhv.c src/smpi/colls/allgather-ring.c @@ -162,6 +169,8 @@ set(SMPI_SRC src/smpi/colls/allreduce-smp-rsag-lr.c src/smpi/colls/allreduce-smp-rsag-rab.c src/smpi/colls/allreduce-smp-rsag.c + src/smpi/colls/allreduce-mvapich-rs.c + src/smpi/colls/allreduce-mvapich-two-level.c src/smpi/colls/alltoall-2dmesh.c src/smpi/colls/alltoall-3dmesh.c # src/smpi/colls/alltoall-bruck.c @@ -174,6 +183,7 @@ set(SMPI_SRC src/smpi/colls/alltoall-ring-mpi-barrier.c src/smpi/colls/alltoall-ring-one-barrier.c src/smpi/colls/alltoall-ring.c + src/smpi/colls/alltoall-mvapich-scatter-dest.c src/smpi/colls/alltoallv-bruck.c src/smpi/colls/alltoallv-ompi-basic-linear.c src/smpi/colls/alltoallv-pair-light-barrier.c @@ -185,6 +195,7 @@ set(SMPI_SRC src/smpi/colls/alltoallv-ring-one-barrier.c src/smpi/colls/alltoallv-ring.c src/smpi/colls/barrier-ompi.c + src/smpi/colls/barrier-mvapich2-pair.c src/smpi/colls/bcast-NTSB.c src/smpi/colls/bcast-NTSL-Isend.c src/smpi/colls/bcast-NTSL.c @@ -199,11 +210,13 @@ set(SMPI_SRC src/smpi/colls/bcast-flattree.c src/smpi/colls/bcast-ompi-pipeline.c src/smpi/colls/bcast-ompi-split-bintree.c + src/smpi/colls/bcast-mvapich-smp.c src/smpi/colls/bcast-scatter-LR-allgather.c src/smpi/colls/bcast-scatter-rdb-allgather.c src/smpi/colls/coll_tuned_topo.c src/smpi/colls/colls_global.c src/smpi/colls/gather-ompi.c + src/smpi/colls/gather-mvapich.c src/smpi/colls/reduce-NTSL.c src/smpi/colls/reduce-arrival-pattern-aware.c src/smpi/colls/reduce-binomial.c @@ -212,10 +225,16 @@ set(SMPI_SRC src/smpi/colls/reduce-scatter-gather.c src/smpi/colls/reduce_scatter-mpich.c src/smpi/colls/reduce_scatter-ompi.c + src/smpi/colls/reduce-mvapich-knomial.c + src/smpi/colls/reduce-mvapich-two-level.c + src/smpi/colls/reduce-rab.c src/smpi/colls/scatter-ompi.c + src/smpi/colls/scatter-mvapich-two-level.c src/smpi/colls/smpi_automatic_selector.c src/smpi/colls/smpi_mpich_selector.c + src/smpi/colls/smpi_intel_mpi_selector.c src/smpi/colls/smpi_openmpi_selector.c + src/smpi/colls/smpi_mvapich2_selector.c src/smpi/instr_smpi.c src/smpi/smpi_base.c src/smpi/smpi_bench.c @@ -232,21 +251,9 @@ set(SMPI_SRC src/smpi/smpi_replay.c src/smpi/smpi_rma.c src/smpi/smpi_topo.c + src/smpi/smpi_f77.c ) -if(SMPI_FORTRAN) - set(SMPI_SRC - ${SMPI_SRC} - src/smpi/smpi_f77.c - ) -else() - set(EXTRA_DIST - ${EXTRA_DIST} - src/smpi/smpi_f77.c - ) -endif() - - set(XBT_SRC src/xbt/RngStream.c src/xbt/automaton/automaton.c @@ -353,7 +360,11 @@ set(SURF_SRC src/xbt/xbt_sg_stubs.c ) +set(SIMIX_GENERATED_SRC + 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 @@ -364,10 +375,10 @@ 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} ) set(SIMGRID_SRC @@ -392,23 +403,6 @@ set(MSG_SRC src/msg/msg_vm.c ) -#* ****************************************************************************************** *# -#* TUTORIAL: New API *# - -set(MSG_SRC - ${MSG_SRC} - src/msg/msg_new_api.c - ) -set(EXTRA_DIST - ${EXTRA_DIST} - src/simix/smx_new_api_private.h - ) -set(SIMIX_SRC - ${SIMIX_SRC} - src/simix/smx_new_api.c -) -#* ****************************************************************************************** *# - set(SIMDAG_SRC src/simdag/instr_sd_task.c src/simdag/sd_daxloader.c @@ -545,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 @@ -579,21 +568,47 @@ 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_address_space.h + src/mc/mc_address_space.c + src/mc/mc_forward.h + src/mc/mc_process.h + src/mc/mc_process.c + src/mc/mc_unw.h + src/mc/mc_unw.c + src/mc/mc_unw_vmread.c + src/mc/mc_mmalloc.h + src/mc/mc_model_checker.h + src/mc/mc_model_checker.c + src/mc/mc_object_info.h + src/mc/mc_object_info.c 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_pattern.c src/mc/mc_comm_determinism.c src/mc/mc_compare.cpp src/mc/mc_diff.c @@ -601,28 +616,51 @@ set(MC_SRC 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_ignore.h + 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 + src/mc/mc_client.c + src/mc/mc_client_api.c + src/mc/mc_client.h + src/mc/mc_protocol.h + src/mc/mc_protocol.c + src/mc/mc_server.cpp + src/mc/mc_server.h + src/mc/mc_smx.h + src/mc/mc_smx.c ) +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 @@ -752,17 +790,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 @@ -973,9 +1009,10 @@ 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 examples/msg/gpu/CMakeLists.txt examples/msg/gtnets/CMakeLists.txt examples/msg/icomms/CMakeLists.txt @@ -1010,6 +1047,7 @@ set(EXAMPLES_CMAKEFILES_TXT examples/simdag/scheduling/CMakeLists.txt examples/smpi/CMakeLists.txt examples/smpi/smpi_msg_masterslave/CMakeLists.txt + examples/smpi/replay_multiple/CMakeLists.txt examples/smpi/MM/CMakeLists.txt examples/smpi/energy/CMakeLists.txt examples/smpi/energy/f77/CMakeLists.txt @@ -1019,11 +1057,16 @@ set(EXAMPLES_CMAKEFILES_TXT set(TESHSUITE_CMAKEFILES_TXT teshsuite/bug-17132/CMakeLists.txt + teshsuite/java/CMakeLists.txt + teshsuite/java/sleep_host_off/CMakeLists.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 + teshsuite/msg/host_on_off_processes/CMakeLists.txt teshsuite/msg/pid/CMakeLists.txt teshsuite/msg/process/CMakeLists.txt teshsuite/msg/process_join/CMakeLists.txt @@ -1058,6 +1101,7 @@ set(TESHSUITE_CMAKEFILES_TXT teshsuite/smpi/shared/CMakeLists.txt teshsuite/smpi/struct/CMakeLists.txt teshsuite/smpi/vector/CMakeLists.txt + teshsuite/smpi/isp/umpire/CMakeLists.txt teshsuite/smpi/mpich3-test/CMakeLists.txt teshsuite/smpi/mpich3-test/attr/CMakeLists.txt teshsuite/smpi/mpich3-test/coll/CMakeLists.txt @@ -1065,22 +1109,29 @@ 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 teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt teshsuite/smpi/mpich3-test/f77/util/CMakeLists.txt + teshsuite/smpi/mpich3-test/f77/topo/CMakeLists.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 teshsuite/smpi/mpich3-test/rma/CMakeLists.txt + teshsuite/smpi/mpich3-test/perf/CMakeLists.txt teshsuite/surf/CMakeLists.txt teshsuite/surf/lmm_usage/CMakeLists.txt teshsuite/surf/maxmin_bench/CMakeLists.txt @@ -1090,6 +1141,7 @@ set(TESHSUITE_CMAKEFILES_TXT teshsuite/xbt/heap_bench/CMakeLists.txt teshsuite/xbt/log_large/CMakeLists.txt teshsuite/xbt/log_usage/CMakeLists.txt + teshsuite/xbt/mallocator/CMakeLists.txt teshsuite/xbt/mmalloc/CMakeLists.txt teshsuite/xbt/parallel_log/CMakeLists.txt teshsuite/xbt/parmap_bench/CMakeLists.txt @@ -1160,6 +1212,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 @@ -1176,11 +1235,16 @@ set(PLATFORMS_EXAMPLES examples/platforms/conf/lcg_sept2004_grid.xml 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 examples/platforms/generation_scripts/create_hierarchical_clusters.pl @@ -1190,10 +1254,16 @@ set(PLATFORMS_EXAMPLES examples/platforms/griffon.xml examples/platforms/meta_cluster.xml 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/small_platform.xml + examples/platforms/small_platform_fatpipe.xml + examples/platforms/small_platform_one_link_routes.xml + examples/platforms/small_platform_with_failures.xml + examples/platforms/small_platform_with_routers.xml examples/platforms/syscoord/generate_peer_platform.pl examples/platforms/syscoord/median_harvard.syscoord examples/platforms/syscoord/median_harvard.xml @@ -1202,6 +1272,10 @@ set(PLATFORMS_EXAMPLES examples/platforms/syscoord/median_p2psim.syscoord examples/platforms/syscoord/median_p2psim.xml examples/platforms/torus_cluster.xml + examples/platforms/two_hosts_platform.xml + examples/platforms/two_hosts_platform_shared.xml + examples/platforms/two_hosts_platform_with_availability.xml + examples/platforms/two_hosts_platform_with_availability_included.xml examples/platforms/two_peers.xml examples/platforms/vivaldi.xml ) @@ -1212,6 +1286,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})