X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d6a677eea07bbb917ebf8aef3d281f37049c5254..82230d737404aa70c3c2b5824d97109f1f129d58:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index dd2b085502..cff4bca7cc 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -5,36 +5,36 @@ 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/PageStore.hpp - src/mc/mc_record.h src/include/simgrid/sg_config.h - src/include/smpi/smpi_utils.hpp src/include/surf/datatypes.h - src/include/surf/maxmin.h - src/include/surf/surf.h - src/msg/msg_private.h + src/include/surf/maxmin.hpp + src/include/surf/surf.hpp + src/include/xbt/parmap.hpp + src/mc/mc_mmu.hpp + src/mc/mc_record.hpp + src/mc/PageStore.hpp + src/msg/msg_private.hpp src/simdag/dax.dtd src/simdag/dax_dtd.c src/simdag/dax_dtd.h src/simdag/simdag_private.hpp src/simix/simcalls.in src/simix/simcalls.py - src/simix/popping_private.h + src/simix/popping_private.hpp src/simix/popping_bodies.cpp src/simix/popping_generated.cpp 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_synchro_private.h - src/smpi/colls/coll_tuned_topo.h - src/smpi/colls/colls_private.h - src/smpi/colls/smpi_mvapich2_selector_stampede.h - src/smpi/private.h - src/smpi/private.hpp + src/simix/popping_accessors.hpp + src/simix/smx_host_private.hpp + src/simix/smx_io_private.hpp + src/simix/smx_network_private.hpp + src/simix/smx_private.hpp + src/simix/smx_synchro_private.hpp + src/smpi/colls/coll_tuned_topo.hpp + src/smpi/colls/colls_private.hpp + src/smpi/colls/smpi_mvapich2_selector_stampede.hpp + src/smpi/include/private.hpp + src/smpi/include/smpi_utils.hpp src/surf/cpu_cas01.hpp src/surf/cpu_interface.hpp src/surf/cpu_ti.hpp @@ -45,8 +45,8 @@ set(EXTRA_DIST src/surf/network_ns3.hpp src/surf/network_smpi.hpp src/surf/network_ib.hpp - src/surf/ns3/ns3_interface.h - src/surf/ns3/ns3_simulator.h + src/surf/ns3/ns3_interface.hpp + src/surf/ns3/ns3_simulator.hpp src/surf/trace_mgr_test.cpp src/surf/xml/simgrid.dtd src/surf/xml/simgrid_dtd.h @@ -57,7 +57,7 @@ set(EXTRA_DIST src/surf/StorageImpl.hpp src/surf/storage_n11.hpp src/surf/surf_interface.hpp - src/surf/surf_private.h + src/surf/surf_private.hpp src/surf/PropertyHolder.hpp src/surf/host_clm03.hpp src/surf/HostImpl.hpp @@ -71,7 +71,6 @@ set(EXTRA_DIST src/xbt/backtrace_linux.cpp src/xbt/dict_private.h src/xbt/graph_private.h - src/xbt/heap_private.h src/xbt/log_private.h src/xbt/mallocator_private.h @@ -96,6 +95,23 @@ set(EXTRA_DIST ) set(SMPI_SRC + src/smpi/smpi_main.c + src/smpi/bindings/smpi_mpi.cpp + src/smpi/bindings/smpi_pmpi.cpp + src/smpi/bindings/smpi_pmpi_coll.cpp + src/smpi/bindings/smpi_pmpi_comm.cpp + src/smpi/bindings/smpi_pmpi_group.cpp + src/smpi/bindings/smpi_pmpi_info.cpp + src/smpi/bindings/smpi_pmpi_op.cpp + src/smpi/bindings/smpi_pmpi_request.cpp + src/smpi/bindings/smpi_pmpi_topo.cpp + src/smpi/bindings/smpi_pmpi_type.cpp + src/smpi/bindings/smpi_pmpi_win.cpp + src/smpi/bindings/smpi_f77.cpp + src/smpi/bindings/smpi_f77_coll.cpp + src/smpi/bindings/smpi_f77_comm.cpp + src/smpi/bindings/smpi_f77_request.cpp + src/smpi/bindings/smpi_f77_type.cpp src/smpi/colls/allgather/allgather-2dmesh.cpp src/smpi/colls/allgather/allgather-3dmesh.cpp src/smpi/colls/allgather/allgather-GB.cpp @@ -200,51 +216,46 @@ set(SMPI_SRC src/smpi/colls/smpi_intel_mpi_selector.cpp src/smpi/colls/smpi_openmpi_selector.cpp src/smpi/colls/smpi_mvapich2_selector.cpp - src/smpi/instr_smpi.cpp - src/smpi/smpi_bench.cpp - src/smpi/smpi_memory.cpp - src/smpi/smpi_shared.cpp - src/smpi/smpi_static_variables.cpp - src/smpi/smpi_coll.cpp - src/smpi/smpi_coll.hpp - src/smpi/smpi_comm.cpp - src/smpi/smpi_comm.hpp - src/smpi/smpi_deployment.cpp - src/smpi/smpi_dvfs.cpp - src/smpi/smpi_global.cpp - src/smpi/smpi_f2c.cpp - src/smpi/smpi_f2c.hpp - src/smpi/smpi_group.cpp - src/smpi/smpi_group.hpp - src/smpi/SmpiHost.cpp - src/smpi/SmpiHost.hpp - src/smpi/smpi_mpi.cpp - src/smpi/smpi_datatype.cpp - src/smpi/smpi_datatype.hpp - src/smpi/smpi_info.cpp - src/smpi/smpi_info.hpp - src/smpi/smpi_keyvals.cpp - src/smpi/smpi_keyvals.hpp - src/smpi/smpi_datatype_derived.cpp - src/smpi/smpi_datatype_derived.hpp - src/smpi/smpi_main.c - src/smpi/smpi_op.cpp - src/smpi/smpi_op.hpp - src/smpi/smpi_process.cpp - src/smpi/smpi_process.hpp - src/smpi/smpi_pmpi.cpp - src/smpi/smpi_replay.cpp - src/smpi/smpi_request.cpp - src/smpi/smpi_request.hpp - src/smpi/smpi_status.cpp - src/smpi/smpi_status.hpp - src/smpi/smpi_win.cpp - src/smpi/smpi_win.hpp - src/smpi/smpi_topo.cpp - src/smpi/smpi_topo.hpp - src/smpi/smpi_utils.cpp - src/smpi/smpi_f77.cpp - + src/smpi/colls/smpi_coll.cpp + src/smpi/internals/instr_smpi.cpp + src/smpi/internals/smpi_bench.cpp + src/smpi/internals/smpi_memory.cpp + src/smpi/internals/smpi_shared.cpp + src/smpi/internals/smpi_static_variables.cpp + src/smpi/internals/smpi_deployment.cpp + src/smpi/internals/smpi_dvfs.cpp + src/smpi/internals/smpi_global.cpp + src/smpi/internals/SmpiHost.cpp + src/smpi/internals/smpi_replay.cpp + src/smpi/internals/smpi_process.cpp + src/smpi/internals/smpi_utils.cpp + src/smpi/mpi/smpi_comm.cpp + src/smpi/mpi/smpi_datatype.cpp + src/smpi/mpi/smpi_datatype_derived.cpp + src/smpi/mpi/smpi_f2c.cpp + src/smpi/mpi/smpi_group.cpp + src/smpi/mpi/smpi_info.cpp + src/smpi/mpi/smpi_keyvals.cpp + src/smpi/mpi/smpi_op.cpp + src/smpi/mpi/smpi_request.cpp + src/smpi/mpi/smpi_status.cpp + src/smpi/mpi/smpi_topo.cpp + src/smpi/mpi/smpi_win.cpp + src/smpi/include/smpi_coll.hpp + src/smpi/include/smpi_comm.hpp + src/smpi/include/smpi_f2c.hpp + src/smpi/include/smpi_group.hpp + src/smpi/include/SmpiHost.hpp + src/smpi/include/smpi_datatype.hpp + src/smpi/include/smpi_info.hpp + src/smpi/include/smpi_keyvals.hpp + src/smpi/include/smpi_datatype_derived.hpp + src/smpi/include/smpi_op.hpp + src/smpi/include/smpi_process.hpp + src/smpi/include/smpi_request.hpp + src/smpi/include/smpi_status.hpp + src/smpi/include/smpi_win.hpp + src/smpi/include/smpi_topo.hpp src/surf/network_smpi.cpp src/surf/network_ib.cpp ) @@ -263,7 +274,6 @@ set(XBT_SRC src/xbt/ex.cpp src/xbt/exception.cpp src/xbt/graph.c - src/xbt/heap.c src/xbt/log.c src/xbt/mallocator.c src/xbt/memory_map.cpp @@ -276,7 +286,7 @@ set(XBT_SRC src/xbt/xbt_log_layout_format.c src/xbt/xbt_log_layout_simple.c src/xbt/xbt_main.cpp - src/xbt/xbt_os_file.c + src/xbt/xbt_os_file.cpp src/xbt/xbt_os_synchro.cpp src/xbt/xbt_os_time.c src/xbt/xbt_replay.cpp @@ -290,7 +300,7 @@ if(HAVE_MMALLOC) endif() set(NS3_SRC src/surf/network_ns3.cpp - src/surf/ns3/ns3_simulator.cc ) + src/surf/ns3/ns3_simulator.cpp ) set(SURF_SRC src/kernel/routing/ClusterZone.cpp @@ -334,6 +344,7 @@ set(SURF_SRC src/surf/network_constant.cpp src/surf/network_interface.cpp src/surf/plugins/host_energy.cpp + src/surf/plugins/link_energy.cpp src/surf/plugins/host_load.cpp src/surf/PropertyHolder.cpp src/surf/sg_platf.cpp @@ -368,6 +379,7 @@ set(SIMIX_SRC src/kernel/context/Context.cpp src/kernel/context/Context.hpp src/kernel/context/ContextRaw.cpp + src/kernel/context/ContextRaw.hpp src/simix/smx_deployment.cpp src/simix/smx_environment.cpp src/simix/smx_global.cpp @@ -455,16 +467,16 @@ set(SIMDAG_SRC ) set(BINDINGS_SRC - src/bindings/lua/lua_private.h - src/bindings/lua/lua_utils.h - src/bindings/lua/simgrid_lua.h + src/bindings/lua/lua_private.hpp + src/bindings/lua/lua_utils.hpp + src/bindings/lua/simgrid_lua.hpp ) set(JMSG_C_SRC src/bindings/java/jmsg.cpp - src/bindings/java/jmsg.h + src/bindings/java/jmsg.hpp src/bindings/java/jmsg_as.cpp - src/bindings/java/jmsg_as.h + src/bindings/java/jmsg_as.hpp src/bindings/java/jmsg_comm.cpp src/bindings/java/jmsg_comm.h src/bindings/java/jmsg_file.cpp @@ -482,7 +494,7 @@ set(JMSG_C_SRC src/bindings/java/jmsg_vm.cpp src/bindings/java/jmsg_vm.h src/bindings/java/jxbt_utilities.cpp - src/bindings/java/jxbt_utilities.h + src/bindings/java/jxbt_utilities.hpp src/bindings/java/JavaContext.cpp src/bindings/java/JavaContext.hpp src/bindings/java/jmsg_storage.cpp @@ -536,12 +548,17 @@ set(TRACING_SRC src/instr/instr_config.cpp src/instr/instr_interface.cpp src/instr/instr_paje_containers.cpp + src/instr/instr_paje_containers.hpp + src/instr/instr_paje_events.cpp + src/instr/instr_paje_events.hpp src/instr/instr_paje_header.cpp src/instr/instr_paje_trace.cpp src/instr/instr_paje_types.cpp + src/instr/instr_paje_types.hpp src/instr/instr_paje_values.cpp - src/instr/instr_private.h - src/instr/instr_smpi.h + src/instr/instr_paje_values.hpp + src/instr/instr_private.hpp + src/instr/instr_smpi.hpp src/instr/instr_resource_utilization.cpp ) @@ -559,8 +576,8 @@ set(JEDULE_SRC 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.hpp + src/mc/mc_replay.hpp src/mc/mc_record.cpp src/mc/mc_config.cpp src/mc/mc_global.cpp @@ -579,6 +596,8 @@ set(MC_SRC src/mc/remote/Channel.hpp src/mc/remote/Client.cpp src/mc/remote/Client.hpp + src/mc/remote/RemoteClient.hpp + src/mc/remote/RemoteClient.cpp src/mc/remote/RemotePtr.hpp src/mc/remote/mc_protocol.h src/mc/remote/mc_protocol.cpp @@ -599,19 +618,17 @@ set(MC_SRC src/mc/Type.hpp src/mc/Variable.hpp src/mc/mc_forward.hpp - src/mc/Process.hpp - src/mc/Process.cpp src/mc/Session.cpp src/mc/Session.hpp - src/mc/mc_unw.h + src/mc/mc_unw.hpp src/mc/mc_unw.cpp src/mc/mc_unw_vmread.cpp src/mc/mc_checkpoint.cpp - src/mc/mc_snapshot.h + src/mc/mc_snapshot.hpp src/mc/mc_snapshot.cpp src/mc/mc_page_snapshot.cpp - src/mc/mc_comm_pattern.h src/mc/mc_comm_pattern.cpp + src/mc/mc_comm_pattern.hpp src/mc/compare.cpp src/mc/mc_dwarf.hpp src/mc/mc_dwarf.cpp @@ -627,30 +644,26 @@ set(MC_SRC src/mc/mc_record.cpp src/mc/mc_member.cpp src/mc/mc_memory.cpp - src/mc/mc_private.h - src/mc/mc_request.h + src/mc/mc_private.hpp + src/mc/mc_request.hpp src/mc/mc_request.cpp - src/mc/mc_safety.h - src/mc/mc_state.h + src/mc/mc_safety.hpp + src/mc/mc_state.hpp src/mc/mc_state.cpp src/mc/VisitedState.cpp src/mc/VisitedState.hpp src/mc/mc_client_api.cpp - src/mc/mc_smx.h + src/mc/mc_smx.hpp src/mc/mc_smx.cpp src/mc/mc_xbt.hpp src/mc/mc_xbt.cpp - src/mc/mc_exit.h + src/mc/mc_exit.hpp src/mc/Transition.hpp ) set(MC_SIMGRID_MC_SRC src/mc/checker/simgrid_mc.cpp) set(headers_to_install - include/msg/msg.h - include/msg/datatypes.h - include/simdag/simdag.h - include/simdag/datatypes.h include/simgrid/chrono.hpp include/simgrid/plugins/energy.h include/simgrid/plugins/load.h @@ -690,31 +703,28 @@ set(headers_to_install include/smpi/smpi_extended_traces_fortran.h include/smpi/forward.hpp include/xbt.h - include/xbt/RngStream.h + include/xbt/algorithm.hpp include/xbt/asserts.h include/xbt/automaton.h include/xbt/automaton.hpp + include/xbt/backtrace.h + include/xbt/backtrace.hpp include/xbt/base.h include/xbt/config.h include/xbt/config.hpp include/xbt/cunit.h include/xbt/dict.h - include/xbt/string.hpp - include/xbt/signal.hpp include/xbt/dynar.h include/xbt/dynar.hpp include/xbt/ex.h include/xbt/ex.hpp include/xbt/exception.hpp - include/xbt/backtrace.h - include/xbt/backtrace.hpp - include/xbt/file.h - include/xbt/function_types.h + include/xbt/Extendable.hpp + include/xbt/file.hpp include/xbt/functional.hpp + include/xbt/function_types.h include/xbt/future.hpp include/xbt/graph.h - include/xbt/heap.h - include/xbt/Extendable.hpp include/xbt/log.h include/xbt/log.hpp include/xbt/mallocator.h @@ -724,7 +734,10 @@ set(headers_to_install include/xbt/parmap.h include/xbt/range.hpp include/xbt/replay.hpp + include/xbt/RngStream.h + include/xbt/signal.hpp include/xbt/str.h + include/xbt/string.hpp include/xbt/swag.h include/xbt/synchro.h include/xbt/sysdep.h @@ -756,9 +769,11 @@ else() # NOT pthread endif() if(${HAVE_UCONTEXT_CONTEXTS}) #ucontext - set(SURF_SRC ${SURF_SRC} src/kernel/context/ContextUnix.cpp) + set(SURF_SRC ${SURF_SRC} src/kernel/context/ContextUnix.hpp + src/kernel/context/ContextUnix.cpp) else() # NOT ucontext - set(EXTRA_DIST ${EXTRA_DIST} src/kernel/context/ContextUnix.cpp) + set(EXTRA_DIST ${EXTRA_DIST} src/kernel/context/ContextUnix.hpp + src/kernel/context/ContextUnix.cpp) endif() ### Simgrid Lib sources @@ -1027,6 +1042,7 @@ set(CMAKE_SOURCE_FILES tools/cmake/MakeLibWin.cmake tools/cmake/Modules/FindGraphviz.cmake tools/cmake/Modules/FindLibdw.cmake + tools/cmake/Modules/FindLibelf.cmake tools/cmake/Modules/FindLibunwind.cmake tools/cmake/Modules/FindLibevent.cmake tools/cmake/Modules/FindLuaSimgrid.cmake @@ -1039,6 +1055,7 @@ set(CMAKE_SOURCE_FILES tools/cmake/scripts/update_tesh.pl tools/cmake/UnitTesting.cmake tools/cmake/src/internal_config.h.in + tools/cmake/test_prog/prog_asan.cpp tools/cmake/test_prog/prog_gnu_dynlinker.c tools/cmake/test_prog/prog_makecontext.c tools/cmake/test_prog/prog_mutex_timedlock.c @@ -1114,6 +1131,7 @@ set(PLATFORMS_EXAMPLES examples/platforms/storage/storage.xml examples/platforms/small_platform.xml examples/platforms/small_platform.lua + examples/platforms/small_platform_constant.xml examples/platforms/small_platform_fatpipe.xml examples/platforms/small_platform_one_link_routes.xml examples/platforms/small_platform_with_failures.xml