From: Martin Quinson Date: Fri, 31 Mar 2023 15:59:36 +0000 (+0000) Subject: Merge branch 'master' into 'master' X-Git-Tag: v3.34~240 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b519c710a179e22b19c6d21721c6c0dfd13e65ce?hp=-c Merge branch 'master' into 'master' Guiding Backtrack in DFSExplorer See merge request simgrid/simgrid!143 --- b519c710a179e22b19c6d21721c6c0dfd13e65ce diff --combined MANIFEST.in index 1edd9e23de,8f6ca8572a..ce4e41580c --- a/MANIFEST.in +++ b/MANIFEST.in @@@ -162,13 -162,6 +162,13 @@@ include examples/cpp/app-masterworkers/ include examples/cpp/app-masterworkers/s4u-app-masterworkers_d.xml include examples/cpp/app-token-ring/s4u-app-token-ring.cpp include examples/cpp/app-token-ring/s4u-app-token-ring.tesh +include examples/cpp/battery-degradation/plot_battery_degradation.py +include examples/cpp/battery-degradation/s4u-battery-degradation.cpp +include examples/cpp/battery-degradation/s4u-battery-degradation.tesh +include examples/cpp/battery-energy/s4u-battery-energy.cpp +include examples/cpp/battery-energy/s4u-battery-energy.tesh +include examples/cpp/battery-simple/s4u-battery-simple.cpp +include examples/cpp/battery-simple/s4u-battery-simple.tesh include examples/cpp/cloud-capping/s4u-cloud-capping.cpp include examples/cpp/cloud-capping/s4u-cloud-capping.tesh include examples/cpp/cloud-migration/s4u-cloud-migration.cpp @@@ -206,23 -199,14 +206,23 @@@ include examples/cpp/dag-comm/s4u-dag-c include examples/cpp/dag-comm/s4u-dag-comm.tesh include examples/cpp/dag-failure/s4u-dag-failure.cpp include examples/cpp/dag-failure/s4u-dag-failure.tesh +include examples/cpp/dag-from-dax-simple/dag.xml +include examples/cpp/dag-from-dax-simple/s4u-dag-from-dax-simple.cpp +include examples/cpp/dag-from-dax-simple/s4u-dag-from-dax-simple.tesh include examples/cpp/dag-from-dax/s4u-dag-from-dax.cpp include examples/cpp/dag-from-dax/s4u-dag-from-dax.tesh include examples/cpp/dag-from-dax/simple_dax_with_cycle.xml include examples/cpp/dag-from-dax/smalldax.xml +include examples/cpp/dag-from-dot-simple/dag.dot +include examples/cpp/dag-from-dot-simple/s4u-dag-from-dot-simple.cpp +include examples/cpp/dag-from-dot-simple/s4u-dag-from-dot-simple.tesh include examples/cpp/dag-from-dot/dag.dot include examples/cpp/dag-from-dot/dag_with_cycle.dot include examples/cpp/dag-from-dot/s4u-dag-from-dot.cpp include examples/cpp/dag-from-dot/s4u-dag-from-dot.tesh +include examples/cpp/dag-from-json-simple/dag.json +include examples/cpp/dag-from-json-simple/s4u-dag-from-json-simple.cpp +include examples/cpp/dag-from-json-simple/s4u-dag-from-json-simple.tesh include examples/cpp/dag-io/s4u-dag-io.cpp include examples/cpp/dag-io/s4u-dag-io.tesh include examples/cpp/dag-scheduling/Montage_25.xml @@@ -230,8 -214,6 +230,8 @@@ include examples/cpp/dag-scheduling/s4u include examples/cpp/dag-scheduling/s4u-dag-scheduling.tesh include examples/cpp/dag-simple/s4u-dag-simple.cpp include examples/cpp/dag-simple/s4u-dag-simple.tesh +include examples/cpp/dag-tuto/s4u-dag-tuto.cpp +include examples/cpp/dag-tuto/s4u-dag-tuto.tesh include examples/cpp/dht-chord/s4u-dht-chord-node.cpp include examples/cpp/dht-chord/s4u-dht-chord.cpp include examples/cpp/dht-chord/s4u-dht-chord.hpp @@@ -1696,10 -1678,6 +1696,10 @@@ include docs/source/app_smpi.rs include docs/source/application.rst include docs/source/community.rst include docs/source/conf.py +include docs/source/img/battery_degradation.svg +include docs/source/img/dag.svg +include docs/source/img/dag1.svg +include docs/source/img/dag2.svg include docs/source/img/design-scheduling-parallel.svg include docs/source/img/design-scheduling-simulatedtime.svg include docs/source/img/design-scheduling-wallclock.svg @@@ -1721,6 -1699,17 +1721,6 @@@ include docs/source/img/zoom_comm.drawi include docs/source/img/zoom_comm.svg include docs/source/index.rst include docs/source/intl.rst -include docs/source/tuto_dag/dag_lab1.cpp -include docs/source/tuto_dag/dag_lab2-1.cpp -include docs/source/tuto_dag/dag_lab2-2.cpp -include docs/source/tuto_dag/dag_lab2-3.cpp -include docs/source/tuto_dag/img/dag.svg -include docs/source/tuto_dag/img/dag1.svg -include docs/source/tuto_dag/img/dag2.svg -include docs/source/tuto_dag/simple_dax.xml -include docs/source/tuto_dag/simple_dot.dot -include docs/source/tuto_dag/simple_json.json -include docs/source/tuto_dag/small_platform.xml include docs/source/tuto_disk/CMakeLists.txt include docs/source/tuto_disk/Dockerfile include docs/source/tuto_disk/analysis.irst @@@ -1787,7 -1776,6 +1787,7 @@@ include examples/README.rs include examples/c/CMakeLists.txt include examples/cpp/CMakeLists.txt include examples/platforms/CMakeLists.txt +include examples/platforms/battery_platform.xml include examples/platforms/bypassRoute.xml include examples/platforms/bypassZoneRoute.xml include examples/platforms/cloud.xml @@@ -1916,7 -1904,6 +1916,7 @@@ include include/simgrid/mailbox. include include/simgrid/modelchecker.h include include/simgrid/mutex.h include include/simgrid/plugins/ProducerConsumer.hpp +include include/simgrid/plugins/battery.hpp include include/simgrid/plugins/dvfs.h include include/simgrid/plugins/energy.h include include/simgrid/plugins/file_system.h @@@ -2166,8 -2153,9 +2166,9 @@@ include src/mc/api/RemoteApp.cp include src/mc/api/RemoteApp.hpp include src/mc/api/State.cpp include src/mc/api/State.hpp - include src/mc/api/guide/BasicGuide.hpp - include src/mc/api/guide/GuidedState.hpp + include src/mc/api/strategy/BasicStrategy.hpp + include src/mc/api/strategy/Strategy.hpp + include src/mc/api/strategy/WaitStrategy.hpp include src/mc/compare.cpp include src/mc/datatypes.h include src/mc/explo/CommunicationDeterminismChecker.cpp @@@ -2267,7 -2255,6 +2268,7 @@@ include src/mc/transition/TransitionRan include src/mc/transition/TransitionSynchro.cpp include src/mc/transition/TransitionSynchro.hpp include src/plugins/ProducerConsumer.cpp +include src/plugins/battery.cpp include src/plugins/chaos_monkey.cpp include src/plugins/file_system/s4u_FileSystem.cpp include src/plugins/host_dvfs.cpp diff --combined tools/cmake/DefinePackages.cmake index 7f458ab88f,8557f1f02c..ce4633f4a1 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@@ -453,7 -453,6 +453,7 @@@ set(PLUGINS_SR src/plugins/vm/VmLiveMigration.cpp src/plugins/vm/VmLiveMigration.hpp src/plugins/vm/dirty_page_tracking.cpp + src/plugins/battery.cpp ) @@@ -600,8 -599,6 +600,6 @@@ set(MC_SR src/mc/transition/TransitionSynchro.cpp src/mc/transition/TransitionSynchro.hpp - src/mc/api/guide/BasicGuide.hpp - src/mc/api/guide/GuidedState.hpp src/mc/api/ActorState.hpp src/mc/api/State.cpp src/mc/api/State.hpp @@@ -617,6 -614,10 +615,10 @@@ src/mc/mc_private.hpp src/mc/mc_record.cpp + src/mc/api/strategy/BasicStrategy.hpp + src/mc/api/strategy/Strategy.hpp + src/mc/api/strategy/WaitStrategy.hpp + src/xbt/mmalloc/mm_interface.c ) @@@ -632,7 -633,6 +634,7 @@@ set(headers_to_instal include/simgrid/chrono.hpp include/simgrid/plugins/dvfs.h include/simgrid/plugins/energy.h + include/simgrid/plugins/battery.hpp include/simgrid/plugins/file_system.h include/simgrid/plugins/live_migration.h include/simgrid/plugins/load.h @@@ -876,10 -876,17 +878,10 @@@ set(DOC_SOURCE docs/source/tuto_s4u/master-workers-lab4.cpp docs/source/Tutorial_DAG.rst - docs/source/tuto_dag/dag_lab1.cpp - docs/source/tuto_dag/dag_lab2-1.cpp - docs/source/tuto_dag/dag_lab2-2.cpp - docs/source/tuto_dag/dag_lab2-3.cpp - docs/source/tuto_dag/img/dag1.svg - docs/source/tuto_dag/img/dag2.svg - docs/source/tuto_dag/img/dag.svg - docs/source/tuto_dag/simple_dax.xml - docs/source/tuto_dag/simple_dot.dot - docs/source/tuto_dag/simple_json.json - docs/source/tuto_dag/small_platform.xml + docs/source/img/battery_degradation.svg + docs/source/img/dag1.svg + docs/source/img/dag2.svg + docs/source/img/dag.svg docs/source/Tutorial_MPI_Applications.rst docs/source/tuto_smpi/3hosts.png @@@ -1071,7 -1078,6 +1073,7 @@@ set(CMAKE_SOURCE_FILE ) set(PLATFORMS_EXAMPLES + examples/platforms/battery_platform.xml examples/platforms/bypassRoute.xml examples/platforms/bypassZoneRoute.xml examples/platforms/cloud.xml