X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e1715704770cb8535d3bb511dd32eba8b8e53bbe..c7d7c63df056ba7baedcd29ee5e9d6dace72f296:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 958684d51b..28db9333b0 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -5,59 +5,55 @@ 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/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/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.h - src/smpi/colls/colls_private.h - src/smpi/colls/smpi_mvapich2_selector_stampede.h - src/smpi/include/private.h + 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 - src/surf/maxmin_private.hpp src/surf/network_cm02.hpp src/surf/network_constant.hpp src/surf/network_interface.hpp 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 src/surf/xml/simgrid_dtd.c src/surf/xml/surfxml_sax_cb.cpp - src/surf/FileImpl.hpp 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 @@ -70,8 +66,6 @@ set(EXTRA_DIST src/xbt/backtrace_dummy.cpp 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 @@ -85,6 +79,8 @@ set(EXTRA_DIST src/xbt/mmalloc/mmorecore.c src/xbt/mmalloc/mmprivate.h src/xbt/mmalloc/mrealloc.c + src/xbt/mmalloc/swag.c + src/xbt/mmalloc/swag.h tools/tesh/generate_tesh tools/lualib.patch teshsuite/lua/lua_platforms.tesh @@ -275,7 +271,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 @@ -283,12 +278,11 @@ set(XBT_SRC src/xbt/parmap.cpp src/xbt/snprintf.c src/xbt/string.cpp - src/xbt/swag.c src/xbt/xbt_log_appender_file.c 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 @@ -302,9 +296,14 @@ 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/lmm/fair_bottleneck.cpp + src/kernel/lmm/lagrange.cpp + src/kernel/lmm/maxmin.hpp + src/kernel/lmm/maxmin.cpp + src/kernel/routing/ClusterZone.cpp src/kernel/routing/ClusterZone.hpp src/kernel/routing/DijkstraZone.cpp @@ -336,16 +335,14 @@ set(SURF_SRC src/surf/cpu_cas01.cpp src/surf/cpu_interface.cpp src/surf/cpu_ti.cpp - src/surf/fair_bottleneck.cpp - src/surf/FileImpl.cpp src/surf/instr_routing.cpp src/surf/instr_surf.cpp - src/surf/lagrange.cpp - src/surf/maxmin.cpp src/surf/network_cm02.cpp src/surf/network_constant.cpp src/surf/network_interface.cpp + src/surf/plugins/dirty_page_tracking.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 @@ -365,11 +362,16 @@ set(SURF_SRC ) set(PLUGINS_SRC + src/plugins/file_system/FileSystem.hpp + src/plugins/file_system/s4u_FileSystem.cpp + src/plugins/vm/VirtualMachineImpl.hpp src/plugins/vm/s4u_VirtualMachine.cpp src/plugins/vm/VirtualMachineImpl.hpp src/plugins/vm/VirtualMachineImpl.cpp src/plugins/vm/VmHostExt.hpp src/plugins/vm/VmHostExt.cpp + src/plugins/vm/VmLiveMigration.cpp + src/plugins/vm/VmLiveMigration.hpp ) set(SIMIX_GENERATED_SRC src/simix/popping_generated.cpp ) @@ -380,6 +382,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 @@ -398,6 +401,8 @@ set(SIMIX_SRC src/kernel/activity/ExecImpl.hpp src/kernel/activity/MailboxImpl.cpp src/kernel/activity/MailboxImpl.hpp + src/kernel/activity/MutexImpl.cpp + src/kernel/activity/MutexImpl.hpp src/kernel/activity/SleepImpl.cpp src/kernel/activity/SleepImpl.hpp src/kernel/activity/SynchroIo.cpp @@ -427,7 +432,7 @@ set(S4U_SRC src/s4u/s4u_conditionVariable.cpp src/s4u/s4u_comm.cpp src/s4u/s4u_engine.cpp - src/s4u/s4u_file.cpp + src/s4u/s4u_exec.cpp src/s4u/s4u_host.cpp src/s4u/s4u_link.cpp src/s4u/s4u_mailbox.cpp @@ -467,16 +472,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 @@ -494,7 +499,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 @@ -548,12 +553,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 ) @@ -571,8 +581,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 @@ -615,11 +625,11 @@ set(MC_SRC src/mc/mc_forward.hpp 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.cpp @@ -639,20 +649,20 @@ 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 ) @@ -661,11 +671,12 @@ set(MC_SIMGRID_MC_SRC src/mc/checker/simgrid_mc.cpp) set(headers_to_install include/simgrid/chrono.hpp include/simgrid/plugins/energy.h + include/simgrid/plugins/file_system.h + include/simgrid/plugins/live_migration.h include/simgrid/plugins/load.h include/simgrid/instr.h include/simgrid/msg.h include/simgrid/simdag.h - include/simgrid/datatypes.h include/simgrid/modelchecker.h include/simgrid/forward.h include/simgrid/simix.h @@ -680,7 +691,7 @@ set(headers_to_install include/simgrid/s4u/Comm.hpp include/simgrid/s4u/ConditionVariable.hpp include/simgrid/s4u/Engine.hpp - include/simgrid/s4u/File.hpp + include/simgrid/s4u/Exec.hpp include/simgrid/s4u/Host.hpp include/simgrid/s4u/Link.hpp include/simgrid/s4u/Mailbox.hpp @@ -689,8 +700,6 @@ set(headers_to_install include/simgrid/s4u/Storage.hpp include/simgrid/s4u/VirtualMachine.hpp include/simgrid/s4u.hpp - include/simgrid/plugins/energy.h - include/simgrid/plugins/load.h include/smpi/mpi.h include/smpi/smpi.h include/smpi/smpi_main.h @@ -698,31 +707,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 @@ -732,8 +738,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/swag.h + include/xbt/string.hpp include/xbt/synchro.h include/xbt/sysdep.h include/xbt/system_error.hpp @@ -764,9 +772,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 @@ -917,6 +927,7 @@ set(DOC_TOOLS set(DOC_IMG ${CMAKE_HOME_DIRECTORY}/doc/sc3-description.png ${CMAKE_HOME_DIRECTORY}/doc/webcruft/AS_hierarchy.png + ${CMAKE_HOME_DIRECTORY}/doc/webcruft/eclipseScreenShot.png ${CMAKE_HOME_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot.jpg ${CMAKE_HOME_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot_thn.jpg ${CMAKE_HOME_DIRECTORY}/doc/webcruft/SGicon.gif @@ -1048,6 +1059,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 @@ -1123,6 +1135,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