Merge branch 'master' into 'rework-energy-plugin'

# Conflicts:
#   include/simgrid/plugins/energy.h

diff --cc MANIFEST.in
Simple merge

diff --cc examples/s4u/CMakeLists.txt
index e8d52f6,9462c8a..034f340
--- 1/examples/s4u/CMakeLists.txt
--- 2/examples/s4u/CMakeLists.txt
+++ b/examples/s4u/CMakeLists.txt
@@@ -7,13 -7,13 +7,13 @@@ foreach (example actor-create actor-dae
                   app-chainsend app-pingpong app-token-ring
                   async-ready async-wait async-waitany async-waitall async-waituntil
                   cloud-capping cloud-migration cloud-simple
 -                 energy-exec energy-boot energy-link energy-vm
 +                 energy-exec energy-boot energy-link energy-vm energy-exec-ptask
                   engine-filtering
                   exec-async exec-basic exec-dvfs exec-ptask exec-remote exec-waitany
-                  io-async io-file-system io-file-remote io-storage-raw
+                  io-async io-file-system io-file-remote io-disk-raw
                   platform-failures platform-profile platform-properties
                   plugin-hostload
-                  replay-comm replay-storage
+                  replay-comm replay-io
                   routing-get-clusters
                   synchro-barrier synchro-mutex synchro-semaphore)
    add_executable       (s4u-${example} EXCLUDE_FROM_ALL ${example}/s4u-${example}.cpp)

diff --cc include/simgrid/plugins/energy.h
index c8ad348,041e4bd..7b08818
--- 1/include/simgrid/plugins/energy.h
--- 2/include/simgrid/plugins/energy.h
+++ b/include/simgrid/plugins/energy.h
@@@ -27,9 -26,8 +27,9 @@@ XBT_PUBLIC int sg_link_energy_is_inited
  
  #define MSG_host_energy_plugin_init() sg_host_energy_plugin_init()
  #define MSG_host_get_consumed_energy(host) sg_host_get_consumed_energy(host)
- #define MSG_host_get_wattmin_at(host,pstate) sg_host_get_wattmin_at(host,pstate)
- #define MSG_host_get_wattmax_at(host,pstate) sg_host_get_wattmax_at(host,pstate)
- #define MSG_host_get_power_range_slope_at(host,pstate) sg_host_get_power_range_slope_at(host,pstate)
 -#define MSG_host_get_wattmin_at(host, pstate) sg_host_get_wattmin_at((host), (pstate))
 -#define MSG_host_get_wattmax_at(host, pstate) sg_host_get_wattmax_at((host), (pstate))
++#define MSG_host_get_wattmin_at(host,pstate) sg_host_get_wattmin_at((host), (pstate))
++#define MSG_host_get_wattmax_at(host,pstate) sg_host_get_wattmax_at((host), (pstate))
++#define MSG_host_get_power_range_slope_at(host,pstate) sg_host_get_power_range_slope_at((host), (pstate))
  #define MSG_host_get_current_consumption(host) sg_host_get_current_consumption(host)
  
  SG_END_DECL()

diff --cc src/plugins/host_energy.cpp
Simple merge