Merge remote-tracking branch 'upstream/master' into issue95

diff --combined .gitignore
index a43677c,d17cdad..5a680b9
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -34,11 -34,8 +34,8 @@@ CTestCustom.cmak
  CTestResults.xml
  
  ### Maintainer mode
- src/simdag/dax_dtd.l
+ src/dag/dax_dtd.l
  src/surf/xml/simgrid_dtd.l
- ### Jedule
- examples/deprecated/simdag/scheduling/sd_scheduling.jed
- teshsuite/simdag/platforms/simgrid.jed
  ### Libraries links
  [Ss]im[Gg]rid-*.tar.gz
  simgrid.jar
@@@ -152,8 -149,6 +149,6 @@@ examples/c/platform-failures/c-platform
  examples/c/platform-properties/c-platform-properties
  examples/c/plugin-host-load/c-plugin-host-load
  examples/c/synchro-semaphore/c-synchro-semaphore
- examples/deprecated/msg/mc/bugged2_liveness
- examples/deprecated/msg/mc/centralized_mutex
  examples/cpp/actor-create/s4u-actor-create
  examples/cpp/actor-daemon/s4u-actor-daemon
  examples/cpp/actor-exiting/s4u-actor-exiting
@@@ -172,15 -167,26 +167,26 @@@ examples/cpp/app-token-ring/s4u-app-tok
  examples/cpp/cloud-capping/s4u-cloud-capping
  examples/cpp/cloud-migration/s4u-cloud-migration
  examples/cpp/cloud-simple/s4u-cloud-simple
+ examples/cpp/clusters-multicpu/s4u-clusters-multicpu
  examples/cpp/comm-dependent/s4u-comm-dependent
+ examples/cpp/comm-failure/s4u-comm-failure
  examples/cpp/comm-host2host/s4u-comm-host2host
  examples/cpp/comm-pingpong/s4u-comm-pingpong
  examples/cpp/comm-ready/s4u-comm-ready
+ examples/cpp/comm-serialize/s4u-comm-serialize
  examples/cpp/comm-suspend/s4u-comm-suspend
+ examples/cpp/comm-throttling/s4u-comm-throttling
  examples/cpp/comm-wait/s4u-comm-wait
  examples/cpp/comm-waitall/s4u-comm-waitall
  examples/cpp/comm-waitany/s4u-comm-waitany
  examples/cpp/comm-waituntil/s4u-comm-waituntil
+ examples/cpp/dag-comm/s4u-dag-comm
+ examples/cpp/dag-failure/s4u-dag-failure
+ examples/cpp/dag-from-dax/s4u-dag-from-dax
+ examples/cpp/dag-from-dot/s4u-dag-from-dot
+ examples/cpp/dag-io/s4u-dag-io
+ examples/cpp/dag-scheduling/s4u-dag-scheduling
+ examples/cpp/dag-simple/s4u-dag-simple
  examples/cpp/dht-chord/s4u-dht-chord
  examples/cpp/dht-kademlia/s4u-dht-kademlia
  examples/cpp/energy-boot/s4u-energy-boot
@@@ -190,28 -196,37 +196,38 @@@ examples/cpp/energy-link/s4u-energy-lin
  examples/cpp/energy-vm/s4u-energy-vm
  examples/cpp/energy-wifi/s4u-energy-wifi
  examples/cpp/engine-filtering/s4u-engine-filtering
+ examples/cpp/engine-run-partial/s4u-engine-run-partial
  examples/cpp/exec-async/s4u-exec-async
  examples/cpp/exec-basic/s4u-exec-basic
+ examples/cpp/exec-cpu-factors/s4u-exec-cpu-factors
+ examples/cpp/exec-cpu-nonlinear/s4u-exec-cpu-nonlinear
  examples/cpp/exec-dependent/s4u-exec-dependent
  examples/cpp/exec-dvfs/s4u-exec-dvfs
+ examples/cpp/exec-failure/s4u-exec-failure
  examples/cpp/exec-ptask/s4u-exec-ptask
  examples/cpp/exec-ptask-multicore/s4u-exec-ptask-multicore
 +examples/cpp/exec-ptask-multicore-latency/s4u-exec-ptask-multicore-latency
  examples/cpp/exec-remote/s4u-exec-remote
  examples/cpp/exec-unassigned/s4u-exec-unassigned
  examples/cpp/exec-waitany/s4u-exec-waitany
  examples/cpp/exec-waitfor/s4u-exec-waitfor
  examples/cpp/io-async/s4u-io-async
  examples/cpp/io-dependent/s4u-io-dependent
+ examples/cpp/io-degradation/s4u-io-degradation
  examples/cpp/io-disk-raw/s4u-io-disk-raw
  examples/cpp/io-file-remote/s4u-io-file-remote
  examples/cpp/io-file-system/s4u-io-file-system
+ examples/cpp/io-priority/s4u-io-priority
  examples/cpp/maestro-set/s4u-maestro-set
  examples/cpp/mc-bugged1/s4u-mc-bugged1
  examples/cpp/mc-bugged1-liveness/s4u-mc-bugged1-liveness
  examples/cpp/mc-bugged2/s4u-mc-bugged2
+ examples/cpp/mc-bugged2-liveness/s4u-mc-bugged2-liveness
+ examples/cpp/mc-centralized-mutex/s4u-mc-centralized-mutex
  examples/cpp/mc-electric-fence/s4u-mc-electric-fence
  examples/cpp/mc-failing-assert/s4u-mc-failing-assert
+ examples/cpp/network-factors/s4u-network-factors
+ examples/cpp/network-nonlinear/s4u-network-nonlinear
  examples/cpp/network-ns3/s4u-network-ns3
  examples/cpp/network-ns3-wifi/s4u-network-ns3-wifi
  examples/cpp/network-wifi/s4u-network-wifi
@@@ -229,6 -244,7 +245,7 @@@ examples/cpp/synchro-condition-variable
  examples/cpp/synchro-condition-variable-waituntil/s4u-synchro-condition-variable-waituntil
  examples/cpp/synchro-mutex/s4u-synchro-mutex
  examples/cpp/synchro-semaphore/s4u-synchro-semaphore
+ examples/cpp/torus-multicpu/
  examples/cpp/trace-categories/s4u-trace-categories
  examples/cpp/trace-host-user-variables/s4u-trace-host-user-variables
  examples/cpp/trace-link-user-variables/s4u-trace-link-user-variables
@@@ -236,15 -252,6 +253,6 @@@ examples/cpp/trace-masterworkers/s4u-tr
  examples/cpp/trace-platform/s4u-trace-platform
  examples/cpp/trace-process-migration/s4u-trace-process-migration
  examples/cpp/trace-route-user-variables/s4u-trace-route-user-variables
- examples/deprecated/simdag/dag-dotload/sd_dag-dotload
- examples/deprecated/simdag/daxload/sd_daxload
- examples/deprecated/simdag/fail/sd_fail
- examples/deprecated/simdag/ptg-dotload/sd_ptg-dotload
- examples/deprecated/simdag/schedule-dotload/sd_schedule-dotload
- examples/deprecated/simdag/scheduling/sd_scheduling
- examples/deprecated/simdag/test/sd_test
- examples/deprecated/simdag/throttling/sd_throttling
- examples/deprecated/simdag/typed_tasks/sd_typed_tasks
  examples/smpi/ampi_test/smpi_ampi_test
  examples/smpi/energy/smpi_energy
  examples/smpi/gemm/smpi_gemm
@@@ -291,6 -298,7 +299,7 @@@ teshsuite/models/ptask_L07_usage/ptask_
  teshsuite/models/wifi_usage/wifi_usage
  teshsuite/models/wifi_usage_decay/wifi_usage_decay
  teshsuite/msg/task_destroy_cancel/task_destroy_cancel
+ teshsuite/platforms/flatifier
  teshsuite/s4u/activity-lifecycle/activity-lifecycle
  teshsuite/s4u/actor/actor
  teshsuite/s4u/actor-autorestart/actor-autorestart
@@@ -316,9 -324,6 +325,6 @@@ teshsuite/s4u/storage_client_server/sto
  teshsuite/s4u/trace-integration/trace-integration
  teshsuite/s4u/vm-live-migration/vm-live-migration
  teshsuite/s4u/wait-any-for/wait-any-for
- teshsuite/simdag/availability/availability
- teshsuite/simdag/flatifier/flatifier
- teshsuite/simdag/incomplete/incomplete
  teshsuite/smpi/auto-shared/auto-shared
  teshsuite/smpi/bug-17132/bug-17132
  teshsuite/smpi/coll-allgather/coll-allgather

diff --combined ChangeLog
index 2acddeb,e4e7958..52bbec7
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -2,12 -2,31 +2,31 @@@
  
  SimGrid (3.29.1) NOT RELEASED YET (v3.30 expected December 21. 2021, 15:59 UTC)
  
+ Main user-visible changes:
+  - The SimDag API for the simulation of the scheduling of Directed Acyclic 
+     Graphs has been dropped. It was marked as deprecated for a couple of years. 
+     We finally complete the implementation of what has been called SimDag++ 
+     internally, i.e., porting the different features of SimDag on top of S4U. 
+     The new way to simulate the execution of dependent activities directly by 
+     maestro (without any other actor) is details in the examples/cpp/dag-* series
+     of examples. 
+  - The removal of SimDag led us to also remove the export to Jedule files that 
+    was tightly coupled to SimDag. The instrumentation of DAG simulation is still 
+    possible through the regular instrumentation API based on the Paje format. 
+    
  S4U:
   - New function: Engine::run_until(date), to split the simulation.
   - New signal: Activity::on_veto, to detect when an activity fails to start.
   - New function: Engine::track_vetoed_activities() to interrupt run()
     when an activity fails to start, and to keep track of such activities.
     Please see the corresponding example for more info.
+  - Introduce on_X_cb() functions for all signals, to attach a new
+    callback to the signal X. The signal variables are now hidden and
+    only these functions should be used.
+    Rational: this enables the usual deprecation schema where functions
+    remain for 4 releases when we need to modify the signals, while the
+    current code with the signal variables directly visible prevent any
+    smooth transition.
  
  SMPI:
   - Dynamic costs for MPI operations: New API to allow users to dynamically
@@@ -17,6 -36,7 +36,7 @@@
  Documentation:
   - New section: "SimGrid MPI calibration of a Grid5000 cluster"
     presenting how to properly calibrate MPI communications in SimGrid.
+  - Complete and reword the platform section, which is now completed.
  
  Python:
   - Thread contexts are used by default with Python bindings.  Other kinds of
@@@ -24,8 -44,8 +44,9 @@@
  
  Fixed bugs (FG#.. -> FramaGit bugs; FG!.. -> FG merge requests)
   (FG: issues on Framagit; GF: issues on GForge; GH: issues on GitHub)
 -
 + - FG#95: Wrong computation time for multicore execution after pstate change
 + - FG#97: Wrong computation time for ptask+multicore+pstates
+  - FG#99: Weird segfault when not sealing an host
  ----------------------------------------------------------------------------
  
  SimGrid (3.29) October 7. 2021

diff --combined MANIFEST.in
index 8cfac90,4ad8115..29c5e33
--- 1/MANIFEST.in
--- 2/MANIFEST.in
+++ b/MANIFEST.in
@@@ -146,7 -146,6 +146,6 @@@ include examples/cpp/actor-suspend/s4u-
  include examples/cpp/actor-suspend/s4u-actor-suspend.tesh
  include examples/cpp/actor-yield/s4u-actor-yield.cpp
  include examples/cpp/actor-yield/s4u-actor-yield.tesh
- include examples/cpp/actor-yield/s4u-actor-yield_d.xml
  include examples/cpp/app-bittorrent/s4u-app-bittorrent.tesh
  include examples/cpp/app-bittorrent/s4u-app-bittorrent_d.xml
  include examples/cpp/app-bittorrent/s4u-bittorrent.cpp
@@@ -182,17 -181,14 +181,14 @@@ include examples/cpp/comm-pingpong/s4u-
  include examples/cpp/comm-pingpong/simix-breakpoint.tesh
  include examples/cpp/comm-ready/s4u-comm-ready.cpp
  include examples/cpp/comm-ready/s4u-comm-ready.tesh
- include examples/cpp/comm-ready/s4u-comm-ready_d.xml
  include examples/cpp/comm-serialize/s4u-comm-serialize.cpp
  include examples/cpp/comm-serialize/s4u-comm-serialize.tesh
  include examples/cpp/comm-suspend/s4u-comm-suspend.cpp
  include examples/cpp/comm-suspend/s4u-comm-suspend.tesh
- include examples/cpp/comm-suspend/s4u-comm-suspend_d.xml
  include examples/cpp/comm-throttling/s4u-comm-throttling.cpp
  include examples/cpp/comm-throttling/s4u-comm-throttling.tesh
  include examples/cpp/comm-wait/s4u-comm-wait.cpp
  include examples/cpp/comm-wait/s4u-comm-wait.tesh
- include examples/cpp/comm-wait/s4u-comm-wait_d.xml
  include examples/cpp/comm-waitall/s4u-comm-waitall.cpp
  include examples/cpp/comm-waitall/s4u-comm-waitall.tesh
  include examples/cpp/comm-waitall/s4u-comm-waitall_d.xml
@@@ -201,17 -197,23 +197,23 @@@ include examples/cpp/comm-waitany/s4u-c
  include examples/cpp/comm-waitany/s4u-comm-waitany_d.xml
  include examples/cpp/comm-waituntil/s4u-comm-waituntil.cpp
  include examples/cpp/comm-waituntil/s4u-comm-waituntil.tesh
- include examples/cpp/comm-waituntil/s4u-comm-waituntil_d.xml
  include examples/cpp/dag-comm/s4u-dag-comm.cpp
  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/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/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-io/s4u-dag-io.cpp
  include examples/cpp/dag-io/s4u-dag-io.tesh
+ include examples/cpp/dag-scheduling/Montage_25.xml
+ include examples/cpp/dag-scheduling/s4u-dag-scheduling.cpp
+ 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/dht-chord/s4u-dht-chord-node.cpp
@@@ -262,8 -264,6 +264,8 @@@ include examples/cpp/exec-dvfs/s4u-exec
  include examples/cpp/exec-dvfs/s4u-exec-dvfs.tesh
  include examples/cpp/exec-failure/s4u-exec-failure.cpp
  include examples/cpp/exec-failure/s4u-exec-failure.tesh
 +include examples/cpp/exec-ptask-multicore-latency/s4u-exec-ptask-multicore-latency.cpp
 +include examples/cpp/exec-ptask-multicore-latency/s4u-exec-ptask-multicore-latency.tesh
  include examples/cpp/exec-ptask-multicore/s4u-exec-ptask-multicore.cpp
  include examples/cpp/exec-ptask-multicore/s4u-exec-ptask-multicore.tesh
  include examples/cpp/exec-ptask/s4u-exec-ptask.cpp
@@@ -300,8 -300,13 +302,13 @@@ include examples/cpp/mc-bugged1-livenes
  include examples/cpp/mc-bugged1-liveness/s4u-mc-bugged1-liveness.tesh
  include examples/cpp/mc-bugged1/s4u-mc-bugged1.cpp
  include examples/cpp/mc-bugged1/s4u-mc-bugged1.tesh
+ include examples/cpp/mc-bugged2-liveness/promela_bugged2_liveness
+ include examples/cpp/mc-bugged2-liveness/s4u-mc-bugged2-liveness.cpp
+ include examples/cpp/mc-bugged2-liveness/s4u-mc-bugged2-liveness.tesh
  include examples/cpp/mc-bugged2/s4u-mc-bugged2.cpp
  include examples/cpp/mc-bugged2/s4u-mc-bugged2.tesh
+ include examples/cpp/mc-centralized-mutex/s4u-mc-centralized-mutex.cpp
+ include examples/cpp/mc-centralized-mutex/s4u-mc-centralized-mutex.tesh
  include examples/cpp/mc-electric-fence/s4u-mc-electric-fence.cpp
  include examples/cpp/mc-electric-fence/s4u-mc-electric-fence.tesh
  include examples/cpp/mc-failing-assert/s4u-mc-failing-assert.cpp
@@@ -487,21 -492,6 +494,6 @@@ include examples/deprecated/java/trace/
  include examples/deprecated/java/trace/pingpong/Receiver.java
  include examples/deprecated/java/trace/pingpong/Sender.java
  include examples/deprecated/java/trace/pingpong/trace-pingpong.tesh
- include examples/deprecated/msg/mc/bugged2-liveness.tesh
- include examples/deprecated/msg/mc/bugged2_liveness.c
- include examples/deprecated/msg/mc/centralized_mutex.c
- include examples/deprecated/msg/mc/centralized_mutex.tesh
- include examples/deprecated/msg/mc/deploy_bugged2_liveness.xml
- include examples/deprecated/msg/mc/deploy_centralized_mutex.xml
- include examples/deprecated/msg/mc/promela_bugged2_liveness
- include examples/deprecated/simdag/daxload/sd_daxload.c
- include examples/deprecated/simdag/daxload/sd_daxload.tesh
- include examples/deprecated/simdag/daxload/simple_dax_with_cycle.xml
- include examples/deprecated/simdag/daxload/smalldax.xml
- include examples/deprecated/simdag/scheduling/Montage_25.xml
- include examples/deprecated/simdag/scheduling/expected_output.jed
- include examples/deprecated/simdag/scheduling/sd_scheduling.c
- include examples/deprecated/simdag/scheduling/sd_scheduling.tesh
  include examples/python/actor-create/actor-create.py
  include examples/python/actor-create/actor-create.tesh
  include examples/python/actor-daemon/actor-daemon.py
@@@ -713,6 -703,39 +705,39 @@@ include teshsuite/models/wifi_usage_dec
  include teshsuite/models/wifi_usage_decay/wifi_usage_decay.tesh
  include teshsuite/msg/task_destroy_cancel/task_destroy_cancel.c
  include teshsuite/msg/task_destroy_cancel/task_destroy_cancel.tesh
+ include teshsuite/platforms/Dijkstra.xml
+ include teshsuite/platforms/bob.trace
+ include teshsuite/platforms/bogus_missing_dst_gateway.xml
+ include teshsuite/platforms/bogus_missing_gateway.tesh
+ include teshsuite/platforms/bogus_missing_src_gateway.xml
+ include teshsuite/platforms/bogus_two_hosts_asymetric.tesh
+ include teshsuite/platforms/bogus_two_hosts_asymetric.xml
+ include teshsuite/platforms/carol.fail
+ include teshsuite/platforms/cluster_dragonfly_noncontiguous_rad.xml
+ include teshsuite/platforms/cluster_fat_tree_noncontiguous_rad.xml
+ include teshsuite/platforms/cluster_torus_noncontiguous_rad.xml
+ include teshsuite/platforms/erin.avail
+ include teshsuite/platforms/flatifier.cpp
+ include teshsuite/platforms/flatifier.tesh
+ include teshsuite/platforms/four_hosts_floyd.xml
+ include teshsuite/platforms/host_attributes.xml
+ include teshsuite/platforms/link.bw
+ include teshsuite/platforms/link.fail
+ include teshsuite/platforms/link.lat
+ include teshsuite/platforms/link_attributes.xml
+ include teshsuite/platforms/one_cluster.xml
+ include teshsuite/platforms/one_cluster_multicore.xml
+ include teshsuite/platforms/one_cluster_router_id.xml
+ include teshsuite/platforms/one_cluster_splitduplex.xml
+ include teshsuite/platforms/properties.xml
+ include teshsuite/platforms/test_of_is_router.xml
+ include teshsuite/platforms/three_hosts_non_symmetric_route.xml
+ include teshsuite/platforms/two_clusters.xml
+ include teshsuite/platforms/two_clusters_one_name.xml
+ include teshsuite/platforms/two_clusters_router_id.xml
+ include teshsuite/platforms/two_hosts_multi_hop.xml
+ include teshsuite/platforms/two_hosts_one_link.xml
+ include teshsuite/platforms/two_hosts_one_link_splitduplex.xml
  include teshsuite/python/borken-context/borken-context.py
  include teshsuite/python/borken-context/borken-context.tesh
  include teshsuite/python/borken-context/borken-context_d.xml
@@@ -807,39 -830,6 +832,6 @@@ include teshsuite/s4u/wait-all-for/wait
  include teshsuite/s4u/wait-all-for/wait-all-for.tesh
  include teshsuite/s4u/wait-any-for/wait-any-for.cpp
  include teshsuite/s4u/wait-any-for/wait-any-for.tesh
- include teshsuite/simdag/flatifier/bogus_missing_gateway.tesh
- include teshsuite/simdag/flatifier/bogus_two_hosts_asymetric.tesh
- include teshsuite/simdag/flatifier/flatifier.cpp
- include teshsuite/simdag/flatifier/flatifier.tesh
- include teshsuite/simdag/platforms/Dijkstra.xml
- include teshsuite/simdag/platforms/bob.trace
- include teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml
- include teshsuite/simdag/platforms/bogus_missing_src_gateway.xml
- include teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml
- include teshsuite/simdag/platforms/carol.fail
- include teshsuite/simdag/platforms/cluster_dragonfly_noncontiguous_rad.xml
- include teshsuite/simdag/platforms/cluster_fat_tree_noncontiguous_rad.xml
- include teshsuite/simdag/platforms/cluster_torus_noncontiguous_rad.xml
- include teshsuite/simdag/platforms/erin.avail
- include teshsuite/simdag/platforms/four_hosts_floyd.xml
- include teshsuite/simdag/platforms/host_attributes.xml
- include teshsuite/simdag/platforms/link.bw
- include teshsuite/simdag/platforms/link.fail
- include teshsuite/simdag/platforms/link.lat
- include teshsuite/simdag/platforms/link_attributes.xml
- include teshsuite/simdag/platforms/one_cluster.xml
- include teshsuite/simdag/platforms/one_cluster_multicore.xml
- include teshsuite/simdag/platforms/one_cluster_router_id.xml
- include teshsuite/simdag/platforms/one_cluster_splitduplex.xml
- include teshsuite/simdag/platforms/properties.xml
- include teshsuite/simdag/platforms/test_of_is_router.xml
- include teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml
- include teshsuite/simdag/platforms/two_clusters.xml
- include teshsuite/simdag/platforms/two_clusters_one_name.xml
- include teshsuite/simdag/platforms/two_clusters_router_id.xml
- include teshsuite/simdag/platforms/two_hosts_multi_hop.xml
- include teshsuite/simdag/platforms/two_hosts_one_link.xml
- include teshsuite/simdag/platforms/two_hosts_one_link_splitduplex.xml
  include teshsuite/smpi/auto-shared/auto-shared.c
  include teshsuite/smpi/auto-shared/auto-shared.tesh
  include teshsuite/smpi/bug-17132/bug-17132.c
@@@ -1814,7 -1804,6 +1806,6 @@@ include doc/doxygen/module-surf.do
  include doc/doxygen/outcomes_vizu.doc
  include doc/doxygen/platform.doc
  include doc/doxygen/uhood.doc
- include doc/doxygen/uhood_arch.doc
  include doc/doxygen/uhood_switch.doc
  include docs/Build.sh
  include docs/README.md
@@@ -1828,6 -1817,7 +1819,7 @@@ include docs/manpages/smpiff.
  include docs/manpages/smpirun.1
  include docs/manpages/tesh.pod
  include docs/requirements.txt
+ include docs/source/Calibrating_the_models.rst
  include docs/source/Configuring_SimGrid.rst
  include docs/source/Deploying_your_application.rst
  include docs/source/Design_goals.rst
@@@ -1835,12 -1825,12 +1827,12 @@@ include docs/source/Doxyfil
  include docs/source/Experimental_setup.rst
  include docs/source/Installing_SimGrid.rst
  include docs/source/Introduction.rst
+ include docs/source/Modeling_howtos.rst
  include docs/source/Models.rst
  include docs/source/Outcomes.rst
  include docs/source/Platform.rst
  include docs/source/Platform_cpp.rst
  include docs/source/Platform_examples.rst
- include docs/source/Platform_howtos.rst
  include docs/source/Platform_routing.rst
  include docs/source/Plugins.rst
  include docs/source/Release_Notes.rst
@@@ -1956,14 -1946,14 +1948,14 @@@ include examples/README.rs
  include examples/c/CMakeLists.txt
  include examples/cpp/CMakeLists.txt
  include examples/deprecated/java/CMakeLists.txt
- include examples/deprecated/msg/mc/CMakeLists.txt
- include examples/deprecated/simdag/CMakeLists.txt
  include examples/platforms/CMakeLists.txt
  include examples/platforms/bypassRoute.xml
  include examples/platforms/bypassZoneRoute.xml
  include examples/platforms/cloud.xml
  include examples/platforms/cluster_and_one_host.xml
+ include examples/platforms/cluster_backbone.svg
  include examples/platforms/cluster_backbone.xml
+ include examples/platforms/cluster_crossbar.svg
  include examples/platforms/cluster_crossbar.xml
  include examples/platforms/cluster_dragonfly.svg
  include examples/platforms/cluster_dragonfly.xml
@@@ -2062,10 -2052,6 +2054,6 @@@ include include/simgrid/exec.
  include include/simgrid/forward.h
  include include/simgrid/host.h
  include include/simgrid/instr.h
- include include/simgrid/jedule/jedule.hpp
- include include/simgrid/jedule/jedule_events.hpp
- include include/simgrid/jedule/jedule_platform.hpp
- include include/simgrid/jedule/jedule_sd_binding.h
  include include/simgrid/kernel/ProfileBuilder.hpp
  include include/simgrid/kernel/Timer.hpp
  include include/simgrid/kernel/future.hpp
@@@ -2116,7 -2102,6 +2104,6 @@@ include include/simgrid/s4u/NetZone.hp
  include include/simgrid/s4u/Semaphore.hpp
  include include/simgrid/s4u/VirtualMachine.hpp
  include include/simgrid/semaphore.h
- include include/simgrid/simdag.h
  include include/simgrid/simix.h
  include include/simgrid/simix.hpp
  include include/simgrid/version.h.in
@@@ -2220,6 -2205,10 +2207,10 @@@ include src/bindings/lua/lua_utils.hp
  include src/bindings/lua/simgrid_lua.cpp
  include src/bindings/lua/simgrid_lua.hpp
  include src/bindings/python/simgrid_python.cpp
+ include src/dag/dax.dtd
+ include src/dag/dax_dtd.c
+ include src/dag/dax_dtd.h
+ include src/dag/loaders.cpp
  include src/include/catch.hpp
  include src/include/mc/datatypes.h
  include src/include/mc/mc.h
@@@ -2244,10 -2233,6 +2235,6 @@@ include src/instr/instr_platform.cp
  include src/instr/instr_private.hpp
  include src/instr/instr_resource_utilization.cpp
  include src/instr/instr_smpi.hpp
- include src/instr/jedule/jedule.cpp
- include src/instr/jedule/jedule_events.cpp
- include src/instr/jedule/jedule_platform.cpp
- include src/instr/jedule/jedule_sd_binding.cpp
  include src/internal_config.h.in
  include src/kernel/EngineImpl.cpp
  include src/kernel/EngineImpl.hpp
@@@ -2452,14 -2437,6 +2439,6 @@@ include src/s4u/s4u_Mutex.cp
  include src/s4u/s4u_Netzone.cpp
  include src/s4u/s4u_Semaphore.cpp
  include src/s4u/s4u_VirtualMachine.cpp
- include src/simdag/dax.dtd
- include src/simdag/dax_dtd.c
- include src/simdag/dax_dtd.h
- include src/simdag/sd_daxloader.cpp
- include src/simdag/sd_dotloader.cpp
- include src/simdag/sd_global.cpp
- include src/simdag/sd_task.cpp
- include src/simdag/simdag_private.hpp
  include src/simgrid/Exception.cpp
  include src/simgrid/sg_config.cpp
  include src/simgrid/sg_version.cpp
@@@ -2767,9 -2744,9 +2746,9 @@@ include teshsuite/lua/lua_platforms.tes
  include teshsuite/mc/CMakeLists.txt
  include teshsuite/models/CMakeLists.txt
  include teshsuite/msg/CMakeLists.txt
+ include teshsuite/platforms/CMakeLists.txt
  include teshsuite/python/CMakeLists.txt
  include teshsuite/s4u/CMakeLists.txt
- include teshsuite/simdag/CMakeLists.txt
  include teshsuite/smpi/CMakeLists.txt
  include teshsuite/smpi/isp/umpire/CMakeLists.txt
  include teshsuite/smpi/mpich3-test/CMakeLists.txt

diff --combined examples/cpp/CMakeLists.txt
index 5899286,36fb059..00e51b3
--- 1/examples/cpp/CMakeLists.txt
--- 2/examples/cpp/CMakeLists.txt
+++ b/examples/cpp/CMakeLists.txt
@@@ -31,7 -31,6 +31,6 @@@ if(SIMGRID_HAVE_MC
    #foreach(example ) # no test to be build in any case
    #endforeach()
    
- 
    if(HAVE_C_STACK_CLEANER)
      add_executable       (s4u-mc-bugged1-liveness-cleaner-on  EXCLUDE_FROM_ALL s4u-mc-bugged1-liveness/s4u-mc-bugged1-liveness.cpp)
      target_link_libraries(s4u-mc-bugged1-liveness-cleaner-on  simgrid)
@@@ -49,9 -48,13 +48,13 @@@
      # liveness model-checking works only on 64bits (for now ...)
      set(_mc-bugged1-liveness_factories "ucontext") # Timeout
      add_dependencies(tests-mc s4u-mc-bugged1-liveness)
+     set(_mc-bugged2-liveness_factories "ucontext") # Timeout
    else()
      set(_mc-bugged1-liveness_disable 1)
    endif()
+ 
+   # This example never ends, disable it for now
+   set(_mc-bugged2-liveness_disable 1)
    
    # This example hit the 5' timeout on CI, disable it for now
    #    ADD_TESH(s4u-mc-bugged1-liveness-visited-ucontext --setenv bindir=${CMAKE_CURRENT_BINARY_DIR}/mc-bugged1-liveness
@@@ -74,8 -77,8 +77,8 @@@
    endif()
  
  else()
-   foreach (example mc-bugged1 mc-bugged2 mc-failing-assert mc-electric-fence 
-                    mc-bugged1-liveness)
+   foreach (example mc-bugged1 mc-bugged2  mc-centralized-mutex mc-failing-assert mc-electric-fence 
+                    mc-bugged1-liveness mc-bugged2-liveness)
      set(_${example}_disable 1)
    endforeach()
  endif()
@@@ -98,14 -101,14 +101,14 @@@ foreach (example actor-create actor-dae
                   comm-pingpong comm-ready comm-serialize comm-suspend comm-wait comm-waitany comm-waitall comm-waituntil
                   comm-dependent comm-host2host comm-failure comm-throttling
                   cloud-capping cloud-migration cloud-simple
-                  dag-comm dag-from-dot dag-failure dag-io dag-simple
+                  dag-comm dag-from-dax dag-from-dot dag-failure dag-io dag-scheduling dag-simple
                   dht-chord dht-kademlia
                   energy-exec energy-boot energy-link energy-vm energy-exec-ptask energy-wifi
                   engine-filtering engine-run-partial
                   exec-async exec-basic exec-dvfs exec-remote exec-waitany exec-waitfor exec-dependent exec-unassigned
 -                 exec-ptask-multicore exec-cpu-nonlinear exec-cpu-factors exec-failure
 +                 exec-ptask-multicore exec-ptask-multicore-latency exec-cpu-nonlinear exec-cpu-factors exec-failure
                   maestro-set
-                  mc-bugged1 mc-bugged1-liveness mc-bugged2 mc-electric-fence mc-failing-assert
+                  mc-bugged1 mc-bugged1-liveness mc-bugged2 mc-bugged2-liveness mc-centralized-mutex mc-electric-fence mc-failing-assert
                   network-ns3 network-ns3-wifi network-wifi
                   io-async io-priority io-degradation io-file-system io-file-remote io-disk-raw io-dependent
                   platform-failures platform-profile platform-properties
@@@ -223,15 -226,11 +226,11 @@@ set(tesh_files    ${tesh_files}   ${CMA
                                    ${CMAKE_CURRENT_SOURCE_DIR}/mc-bugged1-liveness/s4u-mc-bugged1-liveness-visited.tesh  PARENT_SCOPE)
  set(xml_files     ${xml_files}    ${CMAKE_CURRENT_SOURCE_DIR}/actor-create/s4u-actor-create_d.xml
                                    ${CMAKE_CURRENT_SOURCE_DIR}/actor-lifetime/s4u-actor-lifetime_d.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/actor-yield/s4u-actor-yield_d.xml
                                    ${CMAKE_CURRENT_SOURCE_DIR}/app-bittorrent/s4u-app-bittorrent_d.xml
                                    ${CMAKE_CURRENT_SOURCE_DIR}/app-masterworkers/s4u-app-masterworkers_d.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/comm-suspend/s4u-comm-suspend_d.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/comm-wait/s4u-comm-wait_d.xml
                                    ${CMAKE_CURRENT_SOURCE_DIR}/comm-waitany/s4u-comm-waitany_d.xml
                                    ${CMAKE_CURRENT_SOURCE_DIR}/comm-waitall/s4u-comm-waitall_d.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/comm-ready/s4u-comm-ready_d.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/comm-waituntil/s4u-comm-waituntil_d.xml
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/dag-scheduling/Montage_25.xml
                                    ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/s4u-dht-chord_d.xml
                                    ${CMAKE_CURRENT_SOURCE_DIR}/dht-kademlia/s4u-dht-kademlia_d.xml
                                    ${CMAKE_CURRENT_SOURCE_DIR}/energy-boot/platform_boot.xml
@@@ -250,11 -249,13 +249,13 @@@
                                    ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/one_cluster_d.xml                PARENT_SCOPE)
  set(bin_files     ${bin_files}    ${CMAKE_CURRENT_SOURCE_DIR}/dht-kademlia/generate.py
                                    ${CMAKE_CURRENT_SOURCE_DIR}/mc-bugged1-liveness/s4u-mc-bugged1-liveness-stack-cleaner
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/mc-bugged1-liveness/promela_bugged1_liveness PARENT_SCOPE)
- set(txt_files     ${txt_files}    ${CMAKE_CURRENT_SOURCE_DIR}/dag-from-dot/dag.dot
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/mc-bugged1-liveness/promela_bugged1_liveness
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/mc-bugged2-liveness/promela_bugged2_liveness PARENT_SCOPE)
+ set(txt_files     ${txt_files}    ${CMAKE_CURRENT_SOURCE_DIR}/dag-from-dax/simple_dax_with_cycle.xml
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/dag-from-dax/smalldax.xml     
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/dag-from-dot/dag.dot
                                    ${CMAKE_CURRENT_SOURCE_DIR}/dag-from-dot/dag_with_cycle.dot
                                    ${CMAKE_CURRENT_SOURCE_DIR}/replay-comm/s4u-replay-comm-split-p0.txt
                                    ${CMAKE_CURRENT_SOURCE_DIR}/replay-comm/s4u-replay-comm-split-p1.txt
                                    ${CMAKE_CURRENT_SOURCE_DIR}/replay-comm/s4u-replay-comm.txt
                                    ${CMAKE_CURRENT_SOURCE_DIR}/replay-io/s4u-replay-io.txt                  PARENT_SCOPE)
-