Merge branch 'plugins-energy-battery-interaction' into 'master'

Battery plugin revamp

See merge request simgrid/simgrid!168

diff --combined MANIFEST.in
index a3e6cb4,85b0de1..e0c96c2
--- 1/MANIFEST.in
--- 2/MANIFEST.in
+++ b/MANIFEST.in
@@@ -1,14 -1,6 +1,14 @@@
  # This file lists the content of the python source package
  # Prepared in tools/cmake/Distrib.cmake
  
 +include examples/c/activityset-testany/activityset-testany.c
 +include examples/c/activityset-testany/activityset-testany.tesh
 +include examples/c/activityset-waitall/activityset-waitall.c
 +include examples/c/activityset-waitall/activityset-waitall.tesh
 +include examples/c/activityset-waitallfor/activityset-waitallfor.c
 +include examples/c/activityset-waitallfor/activityset-waitallfor.tesh
 +include examples/c/activityset-waitany/activityset-waitany.c
 +include examples/c/activityset-waitany/activityset-waitany.tesh
  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
@@@ -73,6 -65,12 +73,6 @@@ include examples/c/comm-wait/comm-wait2
  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
@@@ -104,6 -102,8 +104,6 @@@ include examples/c/exec-dvfs/exec-dvfs.
  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
@@@ -359,8 -359,6 +359,8 @@@ include examples/cpp/platform-propertie
  include examples/cpp/platform-properties/s4u-platform-properties.tesh
  include examples/cpp/plugin-host-load/s4u-plugin-host-load.cpp
  include examples/cpp/plugin-host-load/s4u-plugin-host-load.tesh
 +include examples/cpp/plugin-jbod/s4u-plugin-jbod.cpp
 +include examples/cpp/plugin-jbod/s4u-plugin-jbod.tesh
  include examples/cpp/plugin-link-load/s4u-plugin-link-load.cpp
  include examples/cpp/plugin-link-load/s4u-plugin-link-load.tesh
  include examples/cpp/plugin-prodcons/s4u-plugin-prodcons.cpp
@@@ -416,14 -414,6 +416,14 @@@ include examples/cpp/trace-process-migr
  include examples/cpp/trace-process-migration/s4u-trace-process-migration.tesh
  include examples/cpp/trace-route-user-variables/s4u-trace-route-user-variables.cpp
  include examples/cpp/trace-route-user-variables/s4u-trace-route-user-variables.tesh
 +include examples/python/activityset-testany/activityset-testany.py
 +include examples/python/activityset-testany/activityset-testany.tesh
 +include examples/python/activityset-waitall/activityset-waitall.py
 +include examples/python/activityset-waitall/activityset-waitall.tesh
 +include examples/python/activityset-waitallfor/activityset-waitallfor.py
 +include examples/python/activityset-waitallfor/activityset-waitallfor.tesh
 +include examples/python/activityset-waitany/activityset-waitany.py
 +include examples/python/activityset-waitany/activityset-waitany.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
@@@ -454,10 -444,18 +454,10 @@@ include examples/python/comm-ready/comm
  include examples/python/comm-ready/comm-ready.tesh
  include examples/python/comm-suspend/comm-suspend.py
  include examples/python/comm-suspend/comm-suspend.tesh
 -include examples/python/comm-testany/comm-testany.py
 -include examples/python/comm-testany/comm-testany.tesh
  include examples/python/comm-throttling/comm-throttling.py
  include examples/python/comm-throttling/comm-throttling.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-waitallfor/comm-waitallfor.py
 -include examples/python/comm-waitallfor/comm-waitallfor.tesh
 -include examples/python/comm-waitany/comm-waitany.py
 -include examples/python/comm-waitany/comm-waitany.tesh
  include examples/python/comm-waituntil/comm-waituntil.py
  include examples/python/comm-waituntil/comm-waituntil.tesh
  include examples/python/exec-async/exec-async.py
@@@ -826,6 -824,10 +826,6 @@@ include teshsuite/s4u/vm-live-migration
  include teshsuite/s4u/vm-live-migration/vm-live-migration.tesh
  include teshsuite/s4u/vm-suicide/vm-suicide.cpp
  include teshsuite/s4u/vm-suicide/vm-suicide.tesh
 -include teshsuite/s4u/wait-all-for/wait-all-for.cpp
 -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/smpi/MBI/CollArgGenerator.py
  include teshsuite/smpi/MBI/CollComGenerator.py
  include teshsuite/smpi/MBI/CollLocalConcurrencyGenerator.py
@@@ -1805,7 -1807,6 +1805,6 @@@ include examples/README.rs
  include examples/c/CMakeLists.txt
  include examples/cpp/CMakeLists.txt
  include examples/platforms/CMakeLists.txt
- include examples/platforms/battery_platform.xml
  include examples/platforms/bypassRoute.xml
  include examples/platforms/bypassZoneRoute.xml
  include examples/platforms/cloud.xml
@@@ -1900,7 -1901,6 +1899,7 @@@ include examples/smpi/replay_multiple_m
  include examples/smpi/smpi_s4u_masterworker/CMakeLists.txt
  include examples/sthread/CMakeLists.txt
  include include/simgrid/Exception.hpp
 +include include/simgrid/activity_set.h
  include include/simgrid/actor.h
  include include/simgrid/barrier.h
  include include/simgrid/chrono.hpp
@@@ -1940,7 -1940,6 +1939,7 @@@ include include/simgrid/plugins/battery
  include include/simgrid/plugins/dvfs.h
  include include/simgrid/plugins/energy.h
  include include/simgrid/plugins/file_system.h
 +include include/simgrid/plugins/jbod.hpp
  include include/simgrid/plugins/live_migration.h
  include include/simgrid/plugins/load.h
  include include/simgrid/plugins/ns3.hpp
@@@ -2317,7 -2316,6 +2316,7 @@@ include src/plugins/file_system/s4u_Fil
  include src/plugins/host_dvfs.cpp
  include src/plugins/host_energy.cpp
  include src/plugins/host_load.cpp
 +include src/plugins/jbod.cpp
  include src/plugins/link_energy.cpp
  include src/plugins/link_energy_wifi.cpp
  include src/plugins/link_load.cpp

diff --combined tools/cmake/DefinePackages.cmake
index 073f393,3a03fc2..8215478
--- 1/tools/cmake/DefinePackages.cmake
--- 2/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@@ -445,7 -445,6 +445,7 @@@ set(PLUGINS_SR
    src/plugins/host_dvfs.cpp
    src/plugins/host_energy.cpp
    src/plugins/host_load.cpp
 +  src/plugins/jbod.cpp
    src/plugins/link_energy.cpp
    src/plugins/link_energy_wifi.cpp
    src/plugins/link_load.cpp
@@@ -649,7 -648,6 +649,7 @@@ set(MC_SIMGRID_MC_SRC  src/mc/explo/sim
  
  set(headers_to_install
    include/simgrid/actor.h
 +  include/simgrid/activity_set.h
    include/simgrid/barrier.h
    include/simgrid/comm.h
    include/simgrid/engine.h
@@@ -660,7 -658,6 +660,7 @@@
    include/simgrid/plugins/dvfs.h
    include/simgrid/plugins/energy.h
    include/simgrid/plugins/file_system.h
 +  include/simgrid/plugins/jbod.hpp
    include/simgrid/plugins/live_migration.h
    include/simgrid/plugins/load.h
    include/simgrid/plugins/photovoltaic.hpp
@@@ -1105,7 -1102,6 +1105,6 @@@ set(CMAKE_SOURCE_FILE
    )
  
  set(PLATFORMS_EXAMPLES
-   examples/platforms/battery_platform.xml
    examples/platforms/bypassRoute.xml
    examples/platforms/bypassZoneRoute.xml
    examples/platforms/cloud.xml