Merge branch 'pikachuyann/simgrid-stoprofiles'

diff --combined MANIFEST.in
index 674e662,c5f8e88..3058d05
--- 1/MANIFEST.in
--- 2/MANIFEST.in
+++ b/MANIFEST.in
@@@ -16,125 -16,6 +16,125 @@@ include doc/webcruft/simgrid_logo_2011.
  include doc/webcruft/simgrid_logo_2011.png
  include doc/webcruft/simgrid_logo_2011_small.png
  include doc/webcruft/storage_sample_scenario.png
 +include examples/c/actor-create/actor-create.c
 +include examples/c/actor-create/actor-create.tesh
 +include examples/c/actor-create/actor-create_d.xml
 +include examples/c/actor-daemon/actor-daemon.c
 +include examples/c/actor-daemon/actor-daemon.tesh
 +include examples/c/actor-exiting/actor-exiting.c
 +include examples/c/actor-exiting/actor-exiting.tesh
 +include examples/c/actor-join/actor-join.c
 +include examples/c/actor-join/actor-join.tesh
 +include examples/c/actor-kill/actor-kill.c
 +include examples/c/actor-kill/actor-kill.tesh
 +include examples/c/actor-lifetime/actor-lifetime.c
 +include examples/c/actor-lifetime/actor-lifetime.tesh
 +include examples/c/actor-lifetime/actor-lifetime_d.xml
 +include examples/c/actor-migrate/actor-migrate.c
 +include examples/c/actor-migrate/actor-migrate.tesh
 +include examples/c/actor-stacksize/actor-stacksize.c
 +include examples/c/actor-stacksize/actor-stacksize.tesh
 +include examples/c/actor-suspend/actor-suspend.c
 +include examples/c/actor-suspend/actor-suspend.tesh
 +include examples/c/actor-yield/actor-yield.c
 +include examples/c/actor-yield/actor-yield.tesh
 +include examples/c/actor-yield/actor-yield_d.xml
 +include examples/c/app-bittorrent/app-bittorrent.c
 +include examples/c/app-bittorrent/app-bittorrent.h
 +include examples/c/app-bittorrent/app-bittorrent.tesh
 +include examples/c/app-bittorrent/app-bittorrent_d.xml
 +include examples/c/app-bittorrent/bittorrent-peer.c
 +include examples/c/app-bittorrent/bittorrent-peer.h
 +include examples/c/app-bittorrent/generate.py
 +include examples/c/app-bittorrent/tracker.c
 +include examples/c/app-bittorrent/tracker.h
 +include examples/c/app-chainsend/app-chainsend.tesh
 +include examples/c/app-chainsend/app-chainsend_d.xml
 +include examples/c/app-chainsend/broadcaster.c
 +include examples/c/app-chainsend/chainsend.c
 +include examples/c/app-chainsend/chainsend.h
 +include examples/c/app-chainsend/peer.c
 +include examples/c/app-masterworker/app-masterworker-multicore.tesh
 +include examples/c/app-masterworker/app-masterworker-multicore_d.xml
 +include examples/c/app-masterworker/app-masterworker-vivaldi.tesh
 +include examples/c/app-masterworker/app-masterworker-vivaldi_d.xml
 +include examples/c/app-masterworker/app-masterworker.c
 +include examples/c/app-masterworker/app-masterworker.tesh
 +include examples/c/app-masterworker/app-masterworker_d.xml
 +include examples/c/app-pingpong/app-pingpong.c
 +include examples/c/app-pingpong/app-pingpong.tesh
 +include examples/c/app-pingpong/app-pingpong_d.xml
 +include examples/c/app-token-ring/app-token-ring.c
 +include examples/c/app-token-ring/app-token-ring.tesh
 +include examples/c/cloud-capping/cloud-capping.c
 +include examples/c/cloud-capping/cloud-capping.tesh
 +include examples/c/cloud-masterworker/cloud-masterworker.c
 +include examples/c/cloud-masterworker/cloud-masterworker.tesh
 +include examples/c/cloud-migration/cloud-migration.c
 +include examples/c/cloud-migration/cloud-migration.tesh
 +include examples/c/cloud-simple/cloud-simple.c
 +include examples/c/cloud-simple/cloud-simple.tesh
 +include examples/c/comm-wait/comm-wait.c
 +include examples/c/comm-wait/comm-wait.tesh
 +include examples/c/comm-wait/comm-wait2_d.xml
 +include examples/c/comm-wait/comm-wait3_d.xml
 +include examples/c/comm-wait/comm-wait4_d.xml
 +include examples/c/comm-wait/comm-wait_d.xml
 +include examples/c/comm-waitall/comm-waitall.c
 +include examples/c/comm-waitall/comm-waitall.tesh
 +include examples/c/comm-waitall/comm-waitall_d.xml
 +include examples/c/comm-waitany/comm-waitany.c
 +include examples/c/comm-waitany/comm-waitany.tesh
 +include examples/c/comm-waitany/comm-waitany_d.xml
 +include examples/c/dht-kademlia/answer.c
 +include examples/c/dht-kademlia/answer.h
 +include examples/c/dht-kademlia/common.h
 +include examples/c/dht-kademlia/dht-kademlia.c
 +include examples/c/dht-kademlia/dht-kademlia.tesh
 +include examples/c/dht-kademlia/dht-kademlia_d.xml
 +include examples/c/dht-kademlia/generate.py
 +include examples/c/dht-kademlia/message.c
 +include examples/c/dht-kademlia/message.h
 +include examples/c/dht-kademlia/node.c
 +include examples/c/dht-kademlia/node.h
 +include examples/c/dht-kademlia/routing_table.c
 +include examples/c/dht-kademlia/routing_table.h
 +include examples/c/dht-pastry/dht-pastry.c
 +include examples/c/dht-pastry/dht-pastry.tesh
 +include examples/c/dht-pastry/dht-pastry_d.xml
 +include examples/c/dht-pastry/generate.py
 +include examples/c/energy-exec-ptask/energy-exec-ptask.c
 +include examples/c/energy-exec-ptask/energy-exec-ptask.tesh
 +include examples/c/energy-exec/energy-exec.c
 +include examples/c/energy-exec/energy-exec.tesh
 +include examples/c/energy-vm/energy-vm.c
 +include examples/c/energy-vm/energy-vm.tesh
 +include examples/c/exec-async/exec-async.c
 +include examples/c/exec-async/exec-async.tesh
 +include examples/c/exec-basic/exec-basic.c
 +include examples/c/exec-basic/exec-basic.tesh
 +include examples/c/exec-dvfs/exec-dvfs.c
 +include examples/c/exec-dvfs/exec-dvfs.tesh
 +include examples/c/exec-remote/exec-remote.c
 +include examples/c/exec-remote/exec-remote.tesh
 +include examples/c/exec-waitany/exec-waitany.c
 +include examples/c/exec-waitany/exec-waitany.tesh
 +include examples/c/io-disk-raw/io-disk-raw.c
 +include examples/c/io-disk-raw/io-disk-raw.tesh
 +include examples/c/io-file-remote/io-file-remote.c
 +include examples/c/io-file-remote/io-file-remote.tesh
 +include examples/c/io-file-remote/io-file-remote_d.xml
 +include examples/c/io-file-system/io-file-system.c
 +include examples/c/io-file-system/io-file-system.tesh
 +include examples/c/platform-failures/platform-failures.c
 +include examples/c/platform-failures/platform-failures.tesh
 +include examples/c/platform-properties/platform-properties.c
 +include examples/c/platform-properties/platform-properties.tesh
 +include examples/c/platform-properties/platform-properties_d.xml
 +include examples/c/plugin-host-load/plugin-host-load.c
 +include examples/c/plugin-host-load/plugin-host-load.tesh
 +include examples/c/synchro-semaphore/synchro-semaphore.c
 +include examples/c/synchro-semaphore/synchro-semaphore.tesh
  include examples/deprecated/java/app/bittorrent/Common.java
  include examples/deprecated/java/app/bittorrent/Connection.java
  include examples/deprecated/java/app/bittorrent/Main.java
@@@ -255,13 -136,74 +255,13 @@@ include examples/deprecated/java/trace/
  include examples/deprecated/java/trace/pingpong/Sender.java
  include examples/deprecated/java/trace/pingpong/trace-pingpong.tesh
  include examples/deprecated/msg/README.doc
 -include examples/deprecated/msg/app-masterworker/app-masterworker-multicore.tesh
 -include examples/deprecated/msg/app-masterworker/app-masterworker-multicore_d.xml
 -include examples/deprecated/msg/app-masterworker/app-masterworker-vivaldi.tesh
 -include examples/deprecated/msg/app-masterworker/app-masterworker-vivaldi_d.xml
 -include examples/deprecated/msg/app-masterworker/app-masterworker.c
 -include examples/deprecated/msg/app-masterworker/app-masterworker.tesh
 -include examples/deprecated/msg/app-masterworker/app-masterworker_d.xml
 -include examples/deprecated/msg/cloud-masterworker/cloud-masterworker.c
 -include examples/deprecated/msg/cloud-masterworker/cloud-masterworker.tesh
 -include examples/deprecated/msg/dht-kademlia/answer.c
 -include examples/deprecated/msg/dht-kademlia/answer.h
 -include examples/deprecated/msg/dht-kademlia/common.h
 -include examples/deprecated/msg/dht-kademlia/dht-kademlia.c
 -include examples/deprecated/msg/dht-kademlia/dht-kademlia.h
 -include examples/deprecated/msg/dht-kademlia/dht-kademlia.tesh
 -include examples/deprecated/msg/dht-kademlia/dht-kademlia_d.xml
 -include examples/deprecated/msg/dht-kademlia/generate.py
 -include examples/deprecated/msg/dht-kademlia/node.c
 -include examples/deprecated/msg/dht-kademlia/node.h
 -include examples/deprecated/msg/dht-kademlia/routing_table.c
 -include examples/deprecated/msg/dht-kademlia/routing_table.h
 -include examples/deprecated/msg/dht-kademlia/task.c
 -include examples/deprecated/msg/dht-kademlia/task.h
 -include examples/deprecated/msg/dht-pastry/dht-pastry.c
 -include examples/deprecated/msg/dht-pastry/dht-pastry.tesh
 -include examples/deprecated/msg/dht-pastry/dht-pastry_d.xml
 -include examples/deprecated/msg/dht-pastry/generate.py
 -include examples/deprecated/msg/energy-vm/energy-vm.c
 -include examples/deprecated/msg/energy-vm/energy-vm.tesh
 -include examples/deprecated/msg/mc/bugged1.c
 -include examples/deprecated/msg/mc/bugged1.tesh
 -include examples/deprecated/msg/mc/bugged1_liveness.c
 -include examples/deprecated/msg/mc/bugged1_liveness.tesh
 -include examples/deprecated/msg/mc/bugged1_liveness_stack_cleaner
 -include examples/deprecated/msg/mc/bugged1_liveness_visited.tesh
 -include examples/deprecated/msg/mc/bugged2.c
 -include examples/deprecated/msg/mc/bugged2.tesh
 +include examples/deprecated/msg/mc/bugged2-liveness.tesh
  include examples/deprecated/msg/mc/bugged2_liveness.c
 -include examples/deprecated/msg/mc/bugged3.c
  include examples/deprecated/msg/mc/centralized_mutex.c
  include examples/deprecated/msg/mc/centralized_mutex.tesh
 -include examples/deprecated/msg/mc/deploy_bugged1.xml
 -include examples/deprecated/msg/mc/deploy_bugged1_liveness.xml
 -include examples/deprecated/msg/mc/deploy_bugged1_liveness_visited.xml
 -include examples/deprecated/msg/mc/deploy_bugged2.xml
  include examples/deprecated/msg/mc/deploy_bugged2_liveness.xml
 -include examples/deprecated/msg/mc/deploy_bugged3.xml
  include examples/deprecated/msg/mc/deploy_centralized_mutex.xml
 -include examples/deprecated/msg/mc/deploy_electric_fence.xml
 -include examples/deprecated/msg/mc/electric_fence.c
 -include examples/deprecated/msg/mc/platform.xml
 -include examples/deprecated/msg/mc/promela_bugged1_liveness
  include examples/deprecated/msg/mc/promela_bugged2_liveness
 -include examples/deprecated/msg/network-ns3/3hosts_2links_d.xml
 -include examples/deprecated/msg/network-ns3/3links-timer_d.xml
 -include examples/deprecated/msg/network-ns3/3links_d.xml
 -include examples/deprecated/msg/network-ns3/crosstraffic_d.xml
 -include examples/deprecated/msg/network-ns3/dogbone_d.xml
 -include examples/deprecated/msg/network-ns3/network-ns3.c
 -include examples/deprecated/msg/network-ns3/network-ns3.tesh
 -include examples/deprecated/msg/network-ns3/one_cluster_d.xml
 -include examples/deprecated/msg/network-ns3/onelink_d.xml
 -include examples/deprecated/msg/platform-failures/platform-failures.c
 -include examples/deprecated/msg/platform-failures/platform-failures.tesh
 -include examples/deprecated/msg/process-create/process-create.c
 -include examples/deprecated/msg/process-create/process-create.tesh
 -include examples/deprecated/msg/synchro-semaphore/synchro-semaphore.c
 -include examples/deprecated/msg/synchro-semaphore/synchro-semaphore.tesh
  include examples/deprecated/msg/trace-categories/trace-categories.c
  include examples/deprecated/msg/trace-categories/trace-categories.tesh
  include examples/deprecated/msg/trace-host-user-variables/trace-host-user-variables.c
@@@ -284,6 -226,8 +284,6 @@@ include examples/deprecated/simdag/daxl
  include examples/deprecated/simdag/daxload/smalldax.xml
  include examples/deprecated/simdag/fail/sd_fail.c
  include examples/deprecated/simdag/fail/sd_fail.tesh
 -include examples/deprecated/simdag/properties/sd_properties.c
 -include examples/deprecated/simdag/properties/sd_properties.tesh
  include examples/deprecated/simdag/ptg-dotload/ptg.dot
  include examples/deprecated/simdag/ptg-dotload/sd_ptg-dotload.c
  include examples/deprecated/simdag/ptg-dotload/sd_ptg-dotload.tesh
@@@ -309,20 -253,18 +309,20 @@@ include examples/python/actor-join/acto
  include examples/python/actor-join/actor-join.tesh
  include examples/python/actor-kill/actor-kill.py
  include examples/python/actor-kill/actor-kill.tesh
 +include examples/python/actor-lifetime/actor-lifetime.py
 +include examples/python/actor-lifetime/actor-lifetime.tesh
  include examples/python/actor-migrate/actor-migrate.py
  include examples/python/actor-migrate/actor-migrate.tesh
  include examples/python/actor-suspend/actor-suspend.py
  include examples/python/actor-suspend/actor-suspend.tesh
  include examples/python/actor-yield/actor-yield.py
  include examples/python/actor-yield/actor-yield.tesh
 -include examples/python/async-wait/async-wait.py
 -include examples/python/async-wait/async-wait.tesh
 -include examples/python/async-waitall/async-waitall.py
 -include examples/python/async-waitall/async-waitall.tesh
 -include examples/python/async-waitany/async-waitany.py
 -include examples/python/async-waitany/async-waitany.tesh
 +include examples/python/comm-wait/comm-wait.py
 +include examples/python/comm-wait/comm-wait.tesh
 +include examples/python/comm-waitall/comm-waitall.py
 +include examples/python/comm-waitall/comm-waitall.tesh
 +include examples/python/comm-waitany/comm-waitany.py
 +include examples/python/comm-waitany/comm-waitany.tesh
  include examples/python/exec-async/exec-async.py
  include examples/python/exec-async/exec-async.tesh
  include examples/python/exec-basic/exec-basic.py
@@@ -347,8 -289,6 +347,8 @@@ include examples/s4u/actor-lifetime/s4u
  include examples/s4u/actor-lifetime/s4u-actor-lifetime_d.xml
  include examples/s4u/actor-migrate/s4u-actor-migrate.cpp
  include examples/s4u/actor-migrate/s4u-actor-migrate.tesh
 +include examples/s4u/actor-stacksize/s4u-actor-stacksize.cpp
 +include examples/s4u/actor-stacksize/s4u-actor-stacksize.tesh
  include examples/s4u/actor-suspend/s4u-actor-suspend.cpp
  include examples/s4u/actor-suspend/s4u-actor-suspend.tesh
  include examples/s4u/actor-yield/s4u-actor-yield.cpp
@@@ -373,32 -313,27 +373,32 @@@ include examples/s4u/app-pingpong/s4u-a
  include examples/s4u/app-pingpong/simix-breakpoint.tesh
  include examples/s4u/app-token-ring/s4u-app-token-ring.cpp
  include examples/s4u/app-token-ring/s4u-app-token-ring.tesh
 -include examples/s4u/async-ready/s4u-async-ready.cpp
 -include examples/s4u/async-ready/s4u-async-ready.tesh
 -include examples/s4u/async-ready/s4u-async-ready_d.xml
 -include examples/s4u/async-wait/s4u-async-wait.cpp
 -include examples/s4u/async-wait/s4u-async-wait.tesh
 -include examples/s4u/async-wait/s4u-async-wait_d.xml
 -include examples/s4u/async-waitall/s4u-async-waitall.cpp
 -include examples/s4u/async-waitall/s4u-async-waitall.tesh
 -include examples/s4u/async-waitall/s4u-async-waitall_d.xml
 -include examples/s4u/async-waitany/s4u-async-waitany.cpp
 -include examples/s4u/async-waitany/s4u-async-waitany.tesh
 -include examples/s4u/async-waitany/s4u-async-waitany_d.xml
 -include examples/s4u/async-waituntil/s4u-async-waituntil.cpp
 -include examples/s4u/async-waituntil/s4u-async-waituntil.tesh
 -include examples/s4u/async-waituntil/s4u-async-waituntil_d.xml
  include examples/s4u/cloud-capping/s4u-cloud-capping.cpp
  include examples/s4u/cloud-capping/s4u-cloud-capping.tesh
  include examples/s4u/cloud-migration/s4u-cloud-migration.cpp
  include examples/s4u/cloud-migration/s4u-cloud-migration.tesh
  include examples/s4u/cloud-simple/s4u-cloud-simple.cpp
  include examples/s4u/cloud-simple/s4u-cloud-simple.tesh
 +include examples/s4u/comm-dependent/s4u-comm-dependent.cpp
 +include examples/s4u/comm-dependent/s4u-comm-dependent.tesh
 +include examples/s4u/comm-ready/s4u-comm-ready.cpp
 +include examples/s4u/comm-ready/s4u-comm-ready.tesh
 +include examples/s4u/comm-ready/s4u-comm-ready_d.xml
 +include examples/s4u/comm-suspend/s4u-comm-suspend.cpp
 +include examples/s4u/comm-suspend/s4u-comm-suspend.tesh
 +include examples/s4u/comm-suspend/s4u-comm-suspend_d.xml
 +include examples/s4u/comm-wait/s4u-comm-wait.cpp
 +include examples/s4u/comm-wait/s4u-comm-wait.tesh
 +include examples/s4u/comm-wait/s4u-comm-wait_d.xml
 +include examples/s4u/comm-waitall/s4u-comm-waitall.cpp
 +include examples/s4u/comm-waitall/s4u-comm-waitall.tesh
 +include examples/s4u/comm-waitall/s4u-comm-waitall_d.xml
 +include examples/s4u/comm-waitany/s4u-comm-waitany.cpp
 +include examples/s4u/comm-waitany/s4u-comm-waitany.tesh
 +include examples/s4u/comm-waitany/s4u-comm-waitany_d.xml
 +include examples/s4u/comm-waituntil/s4u-comm-waituntil.cpp
 +include examples/s4u/comm-waituntil/s4u-comm-waituntil.tesh
 +include examples/s4u/comm-waituntil/s4u-comm-waituntil_d.xml
  include examples/s4u/dht-chord/s4u-dht-chord-node.cpp
  include examples/s4u/dht-chord/s4u-dht-chord.cpp
  include examples/s4u/dht-chord/s4u-dht-chord.hpp
@@@ -427,16 -362,12 +427,16 @@@ include examples/s4u/energy-link/s4u-en
  include examples/s4u/energy-link/s4u-energy-link.tesh
  include examples/s4u/energy-vm/s4u-energy-vm.cpp
  include examples/s4u/energy-vm/s4u-energy-vm.tesh
 +include examples/s4u/energy-wifi/s4u-energy-wifi.cpp
 +include examples/s4u/energy-wifi/s4u-energy-wifi.tesh
  include examples/s4u/engine-filtering/s4u-engine-filtering.cpp
  include examples/s4u/engine-filtering/s4u-engine-filtering.tesh
  include examples/s4u/exec-async/s4u-exec-async.cpp
  include examples/s4u/exec-async/s4u-exec-async.tesh
  include examples/s4u/exec-basic/s4u-exec-basic.cpp
  include examples/s4u/exec-basic/s4u-exec-basic.tesh
 +include examples/s4u/exec-dependent/s4u-exec-dependent.cpp
 +include examples/s4u/exec-dependent/s4u-exec-dependent.tesh
  include examples/s4u/exec-dvfs/s4u-exec-dvfs.cpp
  include examples/s4u/exec-dvfs/s4u-exec-dvfs.tesh
  include examples/s4u/exec-ptask/s4u-exec-ptask.cpp
@@@ -445,12 -376,8 +445,12 @@@ include examples/s4u/exec-remote/s4u-ex
  include examples/s4u/exec-remote/s4u-exec-remote.tesh
  include examples/s4u/exec-waitany/s4u-exec-waitany.cpp
  include examples/s4u/exec-waitany/s4u-exec-waitany.tesh
 +include examples/s4u/exec-waitfor/s4u-exec-waitfor.cpp
 +include examples/s4u/exec-waitfor/s4u-exec-waitfor.tesh
  include examples/s4u/io-async/s4u-io-async.cpp
  include examples/s4u/io-async/s4u-io-async.tesh
 +include examples/s4u/io-dependent/s4u-io-dependent.cpp
 +include examples/s4u/io-dependent/s4u-io-dependent.tesh
  include examples/s4u/io-disk-raw/s4u-io-disk-raw.cpp
  include examples/s4u/io-disk-raw/s4u-io-disk-raw.tesh
  include examples/s4u/io-file-remote/s4u-io-file-remote.cpp
@@@ -460,30 -387,8 +460,30 @@@ include examples/s4u/io-file-system/s4u
  include examples/s4u/io-file-system/s4u-io-file-system.tesh
  include examples/s4u/maestro-set/s4u-maestro-set.cpp
  include examples/s4u/maestro-set/s4u-maestro-set.tesh
 +include examples/s4u/mc-bugged1-liveness/promela_bugged1_liveness
 +include examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness-stack-cleaner
 +include examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness-visited.tesh
 +include examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness.cpp
 +include examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness.tesh
 +include examples/s4u/mc-bugged1/s4u-mc-bugged1.cpp
 +include examples/s4u/mc-bugged1/s4u-mc-bugged1.tesh
 +include examples/s4u/mc-bugged2/s4u-mc-bugged2.cpp
 +include examples/s4u/mc-bugged2/s4u-mc-bugged2.tesh
 +include examples/s4u/mc-electric-fence/s4u-mc-electric-fence.cpp
 +include examples/s4u/mc-electric-fence/s4u-mc-electric-fence.tesh
  include examples/s4u/mc-failing-assert/s4u-mc-failing-assert.cpp
  include examples/s4u/mc-failing-assert/s4u-mc-failing-assert.tesh
 +include examples/s4u/network-ns3/3hosts_2links_d.xml
 +include examples/s4u/network-ns3/3links-timer_d.xml
 +include examples/s4u/network-ns3/3links_d.xml
 +include examples/s4u/network-ns3/crosstraffic_d.xml
 +include examples/s4u/network-ns3/dogbone_d.xml
 +include examples/s4u/network-ns3/one_cluster_d.xml
 +include examples/s4u/network-ns3/onelink_d.xml
 +include examples/s4u/network-ns3/s4u-network-ns3.cpp
 +include examples/s4u/network-ns3/s4u-network-ns3.tesh
 +include examples/s4u/network-wifi/s4u-network-wifi.cpp
 +include examples/s4u/network-wifi/s4u-network-wifi.tesh
  include examples/s4u/platform-failures/s4u-platform-failures.cpp
  include examples/s4u/platform-failures/s4u-platform-failures.tesh
  include examples/s4u/platform-failures/s4u-platform-failures_d.xml
@@@ -492,10 -397,8 +492,10 @@@ include examples/s4u/platform-profile/s
  include examples/s4u/platform-properties/s4u-platform-properties.cpp
  include examples/s4u/platform-properties/s4u-platform-properties.tesh
  include examples/s4u/platform-properties/s4u-platform-properties_d.xml
 -include examples/s4u/plugin-hostload/s4u-plugin-hostload.cpp
 -include examples/s4u/plugin-hostload/s4u-plugin-hostload.tesh
 +include examples/s4u/plugin-host-load/s4u-plugin-host-load.cpp
 +include examples/s4u/plugin-host-load/s4u-plugin-host-load.tesh
 +include examples/s4u/plugin-link-load/s4u-plugin-link-load.cpp
 +include examples/s4u/plugin-link-load/s4u-plugin-link-load.tesh
  include examples/s4u/replay-comm/s4u-replay-comm-split-p0.txt
  include examples/s4u/replay-comm/s4u-replay-comm-split-p1.txt
  include examples/s4u/replay-comm/s4u-replay-comm-split_d.xml
@@@ -511,10 -414,6 +511,10 @@@ include examples/s4u/routing-get-cluste
  include examples/s4u/routing-get-clusters/s4u-routing-get-clusters.tesh
  include examples/s4u/synchro-barrier/s4u-synchro-barrier.cpp
  include examples/s4u/synchro-barrier/s4u-synchro-barrier.tesh
 +include examples/s4u/synchro-condition-variable-waituntil/s4u-synchro-condition-variable-waituntil.cpp
 +include examples/s4u/synchro-condition-variable-waituntil/s4u-synchro-condition-variable-waituntil.tesh
 +include examples/s4u/synchro-condition-variable/s4u-synchro-condition-variable.cpp
 +include examples/s4u/synchro-condition-variable/s4u-synchro-condition-variable.tesh
  include examples/s4u/synchro-mutex/s4u-synchro-mutex.cpp
  include examples/s4u/synchro-mutex/s4u-synchro-mutex.tesh
  include examples/s4u/synchro-semaphore/s4u-synchro-semaphore.cpp
@@@ -640,9 -539,9 +640,9 @@@ include examples/smpi/replay_multiple_m
  include examples/smpi/replay_multiple_manual_deploy/workload_compute_simple
  include examples/smpi/replay_multiple_manual_deploy/workload_mixed2_same_time
  include examples/smpi/replay_multiple_manual_deploy/workload_mixed2_same_time_and_resources
 -include examples/smpi/smpi_msg_masterslave/deployment_masterslave_mailbox_smpi.xml
 -include examples/smpi/smpi_msg_masterslave/masterslave_mailbox_smpi.c
 -include examples/smpi/smpi_msg_masterslave/msg_smpi.tesh
 +include examples/smpi/smpi_s4u_masterworker/deployment_masterworker_mailbox_smpi.xml
 +include examples/smpi/smpi_s4u_masterworker/masterworker_mailbox_smpi.cpp
 +include examples/smpi/smpi_s4u_masterworker/s4u_smpi.tesh
  include examples/smpi/trace/trace.c
  include examples/smpi/trace/trace.tesh
  include examples/smpi/trace_call_location/adjust
@@@ -654,95 -553,165 +654,95 @@@ include teshsuite/java/semaphoregc/Sema
  include teshsuite/java/semaphoregc/semaphoregc.tesh
  include teshsuite/java/sleephostoff/SleepHostOff.java
  include teshsuite/java/sleephostoff/sleephostoff.tesh
 +include teshsuite/kernel/context-defaults/context-defaults.cpp
 +include teshsuite/kernel/context-defaults/factory_boost.tesh
 +include teshsuite/kernel/context-defaults/factory_raw.tesh
 +include teshsuite/kernel/context-defaults/factory_thread.tesh
 +include teshsuite/kernel/context-defaults/factory_ucontext.tesh
  include teshsuite/mc/dwarf-expression/dwarf-expression.cpp
  include teshsuite/mc/dwarf-expression/dwarf-expression.tesh
  include teshsuite/mc/dwarf/dwarf.cpp
  include teshsuite/mc/dwarf/dwarf.tesh
 -include teshsuite/mc/mutex-handling/mutex-handling.c
 +include teshsuite/mc/mutex-handling/mutex-handling.cpp
  include teshsuite/mc/mutex-handling/mutex-handling.tesh
 -include teshsuite/mc/mutex-handling/mutex-handling_d.xml
  include teshsuite/mc/mutex-handling/without-mutex-handling.tesh
  include teshsuite/mc/random-bug/random-bug-nocrash.tesh
  include teshsuite/mc/random-bug/random-bug-replay.tesh
  include teshsuite/mc/random-bug/random-bug.cpp
  include teshsuite/mc/random-bug/random-bug.tesh
 -include teshsuite/msg/app-bittorrent/app-bittorrent.tesh
 -include teshsuite/msg/app-bittorrent/app-bittorrent_d.xml
 -include teshsuite/msg/app-bittorrent/bittorrent-messages.c
 -include teshsuite/msg/app-bittorrent/bittorrent-messages.h
 -include teshsuite/msg/app-bittorrent/bittorrent-peer.c
 -include teshsuite/msg/app-bittorrent/bittorrent-peer.h
 -include teshsuite/msg/app-bittorrent/bittorrent.c
 -include teshsuite/msg/app-bittorrent/bittorrent.h
 -include teshsuite/msg/app-bittorrent/connection.c
 -include teshsuite/msg/app-bittorrent/connection.h
 -include teshsuite/msg/app-bittorrent/generate.py
 -include teshsuite/msg/app-bittorrent/tracker.c
 -include teshsuite/msg/app-bittorrent/tracker.h
 -include teshsuite/msg/app-chainsend/app-chainsend.tesh
 -include teshsuite/msg/app-chainsend/app-chainsend_d.xml
 -include teshsuite/msg/app-chainsend/broadcaster.c
 -include teshsuite/msg/app-chainsend/broadcaster.h
 -include teshsuite/msg/app-chainsend/chainsend.c
 -include teshsuite/msg/app-chainsend/common.c
 -include teshsuite/msg/app-chainsend/common.h
 -include teshsuite/msg/app-chainsend/iterator.c
 -include teshsuite/msg/app-chainsend/iterator.h
 -include teshsuite/msg/app-chainsend/messages.c
 -include teshsuite/msg/app-chainsend/messages.h
 -include teshsuite/msg/app-chainsend/peer.c
 -include teshsuite/msg/app-chainsend/peer.h
 -include teshsuite/msg/app-pingpong/app-pingpong.c
 -include teshsuite/msg/app-pingpong/app-pingpong.tesh
 -include teshsuite/msg/app-pingpong/app-pingpong_d.xml
 -include teshsuite/msg/app-token-ring/app-token-ring.c
 -include teshsuite/msg/app-token-ring/app-token-ring.tesh
 -include teshsuite/msg/async-wait/async-wait.c
 -include teshsuite/msg/async-wait/async-wait.tesh
 -include teshsuite/msg/async-wait/async-wait2_d.xml
 -include teshsuite/msg/async-wait/async-wait3_d.xml
 -include teshsuite/msg/async-wait/async-wait4_d.xml
 -include teshsuite/msg/async-wait/async-wait_d.xml
 -include teshsuite/msg/async-waitall/async-waitall.c
 -include teshsuite/msg/async-waitall/async-waitall.tesh
 -include teshsuite/msg/async-waitall/async-waitall_d.xml
 -include teshsuite/msg/async-waitany/async-waitany.c
 -include teshsuite/msg/async-waitany/async-waitany.tesh
 -include teshsuite/msg/async-waitany/async-waitany_d.xml
 -include teshsuite/msg/cloud-capping/cloud-capping.c
 -include teshsuite/msg/cloud-capping/cloud-capping.tesh
 -include teshsuite/msg/cloud-migration/cloud-migration.c
 -include teshsuite/msg/cloud-migration/cloud-migration.tesh
 -include teshsuite/msg/cloud-simple/cloud-simple.c
 -include teshsuite/msg/cloud-simple/cloud-simple.tesh
 -include teshsuite/msg/cloud-two-tasks/cloud-two-tasks.c
 -include teshsuite/msg/cloud-two-tasks/cloud-two-tasks.tesh
 -include teshsuite/msg/energy-consumption/energy-consumption.c
 -include teshsuite/msg/energy-consumption/energy-consumption.tesh
 -include teshsuite/msg/energy-pstate/energy-pstate.c
 -include teshsuite/msg/energy-pstate/energy-pstate.tesh
 -include teshsuite/msg/energy-ptask/energy-ptask.c
 -include teshsuite/msg/energy-ptask/energy-ptask.tesh
 -include teshsuite/msg/get_sender/get_sender.c
 -include teshsuite/msg/get_sender/get_sender.tesh
 -include teshsuite/msg/host_on_off/host_on_off.c
 -include teshsuite/msg/host_on_off/host_on_off.tesh
 -include teshsuite/msg/host_on_off_processes/host_on_off_processes.cpp
 -include teshsuite/msg/host_on_off_processes/host_on_off_processes.tesh
 -include teshsuite/msg/host_on_off_recv/host_on_off_recv.c
 -include teshsuite/msg/host_on_off_recv/host_on_off_recv.tesh
 -include teshsuite/msg/io-file-remote/io-file-remote.c
 -include teshsuite/msg/io-file-remote/io-file-remote.tesh
 -include teshsuite/msg/io-file-remote/io-file-remote_d.xml
 -include teshsuite/msg/io-file/io-file.c
 -include teshsuite/msg/io-file/io-file.tesh
 -include teshsuite/msg/io-raw-storage/io-raw-storage.c
 -include teshsuite/msg/io-raw-storage/io-raw-storage.tesh
 -include teshsuite/msg/platform-properties/platform-properties.c
 -include teshsuite/msg/platform-properties/platform-properties.tesh
 -include teshsuite/msg/platform-properties/platform-properties_d.xml
 -include teshsuite/msg/plugin-hostload/plugin-hostload.c
 -include teshsuite/msg/plugin-hostload/plugin-hostload.tesh
 -include teshsuite/msg/process-daemon/process-daemon.c
 -include teshsuite/msg/process-daemon/process-daemon.tesh
 -include teshsuite/msg/process-join/process-join.c
 -include teshsuite/msg/process-join/process-join.tesh
 -include teshsuite/msg/process-kill/process-kill.c
 -include teshsuite/msg/process-kill/process-kill.tesh
 -include teshsuite/msg/process-lifetime/baseline_d.xml
 -include teshsuite/msg/process-lifetime/kill_d.xml
 -include teshsuite/msg/process-lifetime/process-lifetime.c
 -include teshsuite/msg/process-lifetime/process-lifetime.tesh
 -include teshsuite/msg/process-lifetime/start_d.xml
 -include teshsuite/msg/process-lifetime/start_kill_d.xml
 -include teshsuite/msg/process-migration/process-migration.c
 -include teshsuite/msg/process-migration/process-migration.tesh
 -include teshsuite/msg/process-suspend/process-suspend.c
 -include teshsuite/msg/process-suspend/process-suspend.tesh
 -include teshsuite/msg/process-yield/process-yield.c
 -include teshsuite/msg/process-yield/process-yield.tesh
 -include teshsuite/msg/process-yield/process-yield_d.xml
 -include teshsuite/msg/task-priority/task-priority.c
 -include teshsuite/msg/task-priority/task-priority.tesh
 -include teshsuite/msg/task-priority/task-priority_d.xml
 -include teshsuite/msg/task_destroy_cancel/task_destroy_cancel.cpp
 +include teshsuite/msg/task_destroy_cancel/task_destroy_cancel.c
  include teshsuite/msg/task_destroy_cancel/task_destroy_cancel.tesh
 -include teshsuite/msg/task_listen_from/task_listen_from.cpp
 -include teshsuite/msg/task_listen_from/task_listen_from.tesh
 -include teshsuite/msg/task_progress/task_progress.cpp
 -include teshsuite/msg/task_progress/task_progress.tesh
 -include teshsuite/msg/trace_integration/test-hbp1-c0s0-c0s1.xml
 -include teshsuite/msg/trace_integration/test-hbp1-c0s0-c1s0.xml
 -include teshsuite/msg/trace_integration/test-hbp1-c0s1-c0s2.xml
 -include teshsuite/msg/trace_integration/test-hbp1-c0s1-c2s2.xml
 -include teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s0.xml
 -include teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s1.xml
 -include teshsuite/msg/trace_integration/test-hbp1-c1s1-c1s2.xml
 -include teshsuite/msg/trace_integration/test-hbp1-c1s1-c3s2.xml
 -include teshsuite/msg/trace_integration/test-hbp1.0-hbp1.0-hbp1.0.xml
 -include teshsuite/msg/trace_integration/test-hbp1.0-hbp3.0-hbp4.0.xml
 -include teshsuite/msg/trace_integration/test-hbp1.5-hbp1.5.xml
 -include teshsuite/msg/trace_integration/test-hbp2.5-hbp1.5.xml
 -include teshsuite/msg/trace_integration/trace_integration.c
 -include teshsuite/msg/trace_integration/trace_integration.tesh
 +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
 +include teshsuite/python/corrupt-stack/corrupt-stack.py
 +include teshsuite/python/corrupt-stack/corrupt-stack.tesh
 +include teshsuite/python/corrupt-stack/corrupt-stack_d.xml
  include teshsuite/s4u/activity-lifecycle/activity-lifecycle.cpp
 +include teshsuite/s4u/activity-lifecycle/activity-lifecycle.hpp
  include teshsuite/s4u/activity-lifecycle/activity-lifecycle.tesh
 +include teshsuite/s4u/activity-lifecycle/testing_comm.cpp
 +include teshsuite/s4u/activity-lifecycle/testing_exec.cpp
  include teshsuite/s4u/activity-lifecycle/testing_platform.xml
 +include teshsuite/s4u/activity-lifecycle/testing_sleep.cpp
 +include teshsuite/s4u/activity-lifecycle/testing_test-wait.cpp
  include teshsuite/s4u/actor-autorestart/actor-autorestart.cpp
  include teshsuite/s4u/actor-autorestart/actor-autorestart.tesh
 +include teshsuite/s4u/actor-suspend/actor-suspend.cpp
 +include teshsuite/s4u/actor-suspend/actor-suspend.tesh
  include teshsuite/s4u/actor/actor.cpp
  include teshsuite/s4u/actor/actor.tesh
 +include teshsuite/s4u/basic-link-test/basic-link-test.cpp
 +include teshsuite/s4u/basic-link-test/basic-link-test.tesh
  include teshsuite/s4u/cloud-interrupt-migration/cloud-interrupt-migration.cpp
  include teshsuite/s4u/cloud-interrupt-migration/cloud-interrupt-migration.tesh
  include teshsuite/s4u/cloud-sharing/cloud-sharing.cpp
  include teshsuite/s4u/cloud-sharing/cloud-sharing.tesh
 +include teshsuite/s4u/cloud-two-execs/cloud-two-execs.cpp
 +include teshsuite/s4u/cloud-two-execs/cloud-two-execs.tesh
 +include teshsuite/s4u/comm-get-sender/comm-get-sender.cpp
 +include teshsuite/s4u/comm-get-sender/comm-get-sender.tesh
  include teshsuite/s4u/comm-pt2pt/comm-pt2pt.cpp
  include teshsuite/s4u/concurrent_rw/concurrent_rw.cpp
  include teshsuite/s4u/concurrent_rw/concurrent_rw.tesh
 +include teshsuite/s4u/evaluate-get-route-time/evaluate-get-route-time.cpp
 +include teshsuite/s4u/evaluate-parse-time/evaluate-parse-time.cpp
 +include teshsuite/s4u/host-on-off-actors/host-on-off-actors.cpp
 +include teshsuite/s4u/host-on-off-actors/host-on-off-actors.tesh
 +include teshsuite/s4u/host-on-off-recv/host-on-off-recv.cpp
 +include teshsuite/s4u/host-on-off-recv/host-on-off-recv.tesh
 +include teshsuite/s4u/host-on-off/host-on-off.cpp
 +include teshsuite/s4u/host-on-off/host-on-off.tesh
 +include teshsuite/s4u/is-router/is-router.cpp
 +include teshsuite/s4u/is-router/is-router.tesh
  include teshsuite/s4u/listen_async/listen_async.cpp
  include teshsuite/s4u/listen_async/listen_async.tesh
 +include teshsuite/s4u/ns3-from-src-to-itself/ns3-from-src-to-itself.cpp
 +include teshsuite/s4u/ns3-from-src-to-itself/ns3-from-src-to-itself.tesh
  include teshsuite/s4u/ns3-simultaneous-send-rcv/ns3-simultaneous-send-rcv.cpp
  include teshsuite/s4u/ns3-simultaneous-send-rcv/ns3-simultaneous-send-rcv.tesh
  include teshsuite/s4u/pid/pid.cpp
  include teshsuite/s4u/pid/pid.tesh
  include teshsuite/s4u/storage_client_server/storage_client_server.cpp
  include teshsuite/s4u/storage_client_server/storage_client_server.tesh
 +include teshsuite/s4u/trace-integration/test-hbp1-c0s0-c0s1.xml
 +include teshsuite/s4u/trace-integration/test-hbp1-c0s0-c1s0.xml
 +include teshsuite/s4u/trace-integration/test-hbp1-c0s1-c0s2.xml
 +include teshsuite/s4u/trace-integration/test-hbp1-c0s1-c2s2.xml
 +include teshsuite/s4u/trace-integration/test-hbp1-c0s2-c1s0.xml
 +include teshsuite/s4u/trace-integration/test-hbp1-c0s2-c1s1.xml
 +include teshsuite/s4u/trace-integration/test-hbp1-c1s1-c1s2.xml
 +include teshsuite/s4u/trace-integration/test-hbp1-c1s1-c3s2.xml
 +include teshsuite/s4u/trace-integration/test-hbp1.0-hbp1.0-hbp1.0.xml
 +include teshsuite/s4u/trace-integration/test-hbp1.0-hbp3.0-hbp4.0.xml
 +include teshsuite/s4u/trace-integration/test-hbp1.5-hbp1.5.xml
 +include teshsuite/s4u/trace-integration/test-hbp2.5-hbp1.5.xml
 +include teshsuite/s4u/trace-integration/trace-integration.cpp
 +include teshsuite/s4u/trace-integration/trace-integration.tesh
  include teshsuite/s4u/wait-any-for/wait-any-for.cpp
  include teshsuite/s4u/wait-any-for/wait-any-for.tesh
  include teshsuite/simdag/availability/availability.c
  include teshsuite/simdag/availability/availability.tesh
 -include teshsuite/simdag/basic-link-test/basic-link-test.c
 -include teshsuite/simdag/basic-link-test/basic-link-test.tesh
  include teshsuite/simdag/basic-parsing-test/basic-parsing-test-bypass.tesh
  include teshsuite/simdag/basic-parsing-test/basic-parsing-test-sym-full.tesh
  include teshsuite/simdag/basic-parsing-test/basic-parsing-test.c
@@@ -777,6 -746,8 +777,6 @@@ include teshsuite/simdag/comp-only-par/
  include teshsuite/simdag/comp-only-par/comp-only-par.tesh
  include teshsuite/simdag/comp-only-seq/comp-only-seq.c
  include teshsuite/simdag/comp-only-seq/comp-only-seq.tesh
 -include teshsuite/simdag/evaluate-get-route-time/evaluate-get-route-time.c
 -include teshsuite/simdag/evaluate-parse-time/evaluate-parse-time.c
  include teshsuite/simdag/flatifier/bogus_disk_attachment.tesh
  include teshsuite/simdag/flatifier/bogus_missing_gateway.tesh
  include teshsuite/simdag/flatifier/bogus_two_hosts_asymetric.tesh
@@@ -784,6 -755,8 +784,6 @@@ include teshsuite/simdag/flatifier/flat
  include teshsuite/simdag/flatifier/flatifier.tesh
  include teshsuite/simdag/incomplete/incomplete.c
  include teshsuite/simdag/incomplete/incomplete.tesh
 -include teshsuite/simdag/is-router/is-router.cpp
 -include teshsuite/simdag/is-router/is-router.tesh
  include teshsuite/simdag/platforms/Dijkstra.xml
  include teshsuite/simdag/platforms/bob.trace
  include teshsuite/simdag/platforms/bogus_disk_attachment.xml
@@@ -817,12 -790,15 +817,12 @@@ include teshsuite/simdag/platforms/two_
  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/simix/check-defaults/check-defaults.cpp
 -include teshsuite/simix/check-defaults/factory_boost.tesh
 -include teshsuite/simix/check-defaults/factory_raw.tesh
 -include teshsuite/simix/check-defaults/factory_thread.tesh
 -include teshsuite/simix/check-defaults/factory_ucontext.tesh
  include teshsuite/simix/generic-simcalls/generic-simcalls.cpp
  include teshsuite/simix/generic-simcalls/generic-simcalls.tesh
  include teshsuite/simix/stack-overflow/stack-overflow.cpp
  include teshsuite/simix/stack-overflow/stack-overflow.tesh
 +include teshsuite/smpi/auto-shared/auto-shared.c
 +include teshsuite/smpi/auto-shared/auto-shared.tesh
  include teshsuite/smpi/bug-17132/bug-17132.c
  include teshsuite/smpi/bug-17132/bug-17132.tesh
  include teshsuite/smpi/coll-allgather/coll-allgather.c
@@@ -1433,34 -1409,6 +1433,34 @@@ include teshsuite/smpi/mpich3-test/init
  include teshsuite/smpi/mpich3-test/init/testlist
  include teshsuite/smpi/mpich3-test/init/timeout.c
  include teshsuite/smpi/mpich3-test/init/version.c
 +include teshsuite/smpi/mpich3-test/io/async.c
 +include teshsuite/smpi/mpich3-test/io/async_any.c
 +include teshsuite/smpi/mpich3-test/io/bigtype.c
 +include teshsuite/smpi/mpich3-test/io/external32-derived-dtype.c
 +include teshsuite/smpi/mpich3-test/io/getextent.c
 +include teshsuite/smpi/mpich3-test/io/hindexed_io.c
 +include teshsuite/smpi/mpich3-test/io/i_aggregation1.c
 +include teshsuite/smpi/mpich3-test/io/i_aggregation2.c
 +include teshsuite/smpi/mpich3-test/io/i_bigtype.c
 +include teshsuite/smpi/mpich3-test/io/i_coll_test.c
 +include teshsuite/smpi/mpich3-test/io/i_darray_read.c
 +include teshsuite/smpi/mpich3-test/io/i_hindexed.c
 +include teshsuite/smpi/mpich3-test/io/i_hindexed_io.c
 +include teshsuite/smpi/mpich3-test/io/i_noncontig.c
 +include teshsuite/smpi/mpich3-test/io/i_noncontig_coll.c
 +include teshsuite/smpi/mpich3-test/io/i_noncontig_coll2.c
 +include teshsuite/smpi/mpich3-test/io/i_rdwrord.c
 +include teshsuite/smpi/mpich3-test/io/i_setviewcur.c
 +include teshsuite/smpi/mpich3-test/io/i_types_with_zeros.c
 +include teshsuite/smpi/mpich3-test/io/rdwrord.c
 +include teshsuite/smpi/mpich3-test/io/rdwrzero.c
 +include teshsuite/smpi/mpich3-test/io/resized.c
 +include teshsuite/smpi/mpich3-test/io/resized2.c
 +include teshsuite/smpi/mpich3-test/io/setinfo.c
 +include teshsuite/smpi/mpich3-test/io/setviewcur.c
 +include teshsuite/smpi/mpich3-test/io/simple_collective.c
 +include teshsuite/smpi/mpich3-test/io/testlist
 +include teshsuite/smpi/mpich3-test/io/userioerr.c
  include teshsuite/smpi/mpich3-test/perf/README
  include teshsuite/smpi/mpich3-test/perf/allredtrace.c
  include teshsuite/smpi/mpich3-test/perf/commcreatep.c
@@@ -1689,8 -1637,6 +1689,8 @@@ include teshsuite/smpi/pt2pt-pingpong/p
  include teshsuite/smpi/pt2pt-pingpong/pt2pt-pingpong.tesh
  include teshsuite/smpi/timers/timers.c
  include teshsuite/smpi/timers/timers.tesh
 +include teshsuite/smpi/topo-cart-sub/topo-cart-sub.c
 +include teshsuite/smpi/topo-cart-sub/topo-cart-sub.tesh
  include teshsuite/smpi/type-hvector/type-hvector.c
  include teshsuite/smpi/type-hvector/type-hvector.tesh
  include teshsuite/smpi/type-indexed/type-indexed.c
@@@ -1711,8 -1657,6 +1711,8 @@@ include teshsuite/surf/surf_usage2/surf
  include teshsuite/surf/surf_usage2/surf_usage2.tesh
  include teshsuite/surf/wifi_usage/wifi_usage.cpp
  include teshsuite/surf/wifi_usage/wifi_usage.tesh
 +include teshsuite/surf/wifi_usage_decay/wifi_usage_decay.cpp
 +include teshsuite/surf/wifi_usage_decay/wifi_usage_decay.tesh
  include teshsuite/xbt/cmdline/cmdline.c
  include teshsuite/xbt/cmdline/cmdline.tesh
  include teshsuite/xbt/log_large/log_large.c
@@@ -1733,15 -1677,15 +1733,15 @@@ include teshsuite/xbt/signals/signals.c
  include teshsuite/xbt/signals/signals.tesh
  include tools/MSG_visualization/colorize.pl
  include tools/MSG_visualization/trace2fig.pl
 +include tools/address_sanitizer.supp
  include tools/doxygen/fig2dev_postprocessor.pl
  include tools/doxygen/xbt_log_extract_hierarchy.pl
  include tools/fix-paje-trace.sh
  include tools/generate-dwarf-functions
 -include tools/graphicator/graphicator.c
 +include tools/graphicator/graphicator.cpp
  include tools/graphicator/graphicator.tesh
  include tools/normalize-pointers.py
  include tools/pkg-config/simgrid.pc.in
 -include tools/sanitizers.supp
  include tools/sg_xml_unit_converter.py
  include tools/simgrid.supp
  include tools/simgrid2vite.sed
@@@ -1770,7 -1714,6 +1770,7 @@@ include tools/tesh/set-return.tes
  include tools/tesh/set-timeout.tesh
  include tools/tesh/setenv.tesh
  include tools/tesh/tesh.py
 +include tools/thread_sanitizer.supp
  include AUTHORS
  include CITATION.bib
  include CMakeLists.txt
@@@ -1803,7 -1746,6 +1803,7 @@@ include doc/doxygen/uhood.do
  include doc/doxygen/uhood_arch.doc
  include doc/doxygen/uhood_switch.doc
  include docs/Build.sh
 +include docs/find-missing.ignore
  include docs/find-missing.py
  include docs/ignored_symbols
  include docs/manpages/smpicc.1
@@@ -1820,31 -1762,15 +1820,31 @@@ include docs/source/Experimental_Setup.
  include docs/source/Installing_SimGrid.rst
  include docs/source/Introduction.rst
  include docs/source/Platform_Examples.rst
 +include docs/source/Platform_Routing.rst
  include docs/source/Plugins.rst
  include docs/source/Start_Your_Own_Project.rst
  include docs/source/Tutorial_Algorithms.rst
  include docs/source/Tutorial_MPI_Applications.rst
  include docs/source/XML_Reference.rst
  include docs/source/_ext/autodoxy.py
 +include docs/source/_ext/javasphinx/LICENSE
 +include docs/source/_ext/javasphinx/MANIFEST.in
 +include docs/source/_ext/javasphinx/README.md
 +include docs/source/_ext/javasphinx/doc/conf.py
 +include docs/source/_ext/javasphinx/doc/index.rst
 +include docs/source/_ext/javasphinx/javasphinx/__init__.py
 +include docs/source/_ext/javasphinx/javasphinx/apidoc.py
 +include docs/source/_ext/javasphinx/javasphinx/compiler.py
 +include docs/source/_ext/javasphinx/javasphinx/domain.py
 +include docs/source/_ext/javasphinx/javasphinx/extdoc.py
 +include docs/source/_ext/javasphinx/javasphinx/formatter.py
 +include docs/source/_ext/javasphinx/javasphinx/htmlrst.py
 +include docs/source/_ext/javasphinx/javasphinx/util.py
 +include docs/source/_ext/javasphinx/setup.py
  include docs/source/_ext/showfile.css
  include docs/source/_ext/showfile.js
  include docs/source/_ext/showfile.py
 +include docs/source/_static/css/custom.css
  include docs/source/_templates/breadcrumbs.html
  include docs/source/app_msg.rst
  include docs/source/app_s4u.rst
@@@ -1886,15 -1812,14 +1886,15 @@@ include docs/source/tuto_smpi/img/big-p
  include docs/source/tuto_smpi/img/lu.S.4.png
  include docs/source/tuto_smpi/roundtrip.c
  include examples/README.rst
 +include examples/c/CMakeLists.txt
  include examples/deprecated/java/.classpath
  include examples/deprecated/java/.project
  include examples/deprecated/java/CMakeLists.txt
  include examples/deprecated/msg/CMakeLists.txt
  include examples/deprecated/msg/mc/CMakeLists.txt
  include examples/deprecated/simdag/CMakeLists.txt
 -include examples/platforms/bypassASroute.xml
  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.xml
@@@ -1919,7 -1844,6 +1919,7 @@@ include examples/platforms/g5k.xm
  include examples/platforms/griffon.xml
  include examples/platforms/hosts_with_disks.xml
  include examples/platforms/meta_cluster.xml
 +include examples/platforms/model_checker_platform.xml
  include examples/platforms/multicore_machine.xml
  include examples/platforms/ns3-big-cluster.xml
  include examples/platforms/onelink.xml
@@@ -1954,6 -1878,7 +1954,6 @@@ include examples/platforms/small_platfo
  include examples/platforms/small_platform_with_routers.xml
  include examples/platforms/storage/content/small_content.txt
  include examples/platforms/storage/content/storage_content.txt
 -include examples/platforms/storage/remote_io.xml
  include examples/platforms/storage/storage.xml
  include examples/platforms/syscoord/generate_peer_platform.pl
  include examples/platforms/syscoord/median_harvard.syscoord
@@@ -1967,13 -1892,14 +1967,13 @@@ include examples/platforms/two_hosts_pr
  include examples/platforms/two_peers.xml
  include examples/platforms/vivaldi.xml
  include examples/platforms/wifi.xml
 +include examples/platforms/wifi_energy.xml
  include examples/python/CMakeLists.txt
  include examples/python/actor-create/actor-create_d.xml
 -include examples/python/actor-lifetime/actor-lifetime.py
 -include examples/python/actor-lifetime/actor-lifetime.tesh
  include examples/python/actor-lifetime/actor-lifetime_d.xml
 -include examples/python/async-wait/async-wait_d.xml
 -include examples/python/async-waitall/async-waitall_d.xml
 -include examples/python/async-waitany/async-waitany_d.xml
 +include examples/python/comm-wait/comm-wait_d.xml
 +include examples/python/comm-waitall/comm-waitall_d.xml
 +include examples/python/comm-waitany/comm-waitany_d.xml
  include examples/s4u/CMakeLists.txt
  include examples/smpi/CMakeLists.txt
  include examples/smpi/NAS/CMakeLists.txt
@@@ -1981,17 -1907,14 +1981,17 @@@ include examples/smpi/mc/non_determinis
  include examples/smpi/mc/only_send_deterministic.tesh
  include examples/smpi/replay_multiple/CMakeLists.txt
  include examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt
 -include examples/smpi/smpi_msg_masterslave/CMakeLists.txt
 +include examples/smpi/smpi_s4u_masterworker/CMakeLists.txt
  include include/simgrid/Exception.hpp
  include include/simgrid/actor.h
  include include/simgrid/barrier.h
  include include/simgrid/chrono.hpp
 +include include/simgrid/comm.h
  include include/simgrid/cond.h
  include include/simgrid/config.h.in
 +include include/simgrid/disk.h
  include include/simgrid/engine.h
 +include include/simgrid/exec.h
  include include/simgrid/forward.h
  include include/simgrid/host.h
  include include/simgrid/instr.h
@@@ -2015,7 -1938,6 +2015,7 @@@ include include/simgrid/kernel/routing/
  include include/simgrid/kernel/routing/RoutedZone.hpp
  include include/simgrid/kernel/routing/TorusZone.hpp
  include include/simgrid/kernel/routing/VivaldiZone.hpp
 +include include/simgrid/kernel/routing/WifiZone.hpp
  include include/simgrid/link.h
  include include/simgrid/mailbox.h
  include include/simgrid/modelchecker.h
@@@ -2052,7 -1974,6 +2052,7 @@@ include include/simgrid/simix.hp
  include include/simgrid/simix/blocking_simcall.hpp
  include include/simgrid/smpi/replay.hpp
  include include/simgrid/storage.h
 +include include/simgrid/version.h.in
  include include/simgrid/vm.h
  include include/simgrid/zone.h
  include include/smpi/forward.hpp
@@@ -2067,7 -1988,6 +2067,7 @@@ include include/smpi/smpi_helpers_inter
  include include/smpi/smpi_main.h
  include include/xbt.h
  include include/xbt/Extendable.hpp
 +include include/xbt/PropertyHolder.hpp
  include include/xbt/asserts.h
  include include/xbt/automaton.h
  include include/xbt/automaton.hpp
@@@ -2089,7 -2009,6 +2089,7 @@@ include include/xbt/mallocator.
  include include/xbt/misc.h
  include include/xbt/module.h
  include include/xbt/parmap.h
 +include include/xbt/parse_units.hpp
  include include/xbt/random.hpp
  include include/xbt/range.hpp
  include include/xbt/replay.hpp
@@@ -2180,6 -2099,7 +2180,6 @@@ include src/instr/instr_paje_header.cp
  include src/instr/instr_paje_trace.cpp
  include src/instr/instr_paje_types.cpp
  include src/instr/instr_paje_types.hpp
 -include src/instr/instr_paje_values.cpp
  include src/instr/instr_paje_values.hpp
  include src/instr/instr_platform.cpp
  include src/instr/instr_private.hpp
@@@ -2226,6 -2146,7 +2226,6 @@@ include src/kernel/context/ContextThrea
  include src/kernel/context/ContextThread.hpp
  include src/kernel/context/ContextUnix.cpp
  include src/kernel/context/ContextUnix.hpp
 -include src/kernel/context/context_private.hpp
  include src/kernel/future.cpp
  include src/kernel/lmm/fair_bottleneck.cpp
  include src/kernel/lmm/maxmin.cpp
@@@ -2244,6 -2165,8 +2244,8 @@@ include src/kernel/resource/profile/Fut
  include src/kernel/resource/profile/Profile.cpp
  include src/kernel/resource/profile/Profile.hpp
  include src/kernel/resource/profile/Profile_test.cpp
+ include src/kernel/resource/profile/StochasticDatedValue.cpp
+ include src/kernel/resource/profile/StochasticDatedValue.hpp
  include src/kernel/routing/ClusterZone.cpp
  include src/kernel/routing/DijkstraZone.cpp
  include src/kernel/routing/DragonflyZone.cpp
@@@ -2256,7 -2179,6 +2258,7 @@@ include src/kernel/routing/NetZoneImpl.
  include src/kernel/routing/RoutedZone.cpp
  include src/kernel/routing/TorusZone.cpp
  include src/kernel/routing/VivaldiZone.cpp
 +include src/kernel/routing/WifiZone.cpp
  include src/mc/AddressSpace.hpp
  include src/mc/ModelChecker.cpp
  include src/mc/ModelChecker.hpp
@@@ -2307,6 -2229,7 +2309,6 @@@ include src/mc/mc_global.cp
  include src/mc/mc_hash.cpp
  include src/mc/mc_hash.hpp
  include src/mc/mc_ignore.hpp
 -include src/mc/mc_memory.cpp
  include src/mc/mc_mmu.hpp
  include src/mc/mc_private.hpp
  include src/mc/mc_record.cpp
@@@ -2319,15 -2242,13 +2321,15 @@@ include src/mc/mc_smx.cp
  include src/mc/mc_smx.hpp
  include src/mc/mc_state.cpp
  include src/mc/mc_state.hpp
 +include src/mc/remote/AppSide.cpp
 +include src/mc/remote/AppSide.hpp
  include src/mc/remote/Channel.cpp
  include src/mc/remote/Channel.hpp
 -include src/mc/remote/Client.cpp
 -include src/mc/remote/Client.hpp
 -include src/mc/remote/RemoteClient.cpp
 -include src/mc/remote/RemoteClient.hpp
 +include src/mc/remote/CheckerSide.cpp
 +include src/mc/remote/CheckerSide.hpp
  include src/mc/remote/RemotePtr.hpp
 +include src/mc/remote/RemoteSimulation.cpp
 +include src/mc/remote/RemoteSimulation.hpp
  include src/mc/remote/mc_protocol.cpp
  include src/mc/remote/mc_protocol.h
  include src/mc/sosp/ChunkedData.cpp
@@@ -2352,8 -2273,6 +2354,8 @@@ include src/plugins/host_dvfs.cp
  include src/plugins/host_energy.cpp
  include src/plugins/host_load.cpp
  include src/plugins/link_energy.cpp
 +include src/plugins/link_energy_wifi.cpp
 +include src/plugins/link_load.cpp
  include src/plugins/vm/VirtualMachineImpl.cpp
  include src/plugins/vm/VirtualMachineImpl.hpp
  include src/plugins/vm/VmHostExt.cpp
@@@ -2387,13 -2306,13 +2389,13 @@@ include src/simdag/sd_task.cp
  include src/simdag/simdag_private.hpp
  include src/simgrid/Exception.cpp
  include src/simgrid/sg_config.cpp
 +include src/simgrid/sg_version.cpp
  include src/simgrid/util.hpp
 -include src/simgrid/version.h.in
  include src/simix/libsmx.cpp
  include src/simix/popping.cpp
  include src/simix/popping_accessors.hpp
  include src/simix/popping_bodies.cpp
 -include src/simix/popping_enum.h
 +include src/simix/popping_enum.hpp
  include src/simix/popping_generated.cpp
  include src/simix/popping_private.hpp
  include src/simix/simcalls.in
@@@ -2405,7 -2324,6 +2407,7 @@@ include src/simix/smx_private.hp
  include src/smpi/bindings/smpi_f77.cpp
  include src/smpi/bindings/smpi_f77_coll.cpp
  include src/smpi/bindings/smpi_f77_comm.cpp
 +include src/smpi/bindings/smpi_f77_file.cpp
  include src/smpi/bindings/smpi_f77_request.cpp
  include src/smpi/bindings/smpi_f77_type.cpp
  include src/smpi/bindings/smpi_mpi.cpp
@@@ -2534,7 -2452,6 +2536,7 @@@ include src/smpi/include/private.hp
  include src/smpi/include/smpi_actor.hpp
  include src/smpi/include/smpi_coll.hpp
  include src/smpi/include/smpi_comm.hpp
 +include src/smpi/include/smpi_config.hpp
  include src/smpi/include/smpi_datatype.hpp
  include src/smpi/include/smpi_datatype_derived.hpp
  include src/smpi/include/smpi_errhandler.hpp
@@@ -2553,7 -2470,6 +2555,7 @@@ include src/smpi/include/smpi_win.hp
  include src/smpi/internals/instr_smpi.cpp
  include src/smpi/internals/smpi_actor.cpp
  include src/smpi/internals/smpi_bench.cpp
 +include src/smpi/internals/smpi_config.cpp
  include src/smpi/internals/smpi_deployment.cpp
  include src/smpi/internals/smpi_global.cpp
  include src/smpi/internals/smpi_host.cpp
@@@ -2592,6 -2508,8 +2594,6 @@@ include src/smpi/smpirun.i
  include src/smpi/smpitools.sh
  include src/surf/HostImpl.cpp
  include src/surf/HostImpl.hpp
 -include src/surf/PropertyHolder.cpp
 -include src/surf/PropertyHolder.hpp
  include src/surf/StorageImpl.cpp
  include src/surf/StorageImpl.hpp
  include src/surf/cpu_cas01.cpp
@@@ -2637,7 -2555,6 +2639,7 @@@ include src/surf/xml/simgrid_dtd.
  include src/surf/xml/surfxml_parseplatf.cpp
  include src/surf/xml/surfxml_sax_cb.cpp
  include src/xbt/OsSemaphore.hpp
 +include src/xbt/PropertyHolder.cpp
  include src/xbt/automaton/automaton.c
  include src/xbt/automaton/automaton_lexer.yy.c
  include src/xbt/automaton/automatonparse_promela.c
@@@ -2686,20 -2603,18 +2688,20 @@@ include src/xbt/xbt_log_layout_format.c
  include src/xbt/xbt_log_layout_simple.cpp
  include src/xbt/xbt_main.cpp
  include src/xbt/xbt_os_file.cpp
 -include src/xbt/xbt_os_synchro.cpp
  include src/xbt/xbt_os_time.c
 +include src/xbt/xbt_parse_units.cpp
  include src/xbt/xbt_replay.cpp
  include src/xbt/xbt_str.cpp
  include src/xbt/xbt_str_test.cpp
  include src/xbt/xbt_virtu.cpp
  include src/xbt_modinter.h
  include teshsuite/java/CMakeLists.txt
 +include teshsuite/kernel/CMakeLists.txt
  include teshsuite/lua/CMakeLists.txt
  include teshsuite/lua/lua_platforms.tesh
  include teshsuite/mc/CMakeLists.txt
  include teshsuite/msg/CMakeLists.txt
 +include teshsuite/python/CMakeLists.txt
  include teshsuite/s4u/CMakeLists.txt
  include teshsuite/simdag/CMakeLists.txt
  include teshsuite/simix/CMakeLists.txt
@@@ -2732,7 -2647,6 +2734,7 @@@ include teshsuite/smpi/mpich3-test/f90/
  include teshsuite/smpi/mpich3-test/group/CMakeLists.txt
  include teshsuite/smpi/mpich3-test/info/CMakeLists.txt
  include teshsuite/smpi/mpich3-test/init/CMakeLists.txt
 +include teshsuite/smpi/mpich3-test/io/CMakeLists.txt
  include teshsuite/smpi/mpich3-test/perf/CMakeLists.txt
  include teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt
  include teshsuite/smpi/mpich3-test/rma/CMakeLists.txt
@@@ -2770,7 -2684,6 +2772,7 @@@ include tools/cmake/test_prog/prog_asan
  include tools/cmake/test_prog/prog_makecontext.c
  include tools/cmake/test_prog/prog_stackgrowth.c
  include tools/cmake/test_prog/prog_stacksetup.c
 +include tools/cmake/test_prog/prog_tsan.cpp
  include tools/doxygen/fig2dev_postprocessor.pl
  include tools/doxygen/list_routing_models_examples.sh
  include tools/doxygen/xbt_log_extract_hierarchy.pl

diff --combined src/kernel/resource/profile/Profile.cpp
index 25457dc,3f2ffba..478c0c4
--- 1/src/kernel/resource/profile/Profile.cpp
--- 2/src/kernel/resource/profile/Profile.cpp
+++ b/src/kernel/resource/profile/Profile.cpp
@@@ -1,4 -1,4 +1,4 @@@
 -/* Copyright (c) 2004-2019. The SimGrid Team. All rights reserved.          */
 +/* Copyright (c) 2004-2020. The SimGrid Team. All rights reserved.          */
  
  /* This program is free software; you can redistribute it and/or modify it
   * under the terms of the license (GNU LGPL) which comes with this package. */
@@@ -8,6 -8,7 +8,7 @@@
  #include "src/kernel/resource/profile/DatedValue.hpp"
  #include "src/kernel/resource/profile/Event.hpp"
  #include "src/kernel/resource/profile/FutureEvtSet.hpp"
+ #include "src/kernel/resource/profile/StochasticDatedValue.hpp"
  #include "src/surf/surf_interface.hpp"
  
  #include <boost/algorithm/string.hpp>
@@@ -27,7 -28,9 +28,9 @@@ Profile::Profile(
  {
    /* Add the first fake event storing the time at which the trace begins */
    DatedValue val(0, -1);
+   StochasticDatedValue stoval(0, -1);
    event_list.push_back(val);
+   stochastic_event_list.push_back(stoval);
  }
  Profile::~Profile() = default;
  
@@@ -35,7 -38,7 +38,7 @@@
   * and get an iterator over the integrated trace  */
  Event* Profile::schedule(FutureEvtSet* fes, resource::Resource* resource)
  {
 -  Event* event    = new Event();
 +  auto* event     = new Event();
    event->profile  = this;
    event->idx      = 0;
    event->resource = resource;
@@@ -45,6 -48,10 +48,10 @@@
  
    fes_ = fes;
    fes_->add_event(0.0 /* start time */, event);
+   if (stochastic > 0) {
+     xbt_assert((event->idx < stochastic_event_list.size()), "Your profile should have at least one stochastic event!");
+     futureDV = stochastic_event_list.at(event->idx).get_datedvalue();
+   }
  
    return event;
  }
@@@ -53,25 -60,43 +60,43 @@@
  DatedValue Profile::next(Event* event)
  {
    double event_date  = fes_->next_date();
-   DatedValue dateVal = event_list.at(event->idx);
- 
-   if (event->idx < event_list.size() - 1) {
-     fes_->add_event(event_date + dateVal.date_, event);
-     event->idx++;
-   } else if (dateVal.date_ > 0) { /* Last element. Shall we loop? */
-     fes_->add_event(event_date + dateVal.date_, event);
-     event->idx = 1; /* idx=0 is a placeholder to store when events really start */
-   } else {          /* If we don't loop, we don't need this event anymore */
-     event->free_me = true;
-   }
  
-   return dateVal;
+   if (not stochastic) {
+     DatedValue dateVal = event_list.at(event->idx);
+ 
+     if (event->idx < event_list.size() - 1) {
+       fes_->add_event(event_date + dateVal.date_, event);
+       event->idx++;
+     } else if (dateVal.date_ > 0) { /* Last element. Shall we loop? */
+       fes_->add_event(event_date + dateVal.date_, event);
+       event->idx = 1; /* idx=0 is a placeholder to store when events really start */
+     } else {          /* If we don't loop, we don't need this event anymore */
+       event->free_me = true;
+     }
+     return dateVal;
+   } else {
+     DatedValue dateVal = futureDV;
+     if (event->idx < stochastic_event_list.size() - 1) {
+       event->idx++;
+     } else if (stochasticloop > 0) { /* We have reached the last element and we have to loop. */
+       event->idx = 1;
+     } else {
+       event->free_me = true; /* We have reached the last element, but we don't need to loop. */
+     }
+ 
+     if (event->free_me == false) { // In the case there is an element, we draw the next event
+       StochasticDatedValue stodateVal = stochastic_event_list.at(event->idx);
+       futureDV                        = stochastic_event_list.at(event->idx).get_datedvalue();
+       fes_->add_event(event_date + futureDV.date_, event);
+     }
+     return dateVal;
+   }
  }
  
  Profile* Profile::from_string(const std::string& name, const std::string& input, double periodicity)
  {
    int linecount                                    = 0;
 -  simgrid::kernel::profile::Profile* profile       = new simgrid::kernel::profile::Profile();
 +  auto* profile                                    = new simgrid::kernel::profile::Profile();
    simgrid::kernel::profile::DatedValue* last_event = &(profile->event_list.back());
  
    xbt_assert(trace_list.find(name) == trace_list.end(), "Refusing to define trace %s twice", name.c_str());
@@@ -80,6 -105,7 +105,7 @@@
    boost::split(list, input, boost::is_any_of("\n\r"));
    for (auto val : list) {
      simgrid::kernel::profile::DatedValue event;
+     simgrid::kernel::profile::StochasticDatedValue stochevent;
      linecount++;
      boost::trim(val);
      if (val[0] == '#' || val[0] == '\0' || val[0] == '%') // pass comments
@@@ -88,17 -114,88 +114,88 @@@
        continue;
      if (sscanf(val.c_str(), "LOOPAFTER %lg\n", &periodicity) == 1)
        continue;
- 
-     XBT_ATTRIB_UNUSED int res = sscanf(val.c_str(), "%lg  %lg\n", &event.date_, &event.value_);
-     xbt_assert(res == 2, "%s:%d: Syntax error in trace\n%s", name.c_str(), linecount, input.c_str());
- 
-     xbt_assert(last_event->date_ <= event.date_,
-                "%s:%d: Invalid trace: Events must be sorted, but time %g > time %g.\n%s", name.c_str(), linecount,
-                last_event->date_, event.date_, input.c_str());
-     last_event->date_ = event.date_ - last_event->date_;
- 
-     profile->event_list.push_back(event);
-     last_event = &(profile->event_list.back());
+     if (val == "STOCHASTIC LOOP") {
+       profile->stochastic     = true;
+       profile->stochasticloop = true;
+       continue;
+     }
+     if (val == "STOCHASTIC") {
+       profile->stochastic = true;
+       continue;
+     }
+ 
+     if (profile->stochastic) {
+       unsigned int i;
+       unsigned int j;
+       std::istringstream iss(val);
+       std::vector<std::string> splittedval((std::istream_iterator<std::string>(iss)),
+                                            std::istream_iterator<std::string>());
+ 
+       xbt_assert(splittedval.size() > 0, "Invalid profile line");
+ 
+       if (splittedval[0] == "DET") {
+         stochevent.date_law = Dist_Det;
+         i                   = 2;
+       } else if (splittedval[0] == "NORM" || splittedval[0] == "NORMAL" || splittedval[0] == "GAUSS" ||
+                  splittedval[0] == "GAUSSIAN") {
+         stochevent.date_law = Dist_Norm;
+         i                   = 3;
+       } else if (splittedval[0] == "EXP" || splittedval[0] == "EXPONENTIAL") {
+         stochevent.date_law = Dist_Exp;
+         i                   = 2;
+       } else if (splittedval[0] == "UNIF" || splittedval[0] == "UNIFORM") {
+         stochevent.date_law = Dist_Unif;
+         i                   = 3;
+       } else {
+         xbt_assert(false, "Unknown law %s", splittedval[0].c_str());
+         i = 0;
+       }
+ 
+       xbt_assert(splittedval.size() > i, "Invalid profile line");
+       if (i == 2) {
+         stochevent.date_params = {std::atof(splittedval[1].c_str())};
+       } else if (i == 3) {
+         stochevent.date_params = {std::atof(splittedval[1].c_str()), std::atof(splittedval[2].c_str())};
+       }
+ 
+       if (splittedval[i] == "DET") {
+         stochevent.value_law = Dist_Det;
+         j                    = 1;
+       } else if (splittedval[i] == "NORM" || splittedval[i] == "NORMAL" || splittedval[i] == "GAUSS" ||
+                  splittedval[i] == "GAUSSIAN") {
+         stochevent.value_law = Dist_Norm;
+         j                    = 2;
+       } else if (splittedval[i] == "EXP" || splittedval[i] == "EXPONENTIAL") {
+         stochevent.value_law = Dist_Exp;
+         j                    = 1;
+       } else if (splittedval[i] == "UNIF" || splittedval[i] == "UNIFORM") {
+         stochevent.value_law = Dist_Unif;
+         j                    = 2;
+       } else {
+         xbt_assert(false, "Unknown law %s", splittedval[i].c_str());
+         j = 0;
+       }
+ 
+       xbt_assert(splittedval.size() > i + j, "Invalid profile line");
+       if (j == 1) {
+         stochevent.value_params = {std::atof(splittedval[i + 1].c_str())};
+       } else if (j == 2) {
+         stochevent.value_params = {std::atof(splittedval[i + 1].c_str()), std::atof(splittedval[i + 2].c_str())};
+       }
+ 
+       profile->stochastic_event_list.push_back(stochevent);
+     } else {
+       XBT_ATTRIB_UNUSED int res = sscanf(val.c_str(), "%lg  %lg\n", &event.date_, &event.value_);
+       xbt_assert(res == 2, "%s:%d: Syntax error in trace\n%s", name.c_str(), linecount, input.c_str());
+ 
+       xbt_assert(last_event->date_ <= event.date_,
+                  "%s:%d: Invalid trace: Events must be sorted, but time %g > time %g.\n%s", name.c_str(), linecount,
+                  last_event->date_, event.date_, input.c_str());
+       last_event->date_ = event.date_ - last_event->date_;
+ 
+       profile->event_list.push_back(event);
+       last_event = &(profile->event_list.back());
+     }
    }
    if (last_event) {
      if (periodicity > 0) {
@@@ -117,7 -214,7 +214,7 @@@ Profile* Profile::from_file(const std::
    xbt_assert(not path.empty(), "Cannot parse a trace from an empty filename");
    xbt_assert(trace_list.find(path) == trace_list.end(), "Refusing to define trace %s twice", path.c_str());
  
 -  std::ifstream* f = surf_ifsopen(path);
 +  const std::ifstream* f = surf_ifsopen(path);
    xbt_assert(not f->fail(), "Cannot open file '%s' (path=%s)", path.c_str(), (boost::join(surf_path, ":")).c_str());
  
    std::stringstream buffer;

diff --combined src/kernel/resource/profile/Profile.hpp
index 5aa6058,263a630..71a2d8c
--- 1/src/kernel/resource/profile/Profile.hpp
--- 2/src/kernel/resource/profile/Profile.hpp
+++ b/src/kernel/resource/profile/Profile.hpp
@@@ -1,4 -1,4 +1,4 @@@
 -/* Copyright (c) 2004-2019. The SimGrid Team. All rights reserved.          */
 +/* Copyright (c) 2004-2020. The SimGrid Team. All rights reserved.          */
  
  /* This program is free software; you can redistribute it and/or modify it
   * under the terms of the license (GNU LGPL) which comes with this package. */
@@@ -9,6 -9,7 +9,7 @@@
  #include "simgrid/forward.h"
  #include "src/kernel/resource/profile/DatedValue.hpp"
  #include "src/kernel/resource/profile/FutureEvtSet.hpp"
+ #include "src/kernel/resource/profile/StochasticDatedValue.hpp"
  
  #include <queue>
  #include <vector>
@@@ -35,9 -36,13 +36,13 @@@ public
    static Profile* from_string(const std::string& name, const std::string& input, double periodicity);
    // private:
    std::vector<DatedValue> event_list;
+   std::vector<StochasticDatedValue> stochastic_event_list;
  
  private:
-   FutureEvtSet* fes_ = nullptr;
+   FutureEvtSet* fes_  = nullptr;
+   bool stochastic     = false;
+   bool stochasticloop = false;
+   DatedValue futureDV;
  };
  
  } // namespace profile

diff --combined src/kernel/resource/profile/Profile_test.cpp
index 4c0aff2,7d7648e..ec95c30
--- 1/src/kernel/resource/profile/Profile_test.cpp
--- 2/src/kernel/resource/profile/Profile_test.cpp
+++ b/src/kernel/resource/profile/Profile_test.cpp
@@@ -1,4 -1,4 +1,4 @@@
 -/* Copyright (c) 2017-2019. The SimGrid Team. All rights reserved.               */
 +/* Copyright (c) 2017-2020. The SimGrid Team. All rights reserved.               */
  
  /* This program is free software; you can redistribute it and/or modify it
   * under the terms of the license (GNU LGPL) which comes with this package. */
@@@ -9,10 -9,12 +9,12 @@@
  #include "src/kernel/resource/profile/DatedValue.hpp"
  #include "src/kernel/resource/profile/Event.hpp"
  #include "src/kernel/resource/profile/Profile.hpp"
+ #include "src/kernel/resource/profile/StochasticDatedValue.hpp"
  #include "src/surf/surf_interface.hpp"
  
  #include "xbt/log.h"
  #include "xbt/misc.h"
+ #include "xbt/random.hpp"
  
  #include <cmath>
  
@@@ -27,7 -29,7 +29,7 @@@ public
      XBT_VERB("t=%.1f: Change value to %lg (idx: %u)", thedate, value, event->idx);
      tmgr_trace_event_unref(&event);
    }
 -  bool is_used() override { return true; }
 +  bool is_used() const override { return true; }
  };
  
  static std::vector<simgrid::kernel::profile::DatedValue> trace2vector(const char* str)
@@@ -53,7 -55,7 +55,7 @@@
  
      REQUIRE(it == insertedIt); // Check that we find what we've put
      if (value >= 0) {
 -      res.push_back(simgrid::kernel::profile::DatedValue(thedate, value));
 +      res.emplace_back(thedate, value);
      } else {
        XBT_DEBUG("%.1f: ignore an event (idx: %u)\n", thedate, it->idx);
      }
@@@ -63,8 -65,17 +65,16 @@@
    return res;
  }
  
+ static std::vector<simgrid::kernel::profile::StochasticDatedValue> trace2selist(const char* str)
+ {
+   simgrid::kernel::profile::Profile* trace = simgrid::kernel::profile::Profile::from_string("TheName", str, 0);
+   std::vector<simgrid::kernel::profile::StochasticDatedValue> stocevlist = trace->stochastic_event_list;
+   tmgr_finalize();
+   return stocevlist;
+ }
+ 
  TEST_CASE("kernel::profile: Resource profiles, defining the external load", "kernel::profile")
  {
 -
    SECTION("No event, no loop")
    {
      std::vector<simgrid::kernel::profile::DatedValue> got = trace2vector("");
@@@ -77,7 -88,7 +87,7 @@@
      std::vector<simgrid::kernel::profile::DatedValue> got = trace2vector("9.0 3.0\n");
  
      std::vector<simgrid::kernel::profile::DatedValue> want;
 -    want.push_back(simgrid::kernel::profile::DatedValue(9, 3));
 +    want.emplace_back(9, 3);
      REQUIRE(want == got);
    }
  
@@@ -87,22 -98,23 +97,22 @@@
                                                                           "9.0 3.0\n");
  
      std::vector<simgrid::kernel::profile::DatedValue> want;
 -    want.push_back(simgrid::kernel::profile::DatedValue(3, 1));
 -    want.push_back(simgrid::kernel::profile::DatedValue(9, 3));
 +    want.emplace_back(3, 1);
 +    want.emplace_back(9, 3);
  
      REQUIRE(want == got);
    }
  
    SECTION("Three events, no loop")
    {
 -
      std::vector<simgrid::kernel::profile::DatedValue> got = trace2vector("3.0 1.0\n"
                                                                           "5.0 2.0\n"
                                                                           "9.0 3.0\n");
  
      std::vector<simgrid::kernel::profile::DatedValue> want;
 -    want.push_back(simgrid::kernel::profile::DatedValue(3, 1));
 -    want.push_back(simgrid::kernel::profile::DatedValue(5, 2));
 -    want.push_back(simgrid::kernel::profile::DatedValue(9, 3));
 +    want.emplace_back(3, 1);
 +    want.emplace_back(5, 2);
 +    want.emplace_back(9, 3);
  
      REQUIRE(want == got);
    }
@@@ -114,14 -126,14 +124,14 @@@
                                                                           "LOOPAFTER 2\n");
  
      std::vector<simgrid::kernel::profile::DatedValue> want;
 -    want.push_back(simgrid::kernel::profile::DatedValue(1, 1));
 -    want.push_back(simgrid::kernel::profile::DatedValue(3, 3));
 -    want.push_back(simgrid::kernel::profile::DatedValue(6, 1));
 -    want.push_back(simgrid::kernel::profile::DatedValue(8, 3));
 -    want.push_back(simgrid::kernel::profile::DatedValue(11, 1));
 -    want.push_back(simgrid::kernel::profile::DatedValue(13, 3));
 -    want.push_back(simgrid::kernel::profile::DatedValue(16, 1));
 -    want.push_back(simgrid::kernel::profile::DatedValue(18, 3));
 +    want.emplace_back(1, 1);
 +    want.emplace_back(3, 3);
 +    want.emplace_back(6, 1);
 +    want.emplace_back(8, 3);
 +    want.emplace_back(11, 1);
 +    want.emplace_back(13, 3);
 +    want.emplace_back(16, 1);
 +    want.emplace_back(18, 3);
  
      REQUIRE(want == got);
    }
@@@ -133,12 -145,81 +143,81 @@@
                                                                           "LOOPAFTER 5\n");
  
      std::vector<simgrid::kernel::profile::DatedValue> want;
 -    want.push_back(simgrid::kernel::profile::DatedValue(0, 1));
 -    want.push_back(simgrid::kernel::profile::DatedValue(5, 2));
 -    want.push_back(simgrid::kernel::profile::DatedValue(10, 1));
 -    want.push_back(simgrid::kernel::profile::DatedValue(15, 2));
 -    want.push_back(simgrid::kernel::profile::DatedValue(20, 1));
 +    want.emplace_back(0, 1);
 +    want.emplace_back(5, 2);
 +    want.emplace_back(10, 1);
 +    want.emplace_back(15, 2);
 +    want.emplace_back(20, 1);
  
      REQUIRE(want == got);
    }
+ 
+   SECTION("One stochastic event (parsing)")
+   {
+     std::vector<simgrid::kernel::profile::StochasticDatedValue> got = trace2selist("STOCHASTIC\n"
+                                                                                    "DET 0 UNIF 10 20");
+ 
+     std::vector<simgrid::kernel::profile::StochasticDatedValue> want;
+     want.push_back(simgrid::kernel::profile::StochasticDatedValue(0, -1)); // The initial fake event
+     want.push_back(simgrid::kernel::profile::StochasticDatedValue(simgrid::kernel::profile::Dist_Det, {0},
+                                                                   simgrid::kernel::profile::Dist_Unif, {10, 20}));
+ 
+     REQUIRE(want == got);
+   }
+ 
+   SECTION("Several stochastic events (all possible parsing forms)")
+   {
+     std::vector<simgrid::kernel::profile::StochasticDatedValue> got = trace2selist("STOCHASTIC\n"
+                                                                                    "DET 0 DET 4\n"
+                                                                                    "NORMAL 25 10 DET 3\n"
+                                                                                    "UNIF 10 20 NORMAL 25 10\n"
+                                                                                    "DET 5 UNIF 5 25");
+ 
+     std::vector<simgrid::kernel::profile::StochasticDatedValue> want;
+     want.push_back(simgrid::kernel::profile::StochasticDatedValue(0, -1));
+     want.push_back(simgrid::kernel::profile::StochasticDatedValue(simgrid::kernel::profile::Dist_Det, {0},
+                                                                   simgrid::kernel::profile::Dist_Det, {4}));
+     want.push_back(simgrid::kernel::profile::StochasticDatedValue(simgrid::kernel::profile::Dist_Norm, {25, 10},
+                                                                   simgrid::kernel::profile::Dist_Det, {3}));
+     want.push_back(simgrid::kernel::profile::StochasticDatedValue(simgrid::kernel::profile::Dist_Unif, {10, 20},
+                                                                   simgrid::kernel::profile::Dist_Norm, {25, 10}));
+     want.push_back(simgrid::kernel::profile::StochasticDatedValue(simgrid::kernel::profile::Dist_Det, {5},
+                                                                   simgrid::kernel::profile::Dist_Unif, {5, 25}));
+ 
+     REQUIRE(want == got);
+   }
+ 
+   SECTION("Two stochastic events (drawing each distribution)")
+   {
+     simgrid::xbt::random::set_mersenne_seed(12345);
+     std::vector<simgrid::kernel::profile::DatedValue> got = trace2vector("STOCHASTIC\n"
+                                                                          "DET 0 UNIF 10 20\n"
+                                                                          "EXP 0.05 NORMAL 15 5");
+ 
+     std::vector<simgrid::kernel::profile::DatedValue> want;
+     // The following values were drawn using the XBT_RNG_xbt method /outside/ the testcase.
+     want.push_back(simgrid::kernel::profile::DatedValue(0, 19.29616086867082813683));
+     want.push_back(simgrid::kernel::profile::DatedValue(2.32719992449416279712, 20.16807234800742065772));
+ 
+     REQUIRE(want == got);
+   }
+ 
+   SECTION("Two stochastic events, with a loop")
+   {
+     simgrid::xbt::random::set_mersenne_seed(12345);
+     std::vector<simgrid::kernel::profile::DatedValue> got = trace2vector("STOCHASTIC LOOP\n"
+                                                                          "DET 0 UNIF 10 20\n"
+                                                                          "EXP 0.05 NORMAL 15 5\n"
+                                                                          "UNIF 1 2 DET 0");
+ 
+     // In this case, the main use of the last stochastic event is to set when the first event takes place.
+ 
+     std::vector<simgrid::kernel::profile::DatedValue> want;
+     want.push_back(simgrid::kernel::profile::DatedValue(0, 19.29616086867082813683));
+     want.push_back(simgrid::kernel::profile::DatedValue(2.32719992449416279712, 20.16807234800742065772));
+     want.push_back(simgrid::kernel::profile::DatedValue(3.51111873684917075167, 0));
+     want.push_back(simgrid::kernel::profile::DatedValue(3.51111873684917075167, 10.39759496468994726115));
+ 
+     REQUIRE(want == got);
+   }
  }

diff --combined tools/cmake/DefinePackages.cmake
index b4b2dd6,4344ecb..1062af7
--- 1/tools/cmake/DefinePackages.cmake
--- 2/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@@ -24,7 -24,7 +24,7 @@@ set(EXTRA_DIS
    src/simix/popping_private.hpp
    src/simix/popping_bodies.cpp
    src/simix/popping_generated.cpp
 -  src/simix/popping_enum.h
 +  src/simix/popping_enum.hpp
    src/simix/popping_accessors.hpp
    src/simix/smx_private.hpp
    src/smpi/colls/coll_tuned_topo.hpp
@@@ -55,6 -55,7 +55,6 @@@
    src/surf/storage_n11.hpp
    src/surf/surf_interface.hpp
    src/surf/surf_private.hpp
 -  src/surf/PropertyHolder.hpp
    src/surf/host_clm03.hpp
    src/surf/HostImpl.hpp
    src/surf/ptask_L07.hpp
@@@ -99,7 -100,6 +99,7 @@@ set(SMPI_SR
    src/smpi/internals/smpi_replay.cpp
    src/smpi/internals/smpi_actor.cpp
    src/smpi/internals/smpi_utils.cpp
 +  src/smpi/internals/smpi_config.cpp
    src/smpi/mpi/smpi_comm.cpp
    src/smpi/mpi/smpi_datatype.cpp
    src/smpi/mpi/smpi_datatype_derived.cpp
@@@ -117,7 -117,6 +117,7 @@@
    src/smpi/include/smpi_actor.hpp
    src/smpi/include/smpi_coll.hpp
    src/smpi/include/smpi_comm.hpp
 +  src/smpi/include/smpi_config.hpp
    src/smpi/include/smpi_datatype_derived.hpp
    src/smpi/include/smpi_datatype.hpp
    src/smpi/include/smpi_errhandler.hpp
@@@ -156,7 -155,6 +156,7 @@@
    src/smpi/bindings/smpi_f77.cpp
    src/smpi/bindings/smpi_f77_coll.cpp
    src/smpi/bindings/smpi_f77_comm.cpp
 +  src/smpi/bindings/smpi_f77_file.cpp
    src/smpi/bindings/smpi_f77_request.cpp
    src/smpi/bindings/smpi_f77_type.cpp
    src/smpi/colls/smpi_coll.cpp
@@@ -284,7 -282,6 +284,7 @@@ set(XBT_SR
    src/xbt/memory_map.cpp
    src/xbt/memory_map.hpp
    src/xbt/OsSemaphore.hpp
 +  src/xbt/PropertyHolder.cpp
    src/xbt/parmap.cpp
    src/xbt/random.cpp
    src/xbt/snprintf.c
@@@ -294,8 -291,8 +294,8 @@@
    src/xbt/xbt_log_layout_simple.cpp
    src/xbt/xbt_main.cpp
    src/xbt/xbt_os_file.cpp
 -  src/xbt/xbt_os_synchro.cpp
    src/xbt/xbt_os_time.c
 +  src/xbt/xbt_parse_units.cpp
    src/xbt/xbt_replay.cpp
    src/xbt/xbt_str.cpp
    src/xbt/xbt_virtu.cpp
@@@ -329,6 -326,8 +329,8 @@@ set(SURF_SR
    src/kernel/resource/profile/FutureEvtSet.hpp
    src/kernel/resource/profile/Profile.cpp
    src/kernel/resource/profile/Profile.hpp
+   src/kernel/resource/profile/StochasticDatedValue.cpp
+   src/kernel/resource/profile/StochasticDatedValue.hpp
  
    src/kernel/routing/ClusterZone.cpp
    src/kernel/routing/DijkstraZone.cpp
@@@ -342,7 -341,6 +344,7 @@@
    src/kernel/routing/TorusZone.cpp
    src/kernel/routing/RoutedZone.cpp
    src/kernel/routing/VivaldiZone.cpp
 +  src/kernel/routing/WifiZone.cpp
  
    src/kernel/EngineImpl.cpp
    src/kernel/EngineImpl.hpp
@@@ -355,6 -353,7 +357,6 @@@
    src/surf/network_constant.cpp
    src/surf/network_interface.cpp
    src/surf/network_wifi.cpp
 -  src/surf/PropertyHolder.cpp
    src/surf/sg_platf.cpp
    src/surf/StorageImpl.cpp
    src/surf/storage_n11.cpp
@@@ -374,9 -373,7 +376,9 @@@ set(PLUGINS_SR
    src/plugins/host_dvfs.cpp
    src/plugins/host_energy.cpp
    src/plugins/link_energy.cpp
 +  src/plugins/link_energy_wifi.cpp
    src/plugins/host_load.cpp
 +  src/plugins/link_load.cpp
    src/plugins/file_system/s4u_FileSystem.cpp
    src/plugins/vm/VirtualMachineImpl.hpp
    src/plugins/vm/s4u_VirtualMachine.cpp
@@@ -393,6 -390,7 +395,6 @@@ set(SIMIX_SR
    src/kernel/future.cpp
    src/simix/libsmx.cpp
    src/simix/smx_context.cpp
 -  src/kernel/context/context_private.hpp
    src/kernel/context/Context.cpp
    src/kernel/context/Context.hpp
    src/kernel/context/ContextRaw.cpp
@@@ -465,7 -463,6 +467,7 @@@ set(S4U_SR
  set(SIMGRID_SRC
    src/simgrid/Exception.cpp
    src/simgrid/sg_config.cpp
 +  src/simgrid/sg_version.cpp
    src/simgrid/util.hpp
    )
  
@@@ -570,6 -567,7 +572,6 @@@ set(TRACING_SR
    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_paje_values.hpp
    src/instr/instr_platform.cpp
    src/instr/instr_private.hpp
@@@ -629,14 -627,12 +631,14 @@@ set(MC_SR
    src/mc/inspect/mc_unw.cpp
    src/mc/inspect/mc_unw_vmread.cpp
  
 +  src/mc/remote/AppSide.cpp
 +  src/mc/remote/AppSide.hpp
    src/mc/remote/Channel.cpp
    src/mc/remote/Channel.hpp
 -  src/mc/remote/Client.cpp
 -  src/mc/remote/Client.hpp
 -  src/mc/remote/RemoteClient.hpp
 -  src/mc/remote/RemoteClient.cpp
 +  src/mc/remote/CheckerSide.cpp
 +  src/mc/remote/CheckerSide.hpp
 +  src/mc/remote/RemoteSimulation.hpp
 +  src/mc/remote/RemoteSimulation.cpp
    src/mc/remote/RemotePtr.hpp
    src/mc/remote/mc_protocol.h
    src/mc/remote/mc_protocol.cpp
@@@ -663,6 -659,7 +665,6 @@@
    src/mc/mc_hash.cpp
    src/mc/mc_ignore.hpp
    src/mc/mc_record.cpp
 -  src/mc/mc_memory.cpp
    src/mc/mc_private.hpp
    src/mc/mc_request.hpp
    src/mc/mc_request.cpp
@@@ -683,9 -680,7 +685,9 @@@ set(MC_SIMGRID_MC_SRC  src/mc/checker/s
  set(headers_to_install
    include/simgrid/actor.h
    include/simgrid/barrier.h
 +  include/simgrid/comm.h
    include/simgrid/engine.h
 +  include/simgrid/exec.h
    include/simgrid/Exception.hpp
    include/simgrid/chrono.hpp
    include/simgrid/plugins/dvfs.h
@@@ -697,6 -692,7 +699,6 @@@
    include/simgrid/smpi/replay.hpp
    include/simgrid/instr.h
    include/simgrid/mailbox.h
 -  include/simgrid/msg.h
    include/simgrid/simdag.h
    include/simgrid/modelchecker.h
    include/simgrid/forward.h
@@@ -704,7 -700,6 +706,7 @@@
    include/simgrid/simix.hpp
    include/simgrid/simix/blocking_simcall.hpp
    include/simgrid/kernel/future.hpp
 +  include/simgrid/disk.h
    include/simgrid/host.h
    include/simgrid/link.h
    include/simgrid/cond.h
@@@ -748,7 -743,6 +750,7 @@@
    include/simgrid/kernel/routing/RoutedZone.hpp
    include/simgrid/kernel/routing/TorusZone.hpp
    include/simgrid/kernel/routing/VivaldiZone.hpp
 +  include/simgrid/kernel/routing/WifiZone.hpp
  
    include/smpi/mpi.h
    include/smpi/sampi.h
@@@ -781,9 -775,7 +783,9 @@@
    include/xbt/mallocator.h
    include/xbt/misc.h
    include/xbt/module.h
 +  include/xbt/PropertyHolder.hpp
    include/xbt/parmap.h
 +  include/xbt/parse_units.hpp
    include/xbt/range.hpp
    include/xbt/random.hpp
    include/xbt/replay.hpp
@@@ -799,11 -791,11 +801,11 @@@
    )
  set(source_of_generated_headers
    include/simgrid/config.h.in
 +  include/simgrid/version.h.in
    src/internal_config.h.in
 -  src/simgrid/version.h.in
    include/smpi/mpif.h.in)
  
 -### depend of some variables setted upper
 +### depend of some variables set upper
  if(${HAVE_UCONTEXT_CONTEXTS}) #ucontext
    set(SIMIX_SRC    ${SIMIX_SRC} src/kernel/context/ContextUnix.hpp
                                  src/kernel/context/ContextUnix.cpp)
@@@ -823,17 -815,10 +825,17 @@@ set(simgrid_source
    ${XBT_SRC}
    ${PLUGINS_SRC}
    ${BINDINGS_SRC}
 -  ${MSG_SRC}
    ${SIMDAG_SRC}
    )
  
 +if(${enable_msg})
 +  set(headers_to_install ${headers_to_install}  include/simgrid/msg.h)
 +  set(simgrid_sources    ${simgrid_sources}     ${MSG_SRC})
 +else()
 +  set(EXTRA_DIST         ${EXTRA_DIST}          include/simgrid/msg.h
 +                                                ${MSG_SRC})
 +endif()
 +
  if(${SIMGRID_HAVE_JEDULE})
    set(simgrid_sources  ${simgrid_sources}  ${JEDULE_SRC})
  else()
@@@ -894,27 -879,11 +896,27 @@@ set(DOC_SOURCE
    docs/requirements.txt
    docs/source/conf.py
    docs/source/Doxyfile
 +  docs/find-missing.ignore
    docs/find-missing.py
    docs/source/_ext/autodoxy.py
    docs/source/_ext/showfile.css
    docs/source/_ext/showfile.js
    docs/source/_ext/showfile.py
 +  docs/source/_ext/javasphinx/LICENSE
 +  docs/source/_ext/javasphinx/MANIFEST.in
 +  docs/source/_ext/javasphinx/README.md
 +  docs/source/_ext/javasphinx/doc/conf.py
 +  docs/source/_ext/javasphinx/doc/index.rst
 +  docs/source/_ext/javasphinx/javasphinx/__init__.py
 +  docs/source/_ext/javasphinx/javasphinx/apidoc.py
 +  docs/source/_ext/javasphinx/javasphinx/compiler.py
 +  docs/source/_ext/javasphinx/javasphinx/domain.py
 +  docs/source/_ext/javasphinx/javasphinx/extdoc.py
 +  docs/source/_ext/javasphinx/javasphinx/formatter.py
 +  docs/source/_ext/javasphinx/javasphinx/htmlrst.py
 +  docs/source/_ext/javasphinx/javasphinx/util.py
 +  docs/source/_ext/javasphinx/setup.py
 +  docs/source/_static/css/custom.css
    docs/source/_templates/breadcrumbs.html
  
    docs/source/img/eclipseScreenShot.png
@@@ -942,9 -911,8 +944,9 @@@
    docs/source/ns3.rst
    docs/source/outcomes.rst
    docs/source/platform.rst
 -  docs/source/platform_howtos.rst
    docs/source/Platform_Examples.rst
 +  docs/source/platform_howtos.rst
 +  docs/source/Platform_Routing.rst
    docs/source/Plugins.rst
    docs/source/XML_Reference.rst
  
@@@ -1026,11 -994,10 +1028,11 @@@ set(txt_file
  # The list of cmake build directories is constructed from the following list.
  # Add your CMakeLists file here to see your subdir built.
  set(CMAKEFILES_TXT
 +  examples/c/CMakeLists.txt
    examples/s4u/CMakeLists.txt
    examples/smpi/CMakeLists.txt
    examples/smpi/NAS/CMakeLists.txt
 -  examples/smpi/smpi_msg_masterslave/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
@@@ -1040,11 -1007,9 +1042,11 @@@
    examples/deprecated/simdag/CMakeLists.txt
  
    teshsuite/java/CMakeLists.txt
 +  teshsuite/kernel/CMakeLists.txt
    teshsuite/lua/CMakeLists.txt
    teshsuite/mc/CMakeLists.txt
    teshsuite/msg/CMakeLists.txt
 +  teshsuite/python/CMakeLists.txt
    teshsuite/s4u/CMakeLists.txt
    teshsuite/simdag/CMakeLists.txt
    teshsuite/simix/CMakeLists.txt
@@@ -1079,7 -1044,6 +1081,7 @@@
    teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt
    teshsuite/smpi/mpich3-test/group/CMakeLists.txt
    teshsuite/smpi/mpich3-test/info/CMakeLists.txt
 +  teshsuite/smpi/mpich3-test/io/CMakeLists.txt
    teshsuite/smpi/mpich3-test/init/CMakeLists.txt
    teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt
    teshsuite/smpi/mpich3-test/topo/CMakeLists.txt
@@@ -1123,7 -1087,6 +1125,7 @@@ set(CMAKE_SOURCE_FILE
    tools/cmake/test_prog/prog_makecontext.c
    tools/cmake/test_prog/prog_stackgrowth.c
    tools/cmake/test_prog/prog_stacksetup.c
 +  tools/cmake/test_prog/prog_tsan.cpp
    tools/cmake/cross-mingw.cmake
    tools/smpi/generate_smpi_defines.pl
    tools/stack-cleaner/as
@@@ -1140,7 -1103,7 +1142,7 @@@
    )
  
  set(PLATFORMS_EXAMPLES
 -  examples/platforms/bypassASroute.xml
 +  examples/platforms/bypassZoneRoute.xml
    examples/platforms/bypassRoute.xml
    examples/platforms/cloud.xml
    examples/platforms/cluster_backbone.xml
@@@ -1160,7 -1123,6 +1162,7 @@@
    examples/platforms/optorsim/transform_optorsim_platform.pl
    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
@@@ -1193,6 -1155,7 +1195,6 @@@
    examples/platforms/simulacrum_7_hosts.xml
    examples/platforms/storage/content/small_content.txt
    examples/platforms/storage/content/storage_content.txt
 -  examples/platforms/storage/remote_io.xml
    examples/platforms/storage/storage.xml
    examples/platforms/small_platform.xml
    examples/platforms/small_platform.lua
@@@ -1213,7 -1176,6 +1215,7 @@@
    examples/platforms/two_hosts_platform_with_availability_included.xml
    examples/platforms/two_peers.xml
    examples/platforms/vivaldi.xml
 +  examples/platforms/wifi_energy.xml
    examples/platforms/wifi.xml
    )