X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1afb6751888eb781f1fa1bc7c98b7c7338308c49..839aa39cec9e814fb9a6ccd5b3c3b870d25c7506:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index aff655f6fb..05cc7eba9c 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -6,27 +6,23 @@ set(EXTRA_DIST src/include/mc/datatypes.h 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/xbt/xbt_modinter.h src/include/catch.hpp src/include/xxhash.hpp + src/kernel/actor/Simcall.hpp + src/kernel/resource/LinkImpl.hpp + src/kernel/resource/SplitDuplexLinkImpl.hpp + src/kernel/resource/StandardLinkImpl.hpp + src/kernel/resource/WifiLinkImpl.hpp src/mc/mc_mmu.hpp src/mc/mc_record.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.hpp - src/simix/popping_bodies.cpp - src/simix/popping_generated.cpp - src/simix/popping_enum.hpp - src/simix/popping_accessors.hpp + src/dag/dax.dtd + src/dag/dax_dtd.c + src/dag/dax_dtd.h src/smpi/colls/coll_tuned_topo.hpp src/smpi/colls/colls_private.hpp src/smpi/colls/smpi_mvapich2_selector_stampede.hpp @@ -35,18 +31,12 @@ set(EXTRA_DIST src/smpi/smpi_main.c src/smpi/smpi_replay_main.cpp src/surf/cpu_cas01.hpp - src/surf/cpu_interface.hpp src/surf/cpu_ti.hpp src/surf/network_cm02.hpp src/surf/network_constant.hpp - src/surf/network_interface.hpp - src/surf/LinkImpl.hpp - src/surf/LinkImplIntf.hpp - src/surf/SplitDuplexLinkImpl.hpp src/surf/network_ns3.hpp src/surf/network_smpi.hpp src/surf/network_ib.hpp - src/surf/network_wifi.hpp src/surf/ns3/ns3_simulator.hpp src/surf/xml/simgrid.dtd src/surf/xml/simgrid_dtd.h @@ -55,7 +45,6 @@ set(EXTRA_DIST src/surf/disk_s19.hpp src/surf/surf_interface.hpp - src/surf/surf_private.hpp src/surf/host_clm03.hpp src/surf/HostImpl.hpp src/surf/ptask_L07.hpp @@ -79,8 +68,6 @@ set(EXTRA_DIST src/xbt/mmalloc/mrealloc.c src/xbt/mmalloc/swag.c src/xbt/mmalloc/swag.h - tools/lualib.patch - teshsuite/lua/lua_platforms.tesh examples/smpi/mc/only_send_deterministic.tesh ) @@ -305,17 +292,25 @@ set(NS3_SRC src/surf/network_ns3.cpp src/surf/ns3/ns3_simulator.cpp ) set(SURF_SRC + src/kernel/lmm/bmf.hpp + src/kernel/lmm/bmf.cpp src/kernel/lmm/fair_bottleneck.cpp src/kernel/lmm/maxmin.hpp src/kernel/lmm/maxmin.cpp src/kernel/resource/Action.cpp - src/kernel/resource/Model.cpp + src/kernel/resource/CpuImpl.cpp + src/kernel/resource/CpuImpl.hpp src/kernel/resource/DiskImpl.cpp src/kernel/resource/DiskImpl.hpp + src/kernel/resource/Model.cpp src/kernel/resource/Resource.hpp + src/kernel/resource/LinkImpl.cpp + src/kernel/resource/SplitDuplexLinkImpl.cpp + src/kernel/resource/StandardLinkImpl.cpp src/kernel/resource/VirtualMachineImpl.hpp src/kernel/resource/VirtualMachineImpl.cpp + src/kernel/resource/WifiLinkImpl.cpp src/kernel/resource/profile/DatedValue.cpp src/kernel/resource/profile/DatedValue.hpp @@ -349,17 +344,11 @@ set(SURF_SRC src/kernel/EngineImpl.hpp src/surf/cpu_cas01.cpp - src/surf/cpu_interface.cpp src/surf/cpu_ti.cpp src/surf/disk_s19.cpp src/surf/network_cm02.cpp src/surf/network_constant.cpp - src/surf/network_interface.cpp - src/surf/LinkImpl.cpp - src/surf/SplitDuplexLinkImpl.cpp - src/surf/network_wifi.cpp src/surf/sg_platf.cpp - src/surf/surf_c_bindings.cpp src/surf/surf_interface.cpp src/surf/xml/platf.hpp src/surf/xml/platf_private.hpp @@ -372,6 +361,7 @@ set(SURF_SRC set(PLUGINS_SRC src/plugins/ProducerConsumer.cpp + src/plugins/chaos_monkey.cpp src/plugins/host_dvfs.cpp src/plugins/host_energy.cpp src/plugins/link_energy.cpp @@ -384,11 +374,7 @@ set(PLUGINS_SRC src/plugins/vm/VmLiveMigration.hpp ) -set(SIMIX_GENERATED_SRC src/simix/popping_generated.cpp ) set(SIMIX_SRC - src/kernel/future.cpp - src/simix/libsmx.cpp - src/simix/smx_context.cpp src/kernel/context/Context.cpp src/kernel/context/Context.hpp src/kernel/context/ContextRaw.cpp @@ -397,9 +383,10 @@ set(SIMIX_SRC src/kernel/context/ContextSwapped.hpp src/kernel/context/ContextThread.cpp src/kernel/context/ContextThread.hpp - src/simix/popping.cpp src/kernel/activity/ActivityImpl.cpp src/kernel/activity/ActivityImpl.hpp + src/kernel/activity/BarrierImpl.cpp + src/kernel/activity/BarrierImpl.hpp src/kernel/activity/ConditionVariableImpl.cpp src/kernel/activity/ConditionVariableImpl.hpp src/kernel/activity/CommImpl.cpp @@ -416,14 +403,19 @@ set(SIMIX_SRC 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/activity/Synchro.cpp + src/kernel/activity/Synchro.hpp src/kernel/actor/ActorImpl.cpp src/kernel/actor/ActorImpl.hpp + src/kernel/actor/CommObserver.cpp + src/kernel/actor/CommObserver.hpp + src/kernel/actor/Simcall.cpp src/kernel/actor/SimcallObserver.cpp src/kernel/actor/SimcallObserver.hpp - - ${SIMIX_GENERATED_SRC} + src/kernel/actor/SynchroObserver.cpp + src/kernel/actor/SynchroObserver.hpp + src/simix/libsmx.cpp + src/simix/smx_context.cpp ) # Boost context may not be available @@ -473,17 +465,8 @@ set(MSG_SRC src/msg/msg_task.cpp ) -set(SIMDAG_SRC - src/simdag/sd_daxloader.cpp - src/simdag/sd_dotloader.cpp - src/simdag/sd_global.cpp - src/simdag/sd_task.cpp - ) - -set(BINDINGS_SRC - src/bindings/lua/lua_private.hpp - src/bindings/lua/lua_utils.hpp - src/bindings/lua/simgrid_lua.hpp +set(DAG_SRC + src/dag/loaders.cpp ) set(JMSG_C_SRC @@ -541,13 +524,6 @@ set(JTRACE_JAVA_SRC src/bindings/java/org/simgrid/trace/Trace.java) list(APPEND JMSG_C_SRC ${JTRACE_C_SRC}) 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_utils.cpp - src/bindings/lua/simgrid_lua.cpp - ) - set(TRACING_SRC src/instr/instr_config.cpp src/instr/instr_interface.cpp @@ -566,17 +542,6 @@ set(TRACING_SRC src/instr/instr_resource_utilization.cpp ) -set(JEDULE_SRC - include/simgrid/jedule/jedule_events.hpp - include/simgrid/jedule/jedule.hpp - include/simgrid/jedule/jedule_platform.hpp - include/simgrid/jedule/jedule_sd_binding.h - src/instr/jedule/jedule_events.cpp - src/instr/jedule/jedule.cpp - src/instr/jedule/jedule_platform.cpp - src/instr/jedule/jedule_sd_binding.cpp - ) - set(MC_SRC_BASE src/mc/mc_base.cpp src/mc/mc_base.hpp @@ -586,18 +551,18 @@ set(MC_SRC_BASE src/mc/mc_config.cpp src/mc/mc_config.hpp src/mc/mc_global.cpp + src/mc/transition/Transition.cpp ) set(MC_SRC - src/mc/checker/Checker.hpp - src/mc/checker/CommunicationDeterminismChecker.cpp - src/mc/checker/CommunicationDeterminismChecker.hpp - src/mc/checker/SafetyChecker.cpp - src/mc/checker/SafetyChecker.hpp - src/mc/checker/LivenessChecker.cpp - src/mc/checker/LivenessChecker.hpp - src/mc/checker/UdporChecker.cpp - src/mc/checker/UdporChecker.hpp + src/mc/explo/Exploration.hpp + src/mc/explo/CommunicationDeterminismChecker.cpp + src/mc/explo/DFSExplorer.cpp + src/mc/explo/DFSExplorer.hpp + src/mc/explo/LivenessChecker.cpp + src/mc/explo/LivenessChecker.hpp + src/mc/explo/UdporChecker.cpp + src/mc/explo/UdporChecker.hpp src/mc/inspect/DwarfExpression.hpp src/mc/inspect/DwarfExpression.cpp @@ -644,7 +609,6 @@ set(MC_SRC src/mc/mc_forward.hpp src/mc/Session.cpp src/mc/Session.hpp - src/mc/mc_comm_pattern.hpp src/mc/mc_pattern.hpp src/mc/compare.cpp src/mc/api.cpp @@ -655,19 +619,27 @@ set(MC_SRC src/mc/mc_record.cpp src/mc/mc_private.hpp 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.cpp src/mc/mc_exit.hpp - src/mc/Transition.hpp + src/mc/api/State.hpp + src/mc/api/State.cpp + src/mc/transition/Transition.hpp + src/mc/transition/TransitionAny.cpp + src/mc/transition/TransitionAny.hpp + src/mc/transition/TransitionComm.cpp + src/mc/transition/TransitionComm.hpp + src/mc/transition/TransitionRandom.cpp + src/mc/transition/TransitionRandom.hpp + src/mc/transition/TransitionSynchro.cpp + src/mc/transition/TransitionSynchro.hpp src/mc/udpor_global.cpp src/mc/udpor_global.hpp ) -set(MC_SIMGRID_MC_SRC src/mc/checker/simgrid_mc.cpp) +set(MC_SIMGRID_MC_SRC src/mc/explo/simgrid_mc.cpp) set(headers_to_install include/simgrid/actor.h @@ -685,14 +657,12 @@ set(headers_to_install include/simgrid/plugins/ProducerConsumer.hpp include/simgrid/instr.h include/simgrid/mailbox.h - include/simgrid/simdag.h include/simgrid/modelchecker.h include/simgrid/forward.h include/simgrid/simix.h include/simgrid/simix.hpp include/simgrid/kernel/ProfileBuilder.hpp include/simgrid/kernel/Timer.hpp - include/simgrid/kernel/future.hpp include/simgrid/disk.h include/simgrid/host.h include/simgrid/link.h @@ -809,8 +779,7 @@ set(simgrid_sources ${TRACING_SRC} ${XBT_SRC} ${PLUGINS_SRC} - ${BINDINGS_SRC} - ${SIMDAG_SRC} + ${DAG_SRC} ) if(${enable_msg}) @@ -821,12 +790,6 @@ else() ${MSG_SRC}) endif() -if(${SIMGRID_HAVE_JEDULE}) - set(simgrid_sources ${simgrid_sources} ${JEDULE_SRC}) -else() - set(EXTRA_DIST ${EXTRA_DIST} ${JEDULE_SRC}) -endif() - if(enable_smpi) set(simgrid_sources ${simgrid_sources} ${SMPI_SRC}) endif() @@ -836,13 +799,11 @@ if(SIMGRID_HAVE_MC) endif() if(SIMGRID_HAVE_NS3) - set(simgrid_sources ${simgrid_sources} ${NS3_SRC}) -endif() + set(headers_to_install ${headers_to_install} include/simgrid/plugins/ns3.hpp) -if(SIMGRID_HAVE_LUA) - set(simgrid_sources ${simgrid_sources} ${LUA_SRC}) -else() - set(EXTRA_DIST ${EXTRA_DIST} ${LUA_SRC}) + set(simgrid_sources ${simgrid_sources} ${NS3_SRC}) +else() + set(EXTRA_DIST ${EXTRA_DIST} include/simgrid/plugins/ns3.hpp) endif() set(DOC_SOURCES @@ -852,15 +813,12 @@ set(DOC_SOURCES doc/doxygen/inside_cmake.doc doc/doxygen/inside_extending.doc doc/doxygen/inside_release.doc - doc/doxygen/module-sd.doc doc/doxygen/module-surf.doc - doc/doxygen/module-trace.doc doc/doxygen/module-index.doc doc/doxygen/outcomes_vizu.doc doc/doxygen/platform.doc doc/doxygen/uhood.doc doc/doxygen/uhood_switch.doc - doc/doxygen/uhood_arch.doc examples/README.rst @@ -907,6 +865,7 @@ set(DOC_SOURCES docs/source/img/smpi_simgrid_alltoall_ring_16.png docs/source/img/starzone.drawio docs/source/img/starzone.svg + docs/source/img/vivaldi.svg docs/source/img/zone_hierarchy.png docs/source/img/zone_tree.drawio docs/source/img/zone_tree.svg @@ -918,6 +877,7 @@ set(DOC_SOURCES docs/source/app_s4u.rst docs/source/app_smpi.rst docs/source/The_XBT_toolbox.rst + docs/source/Calibrating_the_models.rst docs/source/community.rst docs/source/Configuring_SimGrid.rst docs/source/Deploying_your_application.rst @@ -928,11 +888,11 @@ set(DOC_SOURCES docs/source/Installing_SimGrid.rst docs/source/Start_your_own_project.rst docs/source/Models.rst + docs/source/Modeling_howtos.rst docs/source/Outcomes.rst docs/source/Platform.rst docs/source/Platform_cpp.rst docs/source/Platform_examples.rst - docs/source/Platform_howtos.rst docs/source/Platform_routing.rst docs/source/Plugins.rst docs/source/Release_Notes.rst @@ -943,7 +903,7 @@ set(DOC_SOURCES docs/source/tuto_s4u/deployment1.xml docs/source/tuto_s4u/deployment2.xml docs/source/tuto_s4u/deployment3.xml - docs/source/tuto_s4u/deployment4.xml + docs/source/tuto_s4u/deployment5.xml docs/source/tuto_s4u/draw_gantt.R docs/source/tuto_s4u/img/intro.svg docs/source/tuto_s4u/img/question.svg @@ -951,7 +911,9 @@ set(DOC_SOURCES docs/source/tuto_s4u/img/Rscript-screenshot.png docs/source/tuto_s4u/img/vite-screenshot.png docs/source/tuto_s4u/master-workers-lab1.cpp + docs/source/tuto_s4u/master-workers-lab1.py docs/source/tuto_s4u/master-workers-lab2.cpp + docs/source/tuto_s4u/master-workers-lab2.py docs/source/tuto_s4u/master-workers-lab3.cpp docs/source/tuto_s4u/master-workers-lab4.cpp @@ -975,6 +937,34 @@ set(DOC_SOURCES docs/source/tuto_disk/fig/simgrid_results.png docs/source/tuto_disk/init.el docs/source/tuto_disk/tuto_disk.cpp + docs/source/tuto_network_calibration/clustering_ckmeans.ipynb + docs/source/tuto_network_calibration/clustering_dhist.ipynb + docs/source/tuto_network_calibration/CMakeLists.txt + docs/source/tuto_network_calibration/dahu_platform_ckmeans.cpp + docs/source/tuto_network_calibration/dahu_platform_dhist.cpp + docs/source/tuto_network_calibration/Dockerfile + docs/source/tuto_network_calibration/fig/pingpong_real.drawio + docs/source/tuto_network_calibration/fig/pingpong_real.png + docs/source/tuto_network_calibration/fig/pingpong_simgrid.drawio + docs/source/tuto_network_calibration/fig/pingpong_simgrid.png + docs/source/tuto_network_calibration/isend_ckmeans.json + docs/source/tuto_network_calibration/isend_dhist.json + docs/source/tuto_network_calibration/network_calibration_tutorial.rst + docs/source/tuto_network_calibration/pingpong_ckmeans.json + docs/source/tuto_network_calibration/pingpong_dhist.json + docs/source/tuto_network_calibration/plot_ckmeans_PingPong.png + docs/source/tuto_network_calibration/plot_dhist_PingPong.png + docs/source/tuto_network_calibration/plot_op_average.png + docs/source/tuto_network_calibration/plot_op_raw.png + docs/source/tuto_network_calibration/plot_op_segmented.png + docs/source/tuto_network_calibration/plot_op_simgrid_ckmeans.png + docs/source/tuto_network_calibration/plot_op_simgrid_dhist.png + docs/source/tuto_network_calibration/recv_ckmeans.json + docs/source/tuto_network_calibration/recv_dhist.json + docs/source/tuto_network_calibration/send_ckmeans.json + docs/source/tuto_network_calibration/send_dhist.json + docs/source/tuto_network_calibration/Utils.cpp + docs/source/tuto_network_calibration/Utils.hpp docs/source/Tutorial_Model-checking.rst @@ -1020,29 +1010,27 @@ set(CMAKEFILES_TXT examples/c/CMakeLists.txt examples/cpp/CMakeLists.txt examples/smpi/CMakeLists.txt + examples/smpi/comm_dynamic_costs/CMakeLists.txt examples/smpi/NAS/CMakeLists.txt examples/smpi/smpi_s4u_masterworker/CMakeLists.txt examples/smpi/replay_multiple/CMakeLists.txt examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt examples/python/CMakeLists.txt examples/deprecated/java/CMakeLists.txt - examples/deprecated/msg/mc/CMakeLists.txt - examples/deprecated/simdag/CMakeLists.txt teshsuite/java/CMakeLists.txt teshsuite/kernel/CMakeLists.txt - teshsuite/lua/CMakeLists.txt teshsuite/mc/CMakeLists.txt teshsuite/models/CMakeLists.txt teshsuite/msg/CMakeLists.txt + teshsuite/platforms/CMakeLists.txt teshsuite/python/CMakeLists.txt teshsuite/s4u/CMakeLists.txt - teshsuite/simdag/CMakeLists.txt teshsuite/smpi/CMakeLists.txt teshsuite/surf/CMakeLists.txt teshsuite/xbt/CMakeLists.txt - teshsuite/smpi/isp/umpire/CMakeLists.txt + teshsuite/smpi/MBI/CMakeLists.txt teshsuite/smpi/mpich3-test/CMakeLists.txt teshsuite/smpi/mpich3-test/attr/CMakeLists.txt teshsuite/smpi/mpich3-test/coll/CMakeLists.txt @@ -1100,7 +1088,6 @@ set(CMAKE_SOURCE_FILES tools/cmake/Modules/FindLibelf.cmake tools/cmake/Modules/FindLibunwind.cmake tools/cmake/Modules/FindLibevent.cmake - tools/cmake/Modules/FindLuaSimgrid.cmake tools/cmake/Modules/FindNS3.cmake tools/cmake/Modules/FindPAPI.cmake tools/cmake/Modules/pybind11Config.cmake @@ -1115,6 +1102,7 @@ set(CMAKE_SOURCE_FILES tools/cmake/test_prog/prog_stacksetup.c tools/cmake/test_prog/prog_tsan.cpp tools/cmake/cross-mingw.cmake + tools/simgrid-monkey tools/smpi/generate_smpi_defines.pl tools/stack-cleaner/as tools/stack-cleaner/cc @@ -1134,10 +1122,11 @@ set(PLATFORMS_EXAMPLES examples/platforms/bypassRoute.xml examples/platforms/cloud.xml examples/platforms/cluster_backbone.xml + examples/platforms/cluster_backbone.svg examples/platforms/cluster_multi.xml examples/platforms/cluster_and_one_host.xml - examples/platforms/cluster_prototype.lua examples/platforms/cluster_crossbar.xml + examples/platforms/cluster_crossbar.svg examples/platforms/cluster_fat_tree.xml examples/platforms/cluster_fat_tree.svg examples/platforms/cluster_torus.xml @@ -1151,7 +1140,6 @@ set(PLATFORMS_EXAMPLES examples/platforms/config.xml examples/platforms/config_tracing.xml examples/platforms/model_checker_platform.xml - examples/platforms/profiles/bourassa_state.profile examples/platforms/profiles/fafard_state.profile examples/platforms/profiles/faulty_host.profile examples/platforms/profiles/ginette_state.profile @@ -1166,6 +1154,7 @@ set(PLATFORMS_EXAMPLES examples/platforms/profiles/trace_B.txt examples/platforms/data_center.xml examples/platforms/dogbone.xml + examples/platforms/energy_boot.xml examples/platforms/energy_platform.xml examples/platforms/energy_cluster.xml examples/platforms/faulty_host.xml @@ -1180,15 +1169,12 @@ set(PLATFORMS_EXAMPLES examples/platforms/ptask_L07.xml examples/platforms/prop.xml examples/platforms/routing_cluster.xml - examples/platforms/routing_cluster.lua examples/platforms/routing_cluster.cpp - examples/platforms/routing_none.xml examples/platforms/simulacrum_7_hosts.xml examples/platforms/storage/content/small_content.txt examples/platforms/storage/content/storage_content.txt examples/platforms/small_platform.xml - examples/platforms/small_platform.lua - examples/platforms/small_platform_constant.xml + examples/platforms/small_platform_routing_none.xml examples/platforms/small_platform_failures.xml examples/platforms/small_platform_fatpipe.xml examples/platforms/small_platform_one_link_routes.xml