X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b47ba9d4ca3cdedcd61f4cda5bf031f8660d1c0e..2b1e3b1eda0915dede0146e8ea5c183a0483acee:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 584ff4ce18..e5041182cc 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -7,8 +7,10 @@ set(EXTRA_DIST src/include/mc/mc.h src/include/simgrid/sg_config.hpp src/include/surf/surf.hpp + src/include/xbt/coverage.h src/include/xbt/parmap.hpp src/include/xbt/mmalloc.h + src/include/catch.hpp src/mc/mc_mmu.hpp src/mc/mc_record.hpp src/msg/msg_private.hpp @@ -23,11 +25,7 @@ set(EXTRA_DIST src/simix/popping_generated.cpp src/simix/popping_enum.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.hpp src/smpi/colls/colls_private.hpp src/smpi/colls/smpi_mvapich2_selector_stampede.hpp @@ -45,9 +43,6 @@ set(EXTRA_DIST src/surf/network_smpi.hpp src/surf/network_ib.hpp src/surf/ns3/ns3_simulator.hpp - src/surf/trace_mgr_test.cpp - src/mc/sosp/mc_snapshot_test.cpp - src/mc/sosp/PageStore_test.cpp src/surf/xml/simgrid.dtd src/surf/xml/simgrid_dtd.h src/surf/xml/simgrid_dtd.c @@ -271,7 +266,6 @@ set(XBT_SRC src/xbt/automaton/automatonparse_promela.c src/xbt/backtrace.cpp src/xbt/config.cpp - src/xbt/cunit.cpp src/xbt/dict.cpp src/xbt/dict_cursor.c src/xbt/dict_elm.c @@ -292,7 +286,6 @@ set(XBT_SRC src/xbt/xbt_main.cpp src/xbt/xbt_os_file.cpp src/xbt/xbt_os_synchro.cpp - src/xbt/xbt_os_thread.c src/xbt/xbt_os_time.c src/xbt/xbt_replay.cpp src/xbt/xbt_str.cpp @@ -316,6 +309,8 @@ set(SURF_SRC src/kernel/resource/Action.cpp src/kernel/resource/Model.cpp src/kernel/resource/Resource.cpp + src/kernel/resource/profile/trace_mgr.hpp + src/kernel/resource/profile/trace_mgr.cpp src/kernel/routing/ClusterZone.cpp src/kernel/routing/DijkstraZone.cpp @@ -349,8 +344,6 @@ set(SURF_SRC src/surf/xml/platf_private.hpp src/surf/xml/surfxml_sax_cb.cpp src/surf/xml/surfxml_parseplatf.cpp - src/surf/trace_mgr.hpp - src/surf/trace_mgr.cpp src/surf/host_clm03.cpp src/surf/HostImpl.cpp src/surf/ptask_L07.cpp @@ -390,12 +383,6 @@ set(SIMIX_SRC src/simix/smx_deployment.cpp src/simix/smx_environment.cpp src/simix/smx_global.cpp - src/simix/smx_host.cpp - src/simix/smx_io.cpp - src/simix/smx_network.cpp - src/simix/ActorImpl.cpp - src/simix/ActorImpl.hpp - src/simix/smx_synchro.cpp src/simix/popping.cpp src/kernel/activity/ActivityImpl.cpp src/kernel/activity/ActivityImpl.hpp @@ -411,10 +398,14 @@ set(SIMIX_SRC src/kernel/activity/MailboxImpl.hpp src/kernel/activity/MutexImpl.cpp src/kernel/activity/MutexImpl.hpp + src/kernel/activity/SemaphoreImpl.cpp + src/kernel/activity/SemaphoreImpl.hpp src/kernel/activity/SleepImpl.cpp src/kernel/activity/SleepImpl.hpp src/kernel/activity/SynchroRaw.cpp src/kernel/activity/SynchroRaw.hpp + src/kernel/actor/ActorImpl.cpp + src/kernel/actor/ActorImpl.hpp ${SIMIX_GENERATED_SRC} ) @@ -451,14 +442,14 @@ set(S4U_SRC ) set(SIMGRID_SRC + src/simgrid/Exception.cpp src/simgrid/sg_config.cpp src/simgrid/util.hpp ) set(MSG_SRC - src/msg/instr_msg_task.cpp src/msg/msg_global.cpp - src/msg/msg_gos.cpp + src/msg/msg_comm.cpp src/msg/msg_legacy.cpp src/msg/msg_process.cpp src/msg/msg_task.cpp @@ -545,7 +536,7 @@ list(APPEND JMSG_JAVA_SRC ${JTRACE_JAVA_SRC}) set(LUA_SRC src/bindings/lua/lua_host.cpp src/bindings/lua/lua_platf.cpp - src/bindings/lua/lua_debug.cpp + src/bindings/lua/lua_utils.cpp src/bindings/lua/simgrid_lua.cpp ) @@ -663,8 +654,6 @@ set(MC_SRC src/mc/mc_client_api.cpp src/mc/mc_smx.hpp src/mc/mc_smx.cpp - src/mc/mc_xbt.hpp - src/mc/mc_xbt.cpp src/mc/mc_exit.hpp src/mc/Transition.hpp ) @@ -753,7 +742,6 @@ set(headers_to_install include/xbt/base.h include/xbt/config.h include/xbt/config.hpp - include/xbt/cunit.h include/xbt/dict.h include/xbt/dynar.h include/xbt/ex.h @@ -780,7 +768,6 @@ set(headers_to_install include/xbt/system_error.hpp include/xbt/utility.hpp include/xbt/virtu.h - include/xbt/xbt_os_thread.h include/xbt/xbt_os_time.h ) set(source_of_generated_headers @@ -791,7 +778,7 @@ set(source_of_generated_headers ### depend of some variables setted upper if(${HAVE_UCONTEXT_CONTEXTS}) #ucontext - set(SURF_SRC ${SURF_SRC} src/kernel/context/ContextUnix.hpp + set(SIMIX_SRC ${SIMIX_SRC} src/kernel/context/ContextUnix.hpp src/kernel/context/ContextUnix.cpp) else() # NOT ucontext set(EXTRA_DIST ${EXTRA_DIST} src/kernel/context/ContextUnix.hpp @@ -842,15 +829,10 @@ set(DOC_SOURCES doc/Layout.xml doc/doxygen/FAQ.doc - doc/doxygen/community.doc doc/doxygen/deployment.doc - doc/doxygen/footer.html - doc/doxygen/header.html - doc/doxygen/index.doc doc/doxygen/inside.doc doc/doxygen/inside_tests.doc doc/doxygen/inside_cmake.doc - doc/doxygen/inside_doxygen.doc doc/doxygen/inside_extending.doc doc/doxygen/inside_release.doc doc/doxygen/module-sd.doc @@ -861,11 +843,9 @@ set(DOC_SOURCES doc/doxygen/ns3.doc doc/doxygen/outcomes.doc doc/doxygen/outcomes_logs.doc - doc/doxygen/outcomes_MC.doc doc/doxygen/outcomes_vizu.doc doc/doxygen/platform.doc doc/doxygen/platform_lua.doc - doc/doxygen/stylesheet.css doc/doxygen/uhood.doc doc/doxygen/uhood_switch.doc doc/doxygen/uhood_arch.doc @@ -899,6 +879,7 @@ set(DOC_SOURCES docs/source/app_msg.rst docs/source/app_s4u.rst docs/source/app_smpi.rst + docs/source/community.rst docs/source/index.rst docs/source/intro_concepts.rst docs/source/introduction.rst @@ -933,6 +914,7 @@ set(DOC_SOURCES docs/source/tuto_smpi/3hosts.xml docs/source/tuto_smpi/img/big-picture.svg docs/source/tuto_smpi/img/lu.S.4.png + docs/source/tuto_smpi/gemm_mpi.cpp docs/source/tuto_smpi/roundtrip.c CITATION.bib @@ -991,19 +973,20 @@ set(txt_files set(CMAKEFILES_TXT examples/s4u/CMakeLists.txt examples/smpi/CMakeLists.txt - examples/smpi/NAS/CMakeLists.txt - examples/smpi/smpi_msg_masterslave/CMakeLists.txt - examples/smpi/replay_multiple/CMakeLists.txt - examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt - examples/smpi/energy/f77/CMakeLists.txt - examples/smpi/energy/f90/CMakeLists.txt + examples/smpi/NAS/CMakeLists.txt + examples/smpi/smpi_msg_masterslave/CMakeLists.txt + examples/smpi/replay_multiple/CMakeLists.txt + examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt + examples/smpi/energy/f77/CMakeLists.txt + examples/smpi/energy/f90/CMakeLists.txt examples/python/CMakeLists.txt examples/deprecated/java/CMakeLists.txt examples/deprecated/msg/CMakeLists.txt - examples/deprecated/msg/mc/CMakeLists.txt + examples/deprecated/msg/mc/CMakeLists.txt examples/deprecated/simdag/CMakeLists.txt teshsuite/java/CMakeLists.txt + teshsuite/lua/CMakeLists.txt teshsuite/mc/CMakeLists.txt teshsuite/msg/CMakeLists.txt teshsuite/s4u/CMakeLists.txt @@ -1072,13 +1055,11 @@ set(CMAKE_SOURCE_FILES tools/cmake/Modules/FindLuaSimgrid.cmake tools/cmake/Modules/FindNS3.cmake tools/cmake/Modules/FindPAPI.cmake - tools/cmake/Modules/FindRngStream.cmake tools/cmake/Modules/FindValgrind.cmake tools/cmake/Option.cmake tools/cmake/scripts/fixup_simgrid_dtd_l.pl tools/cmake/scripts/my_valgrind.pl tools/cmake/scripts/update_tesh.pl - tools/cmake/UnitTesting.cmake tools/cmake/test_prog/prog_asan.cpp tools/cmake/test_prog/prog_makecontext.c tools/cmake/test_prog/prog_stackgrowth.c @@ -1115,19 +1096,19 @@ set(PLATFORMS_EXAMPLES examples/platforms/optorsim/transform_optorsim_platform.pl examples/platforms/config.xml examples/platforms/config_tracing.xml - examples/platforms/trace/bourassa_state.trace - examples/platforms/trace/fafard_state.trace - examples/platforms/trace/faulty_host.trace - examples/platforms/trace/ginette_state.trace - examples/platforms/trace/jupiter_speed.trace - examples/platforms/trace/jupiter_state.trace - examples/platforms/trace/link1_avail.trace - examples/platforms/trace/link3_state.trace - examples/platforms/trace/link4_state.trace - examples/platforms/trace/linkBandwidth7.bw - examples/platforms/trace/trace_A_failure.txt - examples/platforms/trace/trace_A.txt - examples/platforms/trace/trace_B.txt + examples/platforms/profiles/bourassa_state.profile + examples/platforms/profiles/fafard_state.profile + examples/platforms/profiles/faulty_host.profile + examples/platforms/profiles/ginette_state.profile + examples/platforms/profiles/jupiter_speed.profile + examples/platforms/profiles/jupiter_state.profile + examples/platforms/profiles/link1_bandwidth.profile + examples/platforms/profiles/link1_latency.profile + examples/platforms/profiles/link3_state.profile + examples/platforms/profiles/link4_state.profile + examples/platforms/profiles/trace_A_failure.txt + examples/platforms/profiles/trace_A.txt + examples/platforms/profiles/trace_B.txt examples/platforms/data_center.xml examples/platforms/dogbone.xml examples/platforms/energy_platform.xml @@ -1151,9 +1132,10 @@ set(PLATFORMS_EXAMPLES examples/platforms/small_platform.xml examples/platforms/small_platform.lua examples/platforms/small_platform_constant.xml + examples/platforms/small_platform_failures.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_profile.xml examples/platforms/small_platform_with_routers.xml examples/platforms/syscoord/generate_peer_platform.pl examples/platforms/syscoord/median_harvard.syscoord @@ -1162,7 +1144,7 @@ set(PLATFORMS_EXAMPLES examples/platforms/three_multicore_hosts.xml examples/platforms/two_hosts.xml examples/platforms/two_hosts_platform_shared.xml - examples/platforms/two_hosts_platform_with_availability.xml + examples/platforms/two_hosts_profiles.xml examples/platforms/two_hosts_platform_with_availability_included.xml examples/platforms/two_peers.xml examples/platforms/vivaldi.xml